diff --git a/src/App.vue b/src/App.vue
index c4f4895..2f867e9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,11 @@
 
     <!-- 路由出口 -->
     <!-- 路由匹配组建将渲染到这里 -->
-    <router-view> </router-view>
+<!--    <router-view> </router-view>-->
+    <keep-alive exclude="test" include="">
+      <router-view />
+    </keep-alive>
+<!--    <router-view v-if="!$route.meta.keepAlive" />-->
   </div>
 </template>
 
@@ -14,6 +18,12 @@
 // import http from './utils/request'//导入接口？？
 // import {getData} from './api'
 
+// import DevicePixelRatio from './libs/rem'
+// export default{
+//   created(){
+//     new DevicePixelRatio().init()
+//   }
+// }
 
 </script>
 
@@ -29,7 +39,11 @@
     background-color: rgba(2, 167, 240, 0.729411764705882);
 
   }
-
+.text{
+color:rgba(2, 167, 240, 0.729411764705882);
+cursor: pointer;
+/* 将鼠标样式设为手型 */
+}
   
   
 
diff --git a/src/assets/card.png b/src/assets/card.png
new file mode 100644
index 0000000..39750e4
Binary files /dev/null and b/src/assets/card.png differ
diff --git a/src/assets/数据显示.png b/src/assets/数据显示.png
index ee9e101..a53367c 100644
Binary files a/src/assets/数据显示.png and b/src/assets/数据显示.png differ
diff --git a/src/assets/数据显示old.png b/src/assets/数据显示old.png
new file mode 100644
index 0000000..ee9e101
Binary files /dev/null and b/src/assets/数据显示old.png differ
diff --git a/src/components/Children.vue b/src/components/Children.vue
new file mode 100644
index 0000000..93a02f9
--- /dev/null
+++ b/src/components/Children.vue
@@ -0,0 +1,19 @@
+<template>
+    <section>
+        父组件传过来的消息是：{{myMsg}}
+    </section>
+</template>
+
+<script>
+    export default {
+        name: "Children",
+        components: {},
+        props:['msg'],
+        data() {
+            return {
+                myMsg:this.msg
+            }
+        },
+        methods: {}
+    }
+</script>
diff --git a/src/components/CommonAside.vue b/src/components/CommonAside.vue
index 8526dcd..ddadbe9 100644
--- a/src/components/CommonAside.vue
+++ b/src/components/CommonAside.vue
@@ -1,66 +1,84 @@
 <!-- 侧导航栏 -->
 <template>
-  <el-menu
-    default-active="1-4-1"
-    class="el-menu-vertical-demo"
-    @open="handleOpen"
-    @close="handleClose"
-    :collapse="isCollapse"
-    background-color="#000000"
-    text-color="#fff"
-    active-text-color="#ffd04b"
-    style="height:1200px">
-    <!-- style="height:auto" -->
-    <!-- <img src="/image/Logo.png" width="100%" > -->
-    <!-- <img src="/image/Logo.png" /> -->
-    <div style="display=flex;">
-      <!-- <img src="../assets/Logo.png" width="12%" style="display:inline-block;padding-right: 3px;" align="absmiddle"> -->
-      <img src="../assets/数据显示.png" width="12%" style="display:inline-block;padding-left: 1px;padding-right: 5px;" align="absmiddle">
-      <!-- align="absmiddle"让图像和文字一样高 -->
-      <h3 style="display:inline-block;" @click = "bigscreen">资本市场系统性风险平台</h3>
-      <!--  -->
-    </div>
-    
+  <div style="display=flex;">
+    <!-- <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button :label="false">展开</el-radio-button>
+      <el-radio-button :label="true">收起</el-radio-button>
+    </el-radio-group> -->
+
+      <el-menu
+        :default-active="$route.path"
+        class="el-menu-vertical-demo"
+        :router="true"
+        :collapse="isCollapse"
+        background-color="#000000"
+        text-color="#fff"
+        active-text-color="#ffd04b"
+        style="height:1200px">
+        <!-- style="height:auto" -->
+        <!-- :default-active="$route.path"使得在没有点击左侧导航栏时，也能根据路由转变转化颜色 -->
+        <div style="display=flex;">
+          <!-- <img src_old="../assets/Logo.png" width="12%" style="display:inline-block;padding-right: 3px;" align="absmiddle"> -->
+          <img src="../assets/数据显示.png" width="20px" style="display:inline-block;padding-left: 1px;padding-right: 5px;" align="absmiddle">
+          <!-- align="absmiddle"让图像和文字一样高 -->
+          <h3 style="display:inline-block;" @click = "bigscreen">{{ isCollapse ? '' :  '资本市场系统性风险平台'}}</h3>
+          <!--  -->
+        </div>
+
+      <!-- <el-button @click="handleMenu" icon="el-icon-menu" size="mini">bibibi</el-button> -->
 
 
-    <!-- 循环遍历所有的单导航栏 -->
-    <!-- 没有子菜单 -->
-    <el-menu-item @click='clickMenu(item)' v-for="item in nochildren" :key='item.name' :index='item.name'>   
-    <!-- : 是v-bind: -->
-      <i :class="`el-icon-${item.icon}`"></i> <!-- 图标，官网可选 -->
-      <span slot="title">{{ item.label }}</span>
-    </el-menu-item>
 
-    <!-- 有子菜单 -->
-    <el-submenu  v-for="item in hasChildren" :key='item.label' :index='item.label'><!-- index都是为了确保唯一性 -->
-        <template slot="title">
-          <i :class="`el-icon-${item.icon}`"></i>
+        <!-- 循环遍历所有的单导航栏 -->
+        <!-- 没有子菜单 -->                                               <!-- index都是为了确保唯一性,但最好设置为path，有利于根据路由跳转页面 -->
+        <el-menu-item @click='clickMenu(item)' v-for="item in nochildren" :key='item.path' :index='item.path'>
+        <!-- : 是v-bind: -->
+          <i :class="`el-icon-${item.icon}`"></i> <!-- 图标，官网可选 -->
           <span slot="title">{{ item.label }}</span>
-        </template>
-        <el-menu-item-group v-for='subItem in item.children' :key='subItem.path'>
-          <el-menu-item @click='clickMenu(subItem)' :index="subItem.path" style="padding-left: 70px;">{{subItem.label}}</el-menu-item>
-        </el-menu-item-group>
-       
-      </el-submenu>
+        </el-menu-item>
 
-  </el-menu>
+        <!-- 有子菜单 -->
+        <el-submenu  v-for="item in hasChildren" :key='item.path' :index='item.path'><!-- index都是为了确保唯一性 -->
+            <template slot="title">
+              <i :class="`el-icon-${item.icon}`"></i>
+              <span slot="title">{{ item.label }}</span>
+            </template>
+            <el-menu-item-group v-for='subItem in item.children' :key='subItem.path'>
+              <el-menu-item @click='clickMenu(subItem)' :index="subItem.path" style="padding-left: 70px;">{{subItem.label}}</el-menu-item>
+            </el-menu-item-group>
+          </el-submenu>
+
+
+      </el-menu>
+
+
+
+
+
+
+</div>
 </template>
 
 
 
 <script>
-
 export default {
+  
   data() {
     return {
-      isCollapse: false, //不折叠
+      // isCollapse:false,
       menuData: [
-
+        // {
+        //   path: "/",
+        //   name: "home",
+        //   label: "首页",
+        //   icon: "s-home",
+        // },
         {
-          path: "/",
-          name: "home",
-          label: "首页",
-          icon: "s-home",
+          path: "/systematic_risk",//2-1
+          name: "systematic_risk",
+          label: "系统性风险分析",
+          icon: 's-marketing'
         },
         {
           path: "/market_entities",//1
@@ -68,32 +86,29 @@ export default {
           label: "市场主体分析",
           icon: "s-flag",
         },
-        {
+
           //2
-          label: "市场风险分析",
-          icon: "s-marketing",
-
-          children:[
-            {
-            path: "/systematic_risk",//2-1
-            name: "systematic_risk",
-            label: "系统性风险分析",
-            },
-            {
-            path: "/individual_risk",//2-2
-            name: "individual_risk",
-            label: "个体风险分析",
-            },
-
-
-        ],
-        },
         {
           path: "/influential_entities",//3
           name: "influential_entities",
           label: "高影响主体分析",
           icon: "star-off",
         },
+
+            {
+            path: "/individual_risk",//2-2
+            name: "individual_risk",
+            label: "个体风险分析",
+              icon: 'lightning'
+            },
+
+        {
+          path: "/diffus",//5
+          name: "diffus",
+          label: "风险传导",
+          icon: "aim",
+        },
+
         {
           // path: "/warning",//4
           label: "预警服务",
@@ -118,6 +133,22 @@ export default {
 
         ],
           
+        },
+        {
+          // path: "/event",//8
+          label: "事件分析",
+          icon: "document",
+          children:[
+            {
+              path: "/event_analysis",//2
+              name: "event_analysis",
+              label: "事件分析",
+            },
+            {
+              path: "/event_graph",//2
+              name: "event_graph",
+              label: "事件图谱",
+            },]
         },
         {
           path: "/health",//5
@@ -125,52 +156,41 @@ export default {
           label: "健康指数",
           icon: "umbrella",
         },
-        {
-          path: "/pressure",//6
-          name: "pressure",
-          label: "压力测试",
-          icon: "s-help",
-        },
+
         {
           path: "/quotation",//7
           name: "quotation",
           label: "行情分析",
           icon: "s-data",
         },
+
         {
-          // path: "/event",//8
-          label: "事件分析",
-          icon: "document",
-          children:[
-            {
-            path: "/event_analysis",//2
-            name: "event_analysis",
-            label: "事件分析",
-            },
-            {
-            path: "/event_graph",//2
-            name: "event_graph",
-            label: "事件图谱",
-            },]
+          path: "/pressure",//6
+          name: "pressure",
+          label: "压力测试",
+          icon: "s-help",
         },
+
+
   
       ],
     };
   },
+ 
+
+ 
+
   methods: {
+    
+
     bigscreen(){//点击标题跳转大屏
       this.$router.push('/bigscreen');
     },
-    handleOpen(key, keyPath) {
-      console.log(key, keyPath);
-    },
-    handleClose(key, keyPath) {
-      console.log(key, keyPath);
-    },
+
     //点击菜单
     clickMenu(item){
      // 当页面的路由this.$route.path 与 跳转的路由item.path 不一致才允许跳转
-     if (this.$route.path !== item.path && !(this.$route.path === '/home' && (item.path === '/'))) {//$route是当前路径的路由
+     if (this.$route.path !== item.path && !(this.$route.path === '/market_entities' && (item.path === '/'))) {//$route是当前路径的路由
         this.$router.push(item.path)//$router是整个的router实例
       }
       this.$store.commit('selectMenu', item)//点击获取新路由对象,store在这里不用import  
@@ -178,12 +198,17 @@ export default {
 
   },
   computed: {
+
     hasChildren() {//有子菜单才需要用
       return this.menuData.filter((item) => item.children);
     },
     nochildren() {
       return this.menuData.filter((item) => !item.children);
     },
+    isCollapse(){
+      return this.$store.state.tab.isCollapse
+
+    },
   },
 };
 </script>
@@ -240,4 +265,5 @@ export default {
     color:#fff;
 
 }
+
 </style>
\ No newline at end of file
diff --git a/src/components/CommonHeader.vue b/src/components/CommonHeader.vue
index 2e28e6d..647840f 100644
--- a/src/components/CommonHeader.vue
+++ b/src/components/CommonHeader.vue
@@ -8,7 +8,7 @@
 
                 <el-tag v-for="(item,index) in tags" 
                 :key="item.path" 
-                :closable="item.name!=='home'" 
+                :closable="true" 
                 :effect="$route.name === item.name ? 'dark' : 'plain'"
                 @click="changeMenu(item)"
                 @close="handledClose(item,index)"
@@ -37,10 +37,10 @@
         <div class="r-content">
             <!--练习的弹出框 -->
             <el-dialog
-                title="提示"
+                title="修改个人信息"
                 :visible.sync="dialogVisible"
                 width="30%">
-                <span>这是一段信息</span>
+                <span></span>
                 <span slot="footer" class="dialog-footer">
                     <el-button @click="dialogVisible = false">取 消</el-button>
                     <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
@@ -51,18 +51,22 @@
             <el-dropdown>
                 <span class="el-dropdown-link">
                 <el-button icon=el-icon-s-custom circle> </el-button>  <!--登录图表按钮-->
-                    <span class="text">用户信息</span>
+                    <span class="text">请登录</span>
                     <i class="el-icon-arrow-down el-icon--right"></i> <!--下拉-->
                     </span>
 
                 <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item>
-                        <!-- 点击后改变弹出框生效情况 -->
-                        <el-button type="text" @click="dialogVisible = true">注册</el-button>
-                    </el-dropdown-item>
+<!--                    <el-dropdown-item>-->
+<!--                        &lt;!&ndash; 点击后改变弹出框生效情况 &ndash;&gt;-->
+<!--                        <el-button  style='width: 150px;' @click="dialogVisible = true">修改个人信息</el-button>-->
+<!--                    </el-dropdown-item>-->
 
-                    <el-dropdown-item> 
-                        <el-button type="text" @click="dialogVisible = true">登录</el-button>
+<!--                    <el-dropdown-item>-->
+<!--                        <el-button style='width: 150px;' @click = "logout">登出</el-button>-->
+<!--                   </el-dropdown-item>-->
+
+                   <el-dropdown-item>
+                        <el-button style='width: 150px;' @click="login">登录</el-button>
                    </el-dropdown-item>
                 
                 </el-dropdown-menu>
@@ -75,6 +79,7 @@
 
 <script>
 import {mapState,mapMutations} from 'vuex'
+import http from "@/utils/request";
   export default {
     name: "CommonTag",
     data(){
@@ -87,8 +92,16 @@ import {mapState,mapMutations} from 'vuex'
         ...mapState({//mapState返回一个对象，表示扩展运算符，起到解构的作用...
             tags: state => state.tab.tabsList
         })
+        
     },
     methods:{
+      login(){
+        this.$router.push('/login')
+      },
+      logout(){
+        this.$store.commit('logout')
+      },
+
         //调用Mutations,获取closeTag，并添加到当前页面中（讲解34）
         ...mapMutations(['closeTag']),
         //点击tag跳转的功能
@@ -103,12 +116,48 @@ import {mapState,mapMutations} from 'vuex'
             // this.$store.commit('closeTag')
             // 方法2,调用store中的Mutations
             this.closeTag(item)
-            const length=this.tags.length-1
+            const length=this.tags.length
+            // console.log("tags长度：",this.tags.length)
+            // console.log( this.$router)
+            
             //删除之后的跳转逻辑
+            //一）当前页与删除页不同（item.name和当前展示路由不一致），直接删除路由列表里面的对于name，就不能再打开，没有人性化调整的必要
+            if(item.name!== this.$route.name){
+                return
+            }
+            //二）当前页=删除页——删除的是最后一页(页面转到路由列表中的前一个)
+            if(index===length){
+                if(length===0){
+                    item={
+                        path: "/market_entities",
+                        name: "market_entities",
+                        label: "市场主体分析",
+                    }
+                    this.$router.push(item)
+                    this.$store.commit('selectMenu', item)//点击获取新路由对象,store在这里不用import  
+                }
+                else{ 
+                    this.$router.push({
+                        name:this.tags[index-1].name
+                    })
+                }
+            }
+
+            //三）当前页=删除页——删除的是中间一页(跳转后一个，因为已经删除了，跳转的还是后面那个)
+            else{
+                this.$router.push({
+                    name:this.tags[index].name
+                })
+            }
             
 
         },
-        
+
+        // 跳转用户管理
+        UserManagement(){//点击标题跳转大屏
+            this.$router.push('/UserManagement');
+        },
+
     
 
 
diff --git a/src/components/CommonHeaderAdmin.vue b/src/components/CommonHeaderAdmin.vue
new file mode 100644
index 0000000..e279195
--- /dev/null
+++ b/src/components/CommonHeaderAdmin.vue
@@ -0,0 +1,227 @@
+<!-- 上导航栏 -->
+<template>
+    <div class="header-container">
+
+
+        <div class="l-content">
+
+            <el-button  @click="handleMenu"  :icon=" icon" size="medium" style="padding: 5px;width: 30px;height: 60px;background-color:transparent;"></el-button>
+
+            <!-- tag -->
+            <div class="tags" >
+
+                <el-tag v-for="(item,index) in tags" 
+                :key="item.path" 
+                :closable="true" 
+                :effect="$route.name === item.name ? 'dark' : 'plain'"
+                @click="changeMenu(item)"
+                @close="handledClose(item,index)"
+                style="margin-left: 5px"><!-- 只有非首页才显示closable，点击该页颜色加深effect-->
+                {{ item.label }}
+                </el-tag>
+
+            </div>
+<!-- 
+            <el-breadcrumb separator="">
+                <el-breadcrumb-item :to="{ path: '/' }">
+                    <el-button size="small" >首页</el-button>
+                </el-breadcrumb-item>
+                <el-breadcrumb-item><a href="/">
+                    <el-button size="small" >风险主体总量<i class="el-icon-close" size="mini " ></i>
+
+                            </el-button>
+                    </a></el-breadcrumb-item>
+                </el-breadcrumb> -->
+
+           
+            <!-- <span class="text">首页</span> -->
+            
+        </div>
+        <!-- 用户信息 登录注册 -->
+        <div class="r-content">
+            <!--练习的弹出框 -->
+            <el-dialog
+                title="修改个人信息"
+                :visible.sync="dialogVisible"
+                width="30%">
+                <span></span>
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                </span>
+            </el-dialog>
+
+            <!-- 右侧登录页面设计 -->
+            <el-dropdown>
+                <span class="el-dropdown-link">
+                <el-button icon=el-icon-s-custom circle> </el-button>  <!--登录图表按钮-->
+                    <span class="text">用户信息</span>
+                    <i class="el-icon-arrow-down el-icon--right"></i> <!--下拉-->
+                    </span>
+
+                <el-dropdown-menu slot="dropdown">
+<!--                    <el-dropdown-item>-->
+<!--                        &lt;!&ndash; 点击后改变弹出框生效情况 &ndash;&gt;-->
+<!--                        <el-button  style='width: 150px;' @click="dialogVisible = true">修改个人信息</el-button>-->
+<!--                    </el-dropdown-item>-->
+
+                    <el-dropdown-item> 
+                        <el-button style='width: 150px;' @click = "UserManagement">用户管理</el-button>
+                   </el-dropdown-item>
+
+                   <el-dropdown-item>
+                        <el-button style='width: 150px;' @click="logout">退出登录</el-button>
+                   </el-dropdown-item>
+                
+                </el-dropdown-menu>
+                </el-dropdown>
+            
+        </div>
+    </div>
+    
+</template>
+
+<script>
+import {mapState,mapMutations} from 'vuex'
+import http from "@/utils/request";
+  export default {
+    name: "CommonTag",
+    data(){
+        return{
+            dialogVisible:false,//用户登录页面
+            // 折叠按钮
+            icon:"el-icon-arrow-left",
+
+        };
+    },
+    computed: {
+        ...mapState({//mapState返回一个对象，表示扩展运算符，起到解构的作用...
+            tags: state => state.tab.tabsList
+        })
+        
+    },
+    methods:{
+
+        // 折叠方法
+        handleMenu(){
+        this.$store.commit('collapseMenu')
+        this.icon = this.icon === 'el-icon-arrow-left' ? 'el-icon-arrow-right' : 'el-icon-arrow-left';
+        },
+
+      logout(){
+        this.$store.commit('logout')
+        this.$notify.info({
+          title: '注意',
+          message: '已退出'
+        })
+          this.$router.push('/login')
+          location.reload();
+      },
+
+        //调用Mutations,获取closeTag，并添加到当前页面中（讲解34）
+        ...mapMutations(['closeTag']),
+        //点击tag跳转的功能
+        changeMenu(item){
+            // console.log(item)
+            this.$router.push({name: item.name})//点击一个，新增一个，面包屑tab增加一个
+        },
+        //点击tag x删除
+        handledClose(item,index){  //index是获取的索引
+            //点击tag删除 tabsList里面的数据
+            // 方法1
+            // this.$store.commit('closeTag')
+            // 方法2,调用store中的Mutations
+            this.closeTag(item)
+            const length=this.tags.length
+            // console.log("tags长度：",this.tags.length)
+            // console.log( this.$router)
+            
+            //删除之后的跳转逻辑
+            //一）当前页与删除页不同（item.name和当前展示路由不一致），直接删除路由列表里面的对于name，就不能再打开，没有人性化调整的必要
+            if(item.name!== this.$route.name){
+                return
+            }
+            //二）当前页=删除页——删除的是最后一页(页面转到路由列表中的前一个)
+            if(index===length){
+                if(length===0){
+                    item={
+                        path: "/market_entities",
+                        name: "market_entities",
+                        label: "市场主体分析",
+                    }
+                    this.$router.push(item)
+                    this.$store.commit('selectMenu', item)//点击获取新路由对象,store在这里不用import  
+                }
+                else{ 
+                    this.$router.push({
+                        name:this.tags[index-1].name
+                    })
+                }
+            }
+
+            //三）当前页=删除页——删除的是中间一页(跳转后一个，因为已经删除了，跳转的还是后面那个)
+            else{
+                this.$router.push({
+                    name:this.tags[index].name
+                })
+            }
+            
+
+        },
+
+        // 跳转用户管理
+        UserManagement(){//点击标题跳转大屏
+            this.$router.push('/UserManagement');
+        },
+
+    
+
+
+        
+
+
+    }
+  };
+</script>
+
+<style lang="less" scoped>
+
+.header-container{
+    // padding: 0 30px;
+    padding: 0 0px;
+    background-color: #33333325;
+    height: 60px;
+    display: flex;//相邻的两个内容一行显示
+    justify-content: space-between;
+   
+   .text{
+    color:rgba(0, 0, 0, 0.719);
+    font-size: 13px;
+    margin-left: 5px;//左间距
+    margin-bottom: 10px;//下间距
+
+   }
+   .l-content{
+    display: flex;
+    justify-content: space-between;
+    align-items: end; // 中间
+   }
+   .r-content{
+    margin-top: 5px;//下间距
+    align-items: top; // 中间
+    .el-button.is-circle {
+        border-radius: 100%;
+        padding: 3px;//边框和内部距离
+    }
+
+    .el-button {//按钮边框
+        background: #ffffff00; 
+        border: 1px solid #00040e;
+        color: #000104; 
+        font-size: 16px;
+        border-radius: 20px;
+    }
+   }
+  
+}
+</style>
\ No newline at end of file
diff --git a/src/components/CommonHeaderUser.vue b/src/components/CommonHeaderUser.vue
new file mode 100644
index 0000000..2d51aa7
--- /dev/null
+++ b/src/components/CommonHeaderUser.vue
@@ -0,0 +1,225 @@
+<!-- 上导航栏 -->
+<template>
+    <div class="header-container">
+        
+        <div class="l-content">
+
+            <el-button  @click="handleMenu"  :icon=" icon" size="medium" style="padding: 5px;width: 30px;height: 60px;background-color:transparent;"></el-button>
+
+            <!-- tag -->
+            <div class="tags" >
+
+                <el-tag v-for="(item,index) in tags" 
+                :key="item.path" 
+                :closable="true" 
+                :effect="$route.name === item.name ? 'dark' : 'plain'"
+                @click="changeMenu(item)"
+                @close="handledClose(item,index)"
+                style="margin-left: 5px"><!-- 只有非首页才显示closable，点击该页颜色加深effect-->
+                {{ item.label }}
+                </el-tag>
+
+            </div>
+<!-- 
+            <el-breadcrumb separator="">
+                <el-breadcrumb-item :to="{ path: '/' }">
+                    <el-button size="small" >首页</el-button>
+                </el-breadcrumb-item>
+                <el-breadcrumb-item><a href="/">
+                    <el-button size="small" >风险主体总量<i class="el-icon-close" size="mini " ></i>
+
+                            </el-button>
+                    </a></el-breadcrumb-item>
+                </el-breadcrumb> -->
+
+           
+            <!-- <span class="text">首页</span> -->
+            
+        </div>
+        <!-- 用户信息 登录注册 -->
+        <div class="r-content">
+            <!--练习的弹出框 -->
+            <el-dialog
+                title="修改个人信息"
+                :visible.sync="dialogVisible"
+                width="30%">
+                <span></span>
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                </span>
+            </el-dialog>
+
+            <!-- 右侧登录页面设计 -->
+            <el-dropdown>
+                <span class="el-dropdown-link">
+                <el-button icon=el-icon-s-custom circle> </el-button>  <!--登录图表按钮-->
+                    <span class="text">用户信息</span>
+                    <i class="el-icon-arrow-down el-icon--right"></i> <!--下拉-->
+                    </span>
+
+                <el-dropdown-menu slot="dropdown">
+<!--                    <el-dropdown-item>-->
+<!--                        &lt;!&ndash; 点击后改变弹出框生效情况 &ndash;&gt;-->
+<!--                        <el-button  style='width: 150px;' @click="dialogVisible = true">修改个人信息</el-button>-->
+<!--                    </el-dropdown-item>-->
+
+<!--                    <el-dropdown-item> -->
+<!--                        <el-button style='width: 150px;' @click = "UserManagement">用户管理</el-button>-->
+<!--                   </el-dropdown-item>-->
+
+                   <el-dropdown-item>
+                        <el-button style='width: 150px;' @click="logout">退出登录</el-button>
+                   </el-dropdown-item>
+                
+                </el-dropdown-menu>
+                </el-dropdown>
+            
+        </div>
+    </div>
+    
+</template>
+
+<script>
+import {mapState,mapMutations} from 'vuex'
+import http from "@/utils/request";
+  export default {
+    name: "CommonTag",
+    data(){
+        return{
+            dialogVisible:false,//用户登录页面
+            // 折叠按钮
+            icon:"el-icon-arrow-left",
+
+        };
+    },
+    computed: {
+        ...mapState({//mapState返回一个对象，表示扩展运算符，起到解构的作用...
+            tags: state => state.tab.tabsList
+        })
+        
+    },
+    methods:{
+
+         // 折叠方法
+         handleMenu(){
+        this.$store.commit('collapseMenu')
+        this.icon = this.icon === 'el-icon-arrow-left' ? 'el-icon-arrow-right' : 'el-icon-arrow-left';
+        },
+
+      logout(){
+        this.$store.commit('logout')
+        this.$notify.info({
+          title: '注意',
+          message: '已退出'
+        })
+        this.$router.push('/login')
+        location.reload();
+      },
+
+        //调用Mutations,获取closeTag，并添加到当前页面中（讲解34）
+        ...mapMutations(['closeTag']),
+        //点击tag跳转的功能
+        changeMenu(item){
+            // console.log(item)
+            this.$router.push({name: item.name})//点击一个，新增一个，面包屑tab增加一个
+        },
+        //点击tag x删除
+        handledClose(item,index){  //index是获取的索引
+            //点击tag删除 tabsList里面的数据
+            // 方法1
+            // this.$store.commit('closeTag')
+            // 方法2,调用store中的Mutations
+            this.closeTag(item)
+            const length=this.tags.length
+            // console.log("tags长度：",this.tags.length)
+            // console.log( this.$router)
+            
+            //删除之后的跳转逻辑
+            //一）当前页与删除页不同（item.name和当前展示路由不一致），直接删除路由列表里面的对于name，就不能再打开，没有人性化调整的必要
+            if(item.name!== this.$route.name){
+                return
+            }
+            //二）当前页=删除页——删除的是最后一页(页面转到路由列表中的前一个)
+            if(index===length){
+                if(length===0){
+                    item={
+                        path: "/market_entities",
+                        name: "market_entities",
+                        label: "市场主体分析",
+                    }
+                    this.$router.push(item)
+                    this.$store.commit('selectMenu', item)//点击获取新路由对象,store在这里不用import  
+                }
+                else{ 
+                    this.$router.push({
+                        name:this.tags[index-1].name
+                    })
+                }
+            }
+
+            //三）当前页=删除页——删除的是中间一页(跳转后一个，因为已经删除了，跳转的还是后面那个)
+            else{
+                this.$router.push({
+                    name:this.tags[index].name
+                })
+            }
+            
+
+        },
+
+        // 跳转用户管理
+        UserManagement(){//点击标题跳转大屏
+            this.$router.push('/UserManagement');
+        },
+
+    
+
+
+        
+
+
+    }
+  };
+</script>
+
+<style lang="less" scoped>
+
+.header-container{
+    padding: 0 30px;
+    background-color: #33333325;
+    height: 60px;
+    display: flex;//相邻的两个内容一行显示
+    justify-content: space-between;
+   
+   .text{
+    color:rgba(0, 0, 0, 0.719);
+    font-size: 13px;
+    margin-left: 5px;//左间距
+    margin-bottom: 10px;//下间距
+
+   }
+   .l-content{
+    display: flex;
+    justify-content: space-between;
+    align-items: end; // 中间
+   }
+   .r-content{
+    margin-top: 5px;//下间距
+    align-items: top; // 中间
+    .el-button.is-circle {
+        border-radius: 100%;
+        padding: 3px;//边框和内部距离
+    }
+
+    .el-button {//按钮边框
+        background: #ffffff00; 
+        border: 1px solid #00040e;
+        color: #000104; 
+        font-size: 16px;
+        border-radius: 20px;
+    }
+   }
+  
+}
+</style>
\ No newline at end of file
diff --git a/src/components/EmphasizedText.vue b/src/components/EmphasizedText.vue
new file mode 100644
index 0000000..bf8ff81
--- /dev/null
+++ b/src/components/EmphasizedText.vue
@@ -0,0 +1,13 @@
+<template>
+$END$
+</template>
+
+<script>
+export default {
+name: "EmphasizedText"
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/QiPao.vue b/src/components/QiPao.vue
new file mode 100644
index 0000000..a432fba
--- /dev/null
+++ b/src/components/QiPao.vue
@@ -0,0 +1,189 @@
+<template>
+  <div ref="QiPao" style="width: 1000px; height: 800px"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import * as d3 from 'd3';
+export default {
+  data() {
+    return {
+        option: {},
+        colorList: ['#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
+    };
+  },
+  mounted() {
+    let that = this
+    let seriesData = [
+      {
+        depth: 0,
+        id: 'option',
+        index: 0,
+        value: 0
+      },
+      {
+        depth: 1,
+        id: 'option.大连商品交易所',
+        index: 1,
+        value: 1
+      },
+      {
+        depth: 1,
+        id: 'option.上海期货交易所',
+        index: 2,
+        value: 1
+      },
+      {
+        depth: 1,
+        id: 'option.郑州商品交易所',
+        index: 3,
+        value: 2
+      },
+      {
+        depth: 0,
+        id: 'option.广州期货交易所',
+        index: 4,
+        value: 1
+      },
+      {
+        depth: 1,
+        id: 'option.上海国际能源交易中心',
+        index: 5,
+        value: 1
+      },
+    ];
+    let displayRoot = stratify1();
+
+    function stratify1() {
+      return d3
+        .stratify()
+        .parentId(function (d) {
+
+          return d.id.substring(0, d.id.lastIndexOf('.'));
+        })(seriesData)
+        .sum(function (d) {
+
+          return d.value || 0;
+        })
+        .sort(function (a, b) {
+          return b.value - a.value;
+        });
+    }
+
+    function overallLayout(params, api) {
+      let context = params.context;
+      d3
+        .pack()
+        .size([api.getWidth() - 2, api.getHeight() - 2])
+        .padding(0)(displayRoot);
+      context.nodes = {};
+
+      displayRoot.descendants().forEach(function (node) {
+
+        context.nodes[node.id] = node;
+      });
+    }
+
+    function renderItem(params, api) {
+      let context = params.context;
+      let idx = params.dataIndex;
+      
+      // Only do that layout once in each time `setOption` called.
+      // 每次调用“setOption”时，只能进行一次布局。
+      if (!context.layout) {
+        context.layout = true;
+
+        overallLayout(params, api);
+      }
+      let nodePath = api.value('id');
+      let nodeName = nodePath
+        .slice(nodePath.lastIndexOf('.') + 1)
+        .split(/(?=[A-Z][^A-Z])/g)
+        .join('')
+      let node = context.nodes[nodePath];
+      if (node.id === 'option') {
+        node.r = 0
+      }
+      if (!node) {
+        // Reder nothing.
+        return;
+      }
+
+      let z2 = api.value('depth') * 2;
+      return {
+        type: 'circle',
+        shape: {
+          cx: node.x,
+          cy: node.y,
+          r: node.r
+        },
+        // transition: ['shape'],
+        z2: z2,
+        textContent: {
+          type: 'text',
+          style: {
+            // transition: isLeaf ? 'fontSize' : null,
+            text: nodeName,
+            fill: '#fff',
+            fontFamily: 'Arial',
+            width: node.r,
+            overflow: 'truncate',
+            fontSize: 13
+          },
+          emphasis: {
+            style: {
+              overflow: null,
+              fontSize: Math.max(node.r / 3, 12)
+            }
+          }
+        },
+        textConfig: {
+          position: 'inside'
+        },
+        style: {
+          fill: that.colorList[idx % that.colorList.length]
+        },
+        emphasis: {
+          style: {
+            fontFamily: 'Arial',
+            fontSize: 6,
+            shadowBlur: 20,
+            shadowOffsetX: 3,
+            shadowOffsetY: 5,
+            shadowColor: 'rgba(0,0,0,0.3)'
+          }
+        }
+      };
+    }
+
+    this.option = {
+      dataset: {
+        source: seriesData
+      },
+      tooltip: {},
+      hoverLayerThreshold: Infinity,
+      series: [{
+        type: 'custom',
+        colorBy: 'data',
+        renderItem: renderItem,
+        progressive: 0,
+        coordinateSystem: 'none',
+        encode: {
+          tooltip: 'value',
+          itemName: 'id'
+        },
+      }]
+    }
+    this.initEcharts()
+  },
+  methods: {
+      initEcharts() {
+        let myChart = echarts.init(this.$refs.QiPao)
+        myChart.setOption(this.option)
+      }
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/components/dimensionComponent.vue b/src/components/dimensionComponent.vue
new file mode 100644
index 0000000..b860614
--- /dev/null
+++ b/src/components/dimensionComponent.vue
@@ -0,0 +1,315 @@
+<template>
+  <div>
+    <div ref="dimension"  style="width: 1200px; height: 450px;margin-left: 0px;margin-top: 0px;"></div>
+    <div class="warning-component">
+      <div class="warning-dates">
+        <button class="button" @click="changeState">
+          <span class="text">{{ state }}</span>
+          <svg class="arrow" viewBox="0 0 448 512" height="1em" xmlns="http://www.w3.org/2000/svg"><path d="M438.6 278.6c12.5-12.5 12.5-32.8 0-45.3l-160-160c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3L338.8 224 32 224c-17.7 0-32 14.3-32 32s14.3 32 32 32l306.7 0L233.4 393.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0l160-160z"></path></svg>
+        </button>
+        <div class="date-item">前日：<span>{{ prevDayDim }}</span></div>
+        <div class="date-item">昨日：<span>{{ yesterdayDim }}</span></div>
+        <div class="date-item">今日：<span>{{ todayDim }}</span></div>
+        <div class="date-item">明日：<span>{{ tomorrowDim }}</span></div>
+
+      </div>
+    </div>
+  </div>
+
+
+
+</template>
+
+<script>
+import * as echarts from "echarts";
+import http from "@/utils/request";
+
+export default {
+  props: {
+    // xData:[],
+    // yData: [],
+    // legend:String,
+    title:String,
+    zoom:{
+      type:Array,
+      default: function () {
+        return []
+      }
+    }
+  },
+  data(){
+    return {
+      datazoom:[],
+      state:'个体风险状态',
+      individualRisk:[],
+      structureRisk:[],
+      spillRisk:[],
+      volatilityRisk:[],
+      markArea:[],
+      date:[],
+      detail:'',
+      prevDayDim:'',
+      yesterdayDim:'',
+      todayDim:'',
+      tomorrowDim:'',
+    }
+  },
+
+  mounted: function () {
+
+    http.get('/risk/dimension/').then((res)=>{
+      this.date=res.data.date
+      this.individualRisk=res.data.individual
+      this.structureRisk=res.data.structure
+      this.spillRisk=res.data.spill
+      this.volatilityRisk=res.data.volatility
+      this.detail=res.data.detail
+      this.markArea=res.data.markarea
+      this.prevDayDim=res.data.detail[this.state][0]
+      this.yesterdayDim=res.data.detail[this.state][1]
+      this.todayDim=res.data.detail[this.state][2]
+      this.tomorrowDim=res.data.detail[this.state][3]
+      this.initChart()
+
+        }
+    )
+
+
+  },
+  watch:{
+    // prevDayDim(){
+    //   return this.detail[this.state][0]
+    // },
+    // yesterdayDim(){
+    //   return this.detail[this.state][1]
+    // },
+    // todayDim(){
+    //   return this.detail[this.state][2]
+    // },
+    // tomorrowDim(){
+    //   return this.detail[this.state][3]
+    // },
+    zoom(newVal){
+      this.datazoom=newVal
+
+    },
+    state(){
+
+      this.prevDayDim=this.detail[this.state][0]
+      this.yesterdayDim=this.detail[this.state][1]
+      this.todayDim=this.detail[this.state][2]
+      this.tomorrowDim=this.detail[this.state][3]
+
+    }
+
+  },
+  methods:{
+    changeState(){
+      let lis=['个体风险状态','风险关联与溢出','市场系统结构','市场波动和趋势']
+      this.state=lis.indexOf(this.state)+1>3? '个体风险状态':lis[lis.indexOf(this.state)+1]
+    },
+    initChart(){
+      /*
+      示例参考如下
+      * https://echarts.apache.org/v4/examples/zh/editor.html?c=line-aqi
+      *
+      * https://cdn.jsdelivr.net/gh/apache/echarts-website@asf-site/examples/data/asset/data/aqi-beijing.json
+      *
+      * */
+      var myChart = echarts.init(this.$refs["dimension"])
+      let option = {
+        title: {
+          text: '系统性风险指数维度分析',
+          left: 'center',
+        },
+        // grid:{
+        //   show:true,
+        //   backgroundColor:'#eee'
+        // },
+        tooltip: {
+          trigger: 'axis'
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: this.date
+        },
+        legend: {
+          top:30,
+          data: ['个体风险状态', '风险关联与溢出', '市场系统结构', '市场波动和趋势']
+        },
+        yAxis: {
+          scale: true,
+          splitLine: {
+            show: false
+          }
+        },
+
+        toolbox: {
+          right: 80,
+          feature: {
+            // dataZoom: {
+            //   yAxisIndex: 'none'
+            // },
+            dataView: {
+              show: true,
+              title: '查看数据',
+            },
+            restore: {},
+            saveAsImage: {}
+          }
+        },
+        //以下是时间轴
+        dataZoom: [{
+          //也应该是动态的
+          start:80,
+          end:100
+        }, {
+          type: 'inside'
+        }],
+        //以上是时间轴
+
+        series: [{
+          name: '个体风险状态',
+          type: 'line',
+          smooth:0.8,
+          data: this.individualRisk
+        },
+          {
+            name: '风险关联与溢出',
+            type: 'line',
+            smooth:0.8,
+            data: this.spillRisk
+          },
+          {
+            name: '市场系统结构',
+            type: 'line',
+            smooth:0.8,
+            data: this.structureRisk
+          },
+          {
+            name: '市场波动和趋势',
+            type: 'line',
+            smooth:0.8,
+            data: this.volatilityRisk,
+            markArea:{
+              label: { // 分界线上的文字标签
+                // position: 'end',
+                formatter: '预测值'
+              },
+              data:[[{
+                xAxis:this.markArea[0]},
+                {
+                  xAxis:this.markArea[1]},
+              ]]
+
+
+
+            }
+          },
+        ],
+
+
+
+
+      }
+      myChart.setOption(option);
+      // this.$nextTick(()=>{
+      //   myChart.dispatchAction({
+      //     type: 'dataZoom',
+      //     batch: [{
+      //       // 第一个 dataZoom 组件
+      //       start: this.datazoom[0],
+      //       end: this.datazoom[1]
+      //     }]
+      //   })
+      // })
+
+    }
+
+  },
+
+}
+</script>
+
+<style scoped>
+
+.button {
+  border-radius: 7px;
+  width: 160px;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 12px;
+  cursor: pointer;
+  border: 3px solid rgb(94, 255, 209);
+  background-color: rgb(94, 255, 209);
+  box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.137);
+}
+
+.text {
+
+  width: 70%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+//background-color: rgb(255, 255, 255);
+  color: black;
+}
+
+.arrow path {
+  fill: rgb(19, 19, 19);
+}
+
+.button:hover .arrow {
+  animation: slide-in-left 0.6s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+}
+
+@keyframes slide-in-left {
+  0% {
+    transform: translateX(-8px);
+    opacity: 0;
+  }
+
+  100% {
+    transform: translateX(0px);
+    opacity: 1;
+  }
+}
+
+.button:active {
+  transform: scale(0.97);
+}
+.warning-component {
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  padding: 10px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  max-width: 100%;
+  text-align: center;
+
+  margin: auto;
+}
+
+.warning-dates {
+  display: flex;
+  justify-content: space-between;
+//margin-bottom: 10px;
+}
+
+.date-item {
+  margin: 0 10px;
+  font-weight: bold;
+}
+
+.warning-recent {
+  color: #ff4d4f;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+
+</style>
\ No newline at end of file
diff --git a/src/components/echarts/AreaChart.vue b/src/components/echarts/AreaChart.vue
new file mode 100644
index 0000000..2d687ad
--- /dev/null
+++ b/src/components/echarts/AreaChart.vue
@@ -0,0 +1,124 @@
+<!-- 直方图和折线图的结合图 -->
+<template>
+     <div ref="AreaChart" style="height:300px;width:1000px; border: 1px solid #e0e0e0;margin:20px"></div>
+
+  </template>
+  
+<script>
+import * as echarts from "echarts";
+
+  export default {
+    props:['myHalfData'],
+    data () {
+    return {
+        myData:this.myHalfData
+    }
+  },
+    mounted() {
+        const echarts2 = echarts.init(this.$refs.AreaChart)
+        const option_2={
+            // 右上角存图
+            toolbox: {
+              feature: {
+                saveAsImage: {}
+              }
+            },
+              title: {
+                text: '事件热度分析'
+              },
+              tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                  type: 'cross',
+                  label: {
+                    backgroundColor: '#6a7985'
+                  }
+                }
+              },
+              legend: {
+                data: ['渠道1', '渠道2', '渠道3']
+              },
+              grid: {
+                left: '3%',
+                right: '4%',
+                bottom: '3%',
+                containLabel: true
+              },
+              xAxis: [
+                {
+                  type: 'category',
+                  boundaryGap: false,
+                  data: ['0', '1', '2', '3', '4', '5', '6'],
+                  name: '天'
+                }
+              ],
+              yAxis: [
+                {
+                  type: 'value'
+                }
+              ],
+              series: [
+                {
+                  name: '渠道1',
+                  type: 'line',
+                  stack: 'Total',
+                  areaStyle: {},
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  data: [120, 132, 101, 134, 90, 230, 210]
+                },
+                {
+                  name: '渠道2',
+                  type: 'line',
+                  stack: 'Total',
+                  areaStyle: {},
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  data: [220, 182, 191, 234, 290, 330, 310]
+                },
+                {
+                  name: '渠道3',
+                  type: 'line',
+                  stack: 'Total',
+                  areaStyle: {},
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  data: [150, 232, 201, 154, 190, 330, 410]
+                },
+                {
+                  name: 'Direct',
+                  type: 'line',
+                  stack: 'Total',
+                  areaStyle: {},
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  data: [320, 332, 301, 334, 390, 330, 320]
+                },
+                {
+                  name: 'Search Engine',
+                  type: 'line',
+                  stack: 'Total',
+                  label: {
+                    show: true,
+                    position: 'top'
+                  },
+                  areaStyle: {},
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  data: [820, 932, 901, 934, 1290, 1330, 1200]
+                }
+              ]
+            }
+          echarts2.setOption(option_2)
+     
+    },
+  };
+  </script>
+  
+  <style>
+  </style>
\ No newline at end of file
diff --git a/src/components/echarts/DifferentialChart.vue b/src/components/echarts/DifferentialChart.vue
new file mode 100644
index 0000000..10a971a
--- /dev/null
+++ b/src/components/echarts/DifferentialChart.vue
@@ -0,0 +1,104 @@
+<!-- line chart动态数据变化趋势图 -->
+<template>
+  <div>
+  <el-empty description="暂无数据" v-show="!show"></el-empty>
+  <div ref="lines" style="width: 800px; height: 300px;padding-left:250px" v-show="show"></div>
+  </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+export default {
+  props:{
+    datelis:[],
+    asset:[],
+    held_num:[],
+  },
+  data() {
+    return {
+      show:false
+
+    };
+  },
+  watch:{
+    datelis(){
+      //不为空字符串列表
+      console.log(this.held_num)
+      if (this.asset.findIndex((value) => value!=='' )!== -1 || this.held_num.findIndex((value) => value!=='')!== -1) {
+        console.log(1)
+        this.show = true
+        this.initChart()
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    initChart(){
+      var myChart = echarts.init(this.$refs.lines);
+      // 绘制图表
+      var option = {
+        title: {
+          text: "资产和持股规模",
+          left: "center",
+          textStyle: {
+            fontSize: 17,
+            lineHeight: 10,
+          },
+        },
+        tooltip: {
+          trigger: "axis",
+        },
+        legend: {
+          data: ["资产","持股"],
+          padding:[25,0,0,0],
+          //orient: 'vertical',
+        },
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          containLabel: true,
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: {},
+          },
+        },
+        xAxis: {
+          type: "category",
+          boundaryGap: false,
+          data: this.datelis,
+        },
+        yAxis: {
+          type: "value",
+        },
+        series: [
+          {
+            name: "资产",
+            type: "line",
+            stack: "Total",
+            data: this.asset,
+          },
+          {
+            name: "持股",
+            type: "line",
+            stack: "Total",
+            data: this.held_num,
+            // [4500, 5000, 5020, 4900, 4300, 6000, 6600,6200,7000,5500,4900,6100,
+            //     6700,7050,8000,9000,11000,12000,8600,8200,9500
+            //   ],
+          },
+        ],
+      }
+      myChart.setOption(option);
+
+    }
+
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/components/echarts/DynamicLine.vue b/src/components/echarts/DynamicLine.vue
new file mode 100644
index 0000000..7b3b278
--- /dev/null
+++ b/src/components/echarts/DynamicLine.vue
@@ -0,0 +1,155 @@
+<template>
+  <div ref="changetrend" style="width: 800px; height: 320px;margin-left: 100px;margin-top: 0px;"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import http from "@/utils/request";
+export default {
+  data() {
+    return {
+      time:[],
+      riskData:[],
+      len:Number,
+    };
+  },
+  mounted() {
+    http.get('/warning/get_warning_count/?need=1').then((res)=>{
+
+      for (let i in res.data) {
+        this.time.push(res.data[i]["time"].replace('_','-'))
+        this.riskData.push(res.data[i]["综合风险水平"])
+      }
+      this.len=this.time.length
+      let selectedTime=this.time.slice(0,40)
+      let selectedRisk=this.riskData.slice(0,40)
+      var myChart = echarts.init(this.$refs.changetrend);
+      // 绘制图表
+      // function randomData() {
+      //   now = new Date(+now + oneDay);
+      //   value = value + Math.random() * 21 - 10;
+      //   return {
+      //     name: now.toString(),
+      //     value: [
+      //       [now.getFullYear(), now.getMonth() + 1, now.getDate()].join("/"),
+      //       Math.round(value),
+      //     ],
+      //   };
+      // }
+      // let data = [];
+      // let now = new Date(1997, 9, 3);
+      // let oneDay = 24 * 3600 * 1000;
+      // let value = Math.random() * 1000;
+      // for (var i = 0; i < 1000; i++) {
+      //   data.push(randomData());
+      // }
+      // console.log(data)
+      var option = {
+        title: {
+          text: "系统性风险整体变化趋势",
+          left:'center',
+          textStyle: {//主标题文本样式
+            fontSize: 15,
+            color:'#696969',
+          },
+          padding:[ 5,0,5,0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+
+        },
+
+        grid: {
+          left: '20%',//离左边远一点
+          right: '4%',
+          // bottom: '10%',
+          top:'5%',//如果不填，会默认一个特别大的值，导致图的上面留白特别大
+          // containLabel: true
+        },
+
+        tooltip: {
+          trigger: "axis",
+          // formatter:
+          //     function (params) {
+          //   params = params[0];
+          //   var date = new Date(params.name);
+          //   return (
+          //     date.getDate() +
+          //     "/" +
+          //     (date.getMonth() + 1) +
+          //     "/" +
+          //     date.getFullYear() +
+          //     " : " +
+          //     params.value[1]
+          //   );
+          // },
+          axisPointer: {
+            animation: false,
+          },
+        },
+        xAxis: {
+          type: "category",
+          splitLine: {
+            show: false,
+          },
+          data:selectedTime
+        },
+        yAxis: {
+          type: "value",
+          boundaryGap: [0, "100%"],
+          splitLine: {
+            show: false,
+          },
+        },
+        series: [
+          {
+            name: "综合风险",
+            type: "line",
+            showSymbol: true,
+            data: selectedRisk
+            // data,
+          },
+        ],
+      };
+      myChart.setOption(option);
+      var that=this
+      let i =0
+      setInterval(function () {
+        // for (var i = 0; i < 5; i++) {
+        //   data.shift();
+        //   data.push(randomData());
+        // }
+          if (i===that.time.length-50)
+            i=0
+          selectedRisk=that.riskData.slice(i,50+i)
+          selectedTime=that.time.slice(i,50+i)
+          i++
+        myChart.setOption({
+          series: [
+            {
+              name: "综合风险",
+              type: "line",
+              showSymbol: true,
+              data: selectedRisk,
+            },
+          ],
+          xAxis: {
+
+            type: "category",
+            splitLine: {
+              show: false,
+            },
+            data:selectedTime
+          },
+        });
+      }, 1500);
+
+    })
+
+  },
+  methods: {
+
+
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/components/echarts/HalfDoughnut.vue b/src/components/echarts/HalfDoughnut.vue
index 469b146..3677b29 100644
--- a/src/components/echarts/HalfDoughnut.vue
+++ b/src/components/echarts/HalfDoughnut.vue
@@ -1,77 +1,95 @@
 <template>
   <!-- 半圆饼图-Half Doughnut Chart -->
-  <div id="banyuan" style="width: 800px; height: 400px;padding-left:250px"></div>
+  <!-- 用于预警服务-异常检测的三个数据 -->
+  <div ref="echarts" style="width: 800px; height: 400px;padding-left:250px"></div>
 </template>
 
 <script>
 import * as echarts from "echarts";
 export default {
-  mounted() {
-    var myChart = echarts.init(document.getElementById("banyuan"));
-    var option = {
-      tooltip: {
-        trigger: "item",
-      },
-      title: {
-        text: "异常类型占比",
-        left: "center",
-        textStyle: {
-          fontSize: 17,
-          lineHeight: 85,
-        },
-      },
-      grid: {
+  props:{myHalfData:{
+    type:Array,
+
+    }},
+  data () {
+    return {
+        myData:this.myHalfData
+    }
+  },
+
+  watch:{
+    myHalfData(){
+      this.initCharts()
+    }
+  },
+    methods:{
+
+        initCharts(){
+          var myChart = echarts.init(this.$refs.echarts)
+          var option = {
+            tooltip: {
+              trigger: "item",
+            },
+            title: {
+              text: "异常类型占比",
+              left: "center",
+              textStyle: {
+                fontSize: 17,
+                lineHeight: 85,
+              },
+            },
+            grid: {
               left: '3%',
               right: '4%',
               bottom: '0%',
               top: '0%',
 
             },
-      legend: {
-        top: "15%",
-        left: "center",
-      },
-      series: [
-        {
-          name: "proportion of abnormal risk",
-          type: "pie",
-          radius: ["40%", "80%"],
-          center: ["50%", "70%"],
-          // adjust the start angle
-          startAngle: 180,
-          label: {
-            show: true,
-            formatter(param) {
-              // correct the percentage
-              return param.name + " (" + param.percent * 2 + "%)";
+            legend: {
+              top: "15%",
+              left: "center",
             },
-          },
-          data: [
-            { value: 300, name: "股价波动异常" },
-            { value: 350, name: "高频交易" },
-            { value: 200, name: "资产泡沫" },
-            { value: 120, name: "事件风险波及" },
-            { value: 110, name: "风险事件时长" },
-            { value: 280, name: "事件热度异常" },
-            {
-              // make an record to fill the bottom 50%
-              value: 300+350+200+120+110+280,
-              itemStyle: {
-                // stop the chart from rendering this piece
-                color: "none",
-                decal: {
-                  symbol: "none",
+            series: [
+              {
+                name: "proportion of abnormal risk",
+                type: "pie",
+                radius: ["40%", "80%"],
+                center: ["50%", "70%"],
+                // adjust the start angle
+                startAngle: 180,
+                label: {
+                  show: true,
+                  formatter(param) {
+                    // correct the percentage
+                    return param.name + " (" + param.percent * 2 + "%)";
+                  },
                 },
+                // data: [
+                //   { value: 300, name: "股价波动异常" },
+                //   { value: 350, name: "高频交易" },
+                //   { value: 200, name: "资产泡沫" },
+                //   { value: 120, name: "事件风险波及" },
+                //   { value: 110, name: "风险事件时长" },
+                //   { value: 280, name: "事件热度异常" },
+                //   {
+                //     // make an record to fill the bottom 50%
+                //     value: 300+350+200+120+110+280,
+                //     itemStyle: {
+                //       color: "none",
+                //     },
+                //   },
+                // ],
+                data: this.myHalfData
+
               },
-              label: {
-                show: false,
-              },
-            },
-          ],
-        },
-      ],
-    };
-    myChart.setOption(option);
+            ],
+          };
+          myChart.setOption(option);
+        }
+      },
+
+  mounted() {
+    this.initCharts()
   },
 };
 </script>
diff --git a/src/components/echarts/Histogram.vue b/src/components/echarts/Histogram.vue
new file mode 100644
index 0000000..07545ff
--- /dev/null
+++ b/src/components/echarts/Histogram.vue
@@ -0,0 +1,130 @@
+<!-- 直方图和折线图的结合图 -->
+<template>
+  <div id="zhifang" style="width: 85%; height: 400px;margin-left: 100px;"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+export default {
+  props: {
+    xData:[],
+    yData: [],
+    legend:String,
+    title:String,
+  },
+  data(){
+    return{
+      x:this.xData,
+      y:this.yData,
+
+    }
+  },
+  watch:{
+    xData(newV){
+      console.log(newV)
+      this.initGraph()
+      console.log(this.legend)
+    }
+  },
+  methods:{
+    initGraph()
+    {
+      var myChart = echarts.init(document.getElementById("zhifang"));
+      var option = {
+        title: {
+          text: this.title,
+          left: "center",
+          textStyle: {
+            fontSize: 17,
+            lineHeight: 30,
+          },
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+        },
+        grid: {
+          right: "20%",
+        },
+        legend: {
+          data: this.legend,
+          padding: [70, 0, 0, 100],
+          orient: 'vertical',
+        },
+        xAxis: [
+          {
+            type: "category",
+            axisTick: {
+              alignWithLabel: true,
+              show: false
+            },
+            axisLabel: {
+              // interval: 0,
+              rotate: 30
+            },
+            data: this.xData
+          },
+        ],
+        yAxis: [
+          {
+            type: "value",
+            name: this.legend,
+            position: "right",
+            alignTicks: true,
+            axisLine: {
+              show: true,
+            },
+            axisLabel: {
+              formatter: "{value}",
+              textStyle: {
+                color: 'blue'
+              }
+            },
+          },
+          // {
+          //   type: "value",
+          //   name: "收盘价",
+          //   position: "left",
+          //   alignTicks: true,
+          //   axisLine: {
+          //     show: true,
+          //   },
+          //   axisLabel: {
+          //     formatter: "{value}元",
+          //     textStyle: {
+          //       color: 'green'
+          //     }
+          //   },
+          // },
+        ],
+        series: [
+          {
+            name: this.legend,
+            type: "line",
+            smooth:true,
+            markPoint: {
+              symbol: 'circle', // 设置拐点小圆点
+              // symbolSize:8, // 设置拐点小圆点大小
+            },
+            data: this.yData
+          },
+          // {
+          //   name: "收盘价",
+          //   type: "line",
+          //   yAxisIndex: 1,
+          //   data: [
+          //     10, 25, 30, 19, 12, 16, 26, 23, 20, 17, 21, 15,
+          //   ],
+          // },
+        ],
+      };
+      myChart.setOption(option);
+    }
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/components/halfYear.vue b/src/components/halfYear.vue
new file mode 100644
index 0000000..f2e1f2d
--- /dev/null
+++ b/src/components/halfYear.vue
@@ -0,0 +1,208 @@
+<template>
+  <div class="el-quarter-picker">
+    <el-popover v-model="visible" placement="bottom-start" transition="el-zoom-in-top" trigger="click">
+      <div class="content">
+        <p>
+          <button type="button" aria-label="前一年" class="el-picker-panel__icon-btn el-date-picker__prev-btn el-icon-d-arrow-left" @click="prev" />
+          <span role="button" class="span-year">{{ year }}年</span>
+          <button type="button" aria-label="后一年" class="el-picker-panel__icon-btn el-date-picker__next-btn el-icon-d-arrow-right" @click="next" />
+        </p>
+        <div class="choose-item">
+          <button :class="classStyle1" :disabled="disabled1" @click="selectHalfYear('上半年')">上半年</button>
+          <button :class="classStyle2" :disabled="disabled2" @click="selectHalfYear('下半年')">下半年</button>
+        </div>
+      </div>
+
+      <el-input slot="reference" v-model="text" :placeholder="'选择半年'" size="small" @change="iptchange">
+        <i slot="prefix" class="el-input__icon el-icon-date" />
+      </el-input>
+    </el-popover>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'HalfYearPicker',
+  model: {
+    prop: 'value',
+    event: 'change'
+  },
+  props: ['value', 'disabledTime', 'indexkey'], // disabledTime 格式为 YYYY-MM
+  data() {
+    return {
+      visible: false,
+      text: '',
+      year: new Date().getFullYear(),
+      nowmonth: new Date().getMonth(),
+      nowyear: new Date().getFullYear(),
+      emit_value: [],
+      clickyear: '',
+      clickmonth: '',
+      disabled1: false, // 禁止，开始时间之前
+      disabled2: false // 禁止，开始时间之前
+    }
+  },
+  computed: {
+    classStyle1: function() {
+      return {
+        today: (this.nowyear === this.year) && (this.nowmonth < 6 || this.nowmonth) === 6,
+        clickcell: (this.year === this.clickyear) && (this.clickmonth === '上半年'),
+        selectMonth: true,
+        'is-disabled': (this.year > this.nowyear) || this.disabled1
+      }
+    },
+    classStyle2: function() {
+      return {
+        today: (this.nowyear === this.year) && (this.nowmonth > 6),
+        clickcell: (this.year === this.clickyear) && (this.clickmonth === '下半年'),
+        selectMonth: true,
+        'is-disabled': (this.year > this.nowyear) || ((this.year === this.nowyear) && this.nowmonth < 7) || this.disabled2
+      }
+    }
+  },
+  watch: {
+    indexkey() {
+      if (this.disabledTime) {
+        this.aviod(this.disabledTime)
+      }
+    }
+  },
+  mounted() {
+    if (this.disabledTime) {
+      this.aviod(this.disabledTime)
+    }
+  },
+  methods: {
+    // 上一年
+    prev() {
+      this.year = this.year * 1 - 1
+      this.aviod(this.disabledTime)
+    },
+    // 下一年
+    next() {
+      this.year = this.year * 1 + 1
+      this.aviod(this.disabledTime)
+    },
+    // 点击选项事件
+    selectHalfYear(item) {
+      this.text = this.year + item
+      this.clickyear = this.year
+      this.clickmonth = item
+      if (item === '上半年') {
+        const data1 = this.year + '-01-01'
+        const data2 = this.year + '-06-30'
+        this.emit_value = [data1, data2]
+      } else {
+        const data1 = this.year + '-07-01'
+        const data2 = this.year + '-12-31'
+        this.emit_value = [data1, data2]
+      }
+      this.visible = false
+      this.$emit('change', this.emit_value)
+    },
+    // 自主输入判断
+    iptchange(val) {
+      if (val !== '') {
+        const year = val.slice(0, 4)
+        const text = val.slice(5, 8)
+        const reg = /^[0-9]{4}$/
+        if (reg.test(year)) {
+          if (text === '上半年' || text === '下半年') {
+            this.text = val
+            this.clickyear = year
+            this.clickmonth = text
+            const data1 = this.year + '-01-01'
+            const data2 = this.year + '-06-30'
+            this.emit_value = [data1, data2]
+            this.$emit('change', this.emit_value)
+          } else {
+            this.text = ''
+          }
+        } else {
+          this.text = ''
+        }
+      } else {
+        this.$emit('change', ['', ''])
+      }
+    },
+    aviod(timeA) {
+      const time = timeA.date
+      if (time) {
+        const year = time.slice(0, 4)
+        const month = time.slice(5, 7)
+        if (timeA.type === 2) {
+          if (this.year < year) {
+            this.disabled1 = true
+            this.disabled2 = true
+          } else if (Number(this.year) === Number(year) && Number(month) > 6) {
+            this.disabled1 = true
+            this.disabled2 = false
+          } else {
+            this.disabled1 = false
+            this.disabled2 = false
+          }
+        } else {
+          if (this.year > year) {
+            this.disabled1 = true
+            this.disabled2 = true
+          } else if (Number(this.year) === Number(year) && Number(month) <= 6) {
+            this.disabled1 = false
+            this.disabled2 = true
+          } else {
+            this.disabled1 = false
+            this.disabled2 = false
+          }
+        }
+      } else {
+        this.disabled1 = false
+        this.disabled2 = false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  width: 220px;
+  min-width: 220px;
+  p {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: solid 1px #ebeef5;
+    padding-bottom: 12px;
+    font-size: 16px;
+    button {
+      margin-top: 0;
+    }
+  }
+  .choose-item {
+    display: flex;
+    justify-content: space-around;
+    .selectMonth {
+      margin: 14px 10px;
+      font-size: 12px;
+      background: transparent;
+    }
+    .selectMonth:hover {
+      color: #409eff;
+      cursor: pointer;
+    }
+    .today {
+      color: #409eff;
+      font-weight: 700;
+    }
+    .clickcell {
+      color: #409eff;
+    }
+    .is-disabled {
+      color: #c0c4cc !important;
+      cursor: not-allowed !important;
+      background-color: #fff;
+      border-color: #ebeef5;
+    }
+  }
+}
+</style>
+
diff --git a/src/components/old.vue b/src/components/old.vue
new file mode 100644
index 0000000..e19ab8a
--- /dev/null
+++ b/src/components/old.vue
@@ -0,0 +1,265 @@
+<template>
+  <div>
+    <div ref="whole risk"  style="width: 1200px; height: 350px;margin-left: 0px;margin-top: 0px;"></div>
+    <div class="warning-component">
+      <div class="warning-dates">
+        <div class="date-item">前日：<span>{{ prevDayRisk }}</span></div>
+        <div class="date-item">昨日：<span>{{ yesterdayRisk }}</span></div>
+        <div class="date-item">今日：<span>{{ todayRisk }}</span></div>
+        <div class="date-item">明日：<span>{{ tomorrowRisk }}</span></div>
+        <div class="warning-recent">
+          最近预警：<span>{{ warningRisk }}</span>
+
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import http from "@/utils/request";
+
+export default {
+
+  data(){
+    return {
+      prevDayRisk:'',
+      yesterdayRisk:'',
+      todayRisk:'',
+      tomorrowRisk:'',
+      warningRisk:'',
+      riskData:[],
+      markLine: [],
+      markPoint: [],
+      markArea:[],
+
+    }
+  },
+
+  mounted() {
+    http.get('/risk/whole/').then((res)=>{
+      this.riskData=res.data.wholerisk
+      this.markPoint=res.data.markpoint
+      this.markLine=res.data.markline
+      this.markArea=res.data.markarea
+      this.prevDayRisk=res.data.detail[0]
+      this.yesterdayRisk=res.data.detail[1]
+      this.todayRisk=res.data.detail[2]
+      this.tomorrowRisk=res.data.detail[3]
+      this.warningRisk=res.data.detail[4]
+      // console.log(this.riskData,this.markLine,this.markPoint[0])
+      this.initChart()
+    })
+
+    // this.initChart(this.dat)
+
+  },
+
+  methods:{
+    initChart(){
+      /*
+      示例参考如下
+      * https://echarts.apache.org/v4/examples/zh/editor.html?c=line-aqi
+      *
+      * https://cdn.jsdelivr.net/gh/apache/echarts-website@asf-site/examples/data/asset/data/aqi-beijing.json
+      *
+      * */
+      let data=this.riskData
+      var myChart = echarts.init(this.$refs["whole risk"])
+      let option = {
+        title: {
+          text: '系统性风险指数',
+          left:'center'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        xAxis: {
+
+          data: data.map(function (item) {
+            return item[0];
+          })
+        },
+        yAxis: {
+          scale:true,
+          splitLine: {
+            show: false
+          }
+        },
+
+        toolbox: {
+          right: 120,
+          feature: {
+            // dataZoom: {
+            //   yAxisIndex: 'none'
+            // },
+            dataView:{
+              show:true,
+              title: '查看数据',
+            },
+            restore: {},
+            saveAsImage: {}
+          }
+        },
+        //以下是时间轴
+        dataZoom: [{
+          //也应该是动态的
+          startValue: '2022-07-01'
+        }, {
+          type: 'inside'
+        }],
+        //以上是时间轴
+        visualMap: {
+          top: 10,
+          right: 0,
+          precision:2,
+          pieces: [
+            {
+              gt: 0,
+              lte: parseFloat(this.markLine[0]),
+              color: '#096'
+            },
+            {
+              gt: parseFloat(this.markLine[0]),
+              lte: parseFloat(this.markLine[1]),
+              color: '#ffde33'
+            },
+            //   {
+            //   gt: 100,
+            //   lte: 150,
+            //   color: '#ff9933'
+            // },
+            //   {
+            //   gt: 150,
+            //   lte: 200,
+            //   color: '#cc0033'
+            // },
+            //   {
+            //   gt: 200,
+            //   lte: 300,
+            //   color: '#660099'
+            // },
+            //   {
+            //   gt: 300,
+            //   color: '#7e0023'
+            // }
+          ],
+          outOfRange: {
+            color: '#fa0744'
+          }
+        },
+        series: {
+          name: '系统性风险指数',
+          type: 'line',
+          data: data.map(function (item) {
+            return item[1];
+          }),
+
+          //标记极端值
+          markPoint:{
+            symbol:'circle',
+            symbolSize:10,
+            data: [{
+              itemStyle:{
+                //标注的颜色
+                color: {
+                  type: 'radial',
+                  x: 0.5,
+                  y: 0.5,
+                  r: 0.5,
+                  colorStops: [{
+                    offset: 0, color: 'purple' // 0% 处的颜色
+                  }, {
+                    offset: 1, color: '#258ddc' // 100% 处的颜色
+                  }],
+                  global: false // 缺省为 false
+                }
+              },
+              //x轴的index和y值
+              coord: this.markPoint[0] // 其中 5 表示 xAxis.data[5]，即 '33' 这个元素。
+              // coord: ['5', 33.4] // 其中 '5' 表示 xAxis.data中的 '5' 这个元素。
+              // 注意，使用这种方式时，xAxis.data 不能写成 [number, number, ...]
+              // 而只能写成 [string, string, ...]
+            }]
+
+          },
+          markLine: {
+            //阈值标记线  这里应该是动态的
+            silent: true,
+            symbol:'none',
+            lineStyle:{
+              color:'black'
+
+            },
+            data: [{
+              yAxis: this.markLine[0]
+            }, {
+              yAxis:this.markLine[1]
+            },
+
+              //   {
+              //   yAxis: 200
+              // }, {
+              //   yAxis: 300
+              // }
+            ]
+          },
+          markArea:{
+            label: { // 分界线上的文字标签
+              position: 'end',
+              formatter: '预测值'
+            },
+            data:[[{
+              xAxis:'Tue'},
+              {
+                xAxis:'Thu'},
+            ]]
+
+
+
+          }
+        }
+      }
+      myChart.setOption(option);
+
+    }
+
+  },
+
+}
+</script>
+
+<style scoped>
+.warning-component {
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  padding: 10px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  max-width: 100%;
+  text-align: center;
+
+  margin: auto;
+}
+
+.warning-dates {
+  display: flex;
+  justify-content: space-between;
+//margin-bottom: 10px;
+}
+
+.date-item {
+  margin: 0 10px;
+  font-weight: bold;
+}
+
+.warning-recent {
+  color: #ff4d4f;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+.chart-div {
+  float: left;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/quterComponent.vue b/src/components/quterComponent.vue
index f6f4feb..11f0cd4 100644
--- a/src/components/quterComponent.vue
+++ b/src/components/quterComponent.vue
@@ -46,7 +46,8 @@
           v-model="text"
           :size="size"
           :readonly="!canEdit"
-          :disabled="disabled">
+          :disabled="disabled"
+          size="mini">
         <i slot="prefix" class="el-input__icon el-icon-date"></i>
         <i slot="suffix" class="el-input__icon el-icon-circle-close" v-show="showClear" style="cursor:pointer" @click.stop="clear"></i>
       </el-input>
@@ -388,6 +389,8 @@ export default {
 <style>
 .el-quarter-picker {
   width: 220px;
+  /* display:flex; */
   display: inline-block;
+  margin-right: 5px;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/region.vue b/src/components/region.vue
index e1765b2..115a8e3 100644
--- a/src/components/region.vue
+++ b/src/components/region.vue
@@ -1,3 +1,4 @@
+<!--目前数据没有详细到市区，所以两点改动：1 chinaMapHidden注释掉了点击事件，2 echarts里的数据切换改为接口固定数据-->
 <template>
   <div>
     <div class="echartsGroup">
@@ -14,6 +15,9 @@ import * as echarts from "echarts"
 import 'echarts/map/js/china.js' // 核心文件
 // require('echarts/theme/macarons') 
 export default {
+  props: {
+    newMapData:[]
+  },
   data() {
     return {
       mapData: [//自己做的模拟数据 后续根据业务展示
@@ -32,7 +36,6 @@ export default {
         {name: '陕西',value:12},
         {name: '辽宁',value:88},
         {name: '云南',value:23},
-
       ],
       provData:[
         {name:'深圳市',value:99},
@@ -82,6 +85,12 @@ export default {
       options:null,   //echarts 存数据
     };
   },
+  watch:{
+    newMapData(newValue){
+      console.log(1)
+      this.chinaMaprsult('china',newValue)
+    }
+  },
   mounted() {
     window.clickRoute= this.clickRoute;
 
@@ -95,27 +104,27 @@ export default {
     // 中国地图点击省份 显示当前省份的详细的地区。
     chinaMapHidden(chinaMap) {//（调用）
       console.log("chinaMapHidden调用成功")
-      let that = this
-      chinaMap.off('click')//这里解决多次触发点击事件 但是还会执行2次  引用echarts地图，点击各个省份时，点击一个调用两次接口，再点击一次，调用四次接口，再点击调用八次。。。。依次叠加，问题在于，没有将地图上的点击事件清空
-      chinaMap.on('click',async function(params){
-        if (params.name in that.provinces) {
-          var tmp=that.provinces[params.name] 
-          let s = await import('echarts/map/js/province/'+tmp+'.js')
-          console.log(s)
-          if (s){
-            // chinaMap.clear
-            let tmpData=[
-        {name:'深圳市',value:99},
-        {name:'深圳市',value:1005},
-        {name:'佛山市',value: 55564}
-      ]
-            that.chinaMaprsult(params.name,tmpData)
-          }
-        }
-      })
+      // let that = this
+      // chinaMap.off('click')//这里解决多次触发点击事件 但是还会执行2次  引用echarts地图，点击各个省份时，点击一个调用两次接口，再点击一次，调用四次接口，再点击调用八次。。。。依次叠加，问题在于，没有将地图上的点击事件清空
+      // chinaMap.on('click',async function(params){
+      //   if (params.name in that.provinces) {
+      //     var tmp=that.provinces[params.name]
+      //     let s = await import('echarts/map/js/province/'+tmp+'.js')
+      //     console.log(s)
+      //     if (s){
+      //       // chinaMap.clear
+      //       let tmpData=[
+      //   {name:'深圳市',value:99},
+      //   {name:'深圳市',value:1005},
+      //   {name:'佛山市',value: 55564}
+      // ]
+      //       that.chinaMaprsult(params.name,tmpData)
+      //     }
+      //   }
+      // })
     },
     // 渲染地图
-    chinaMaprsult(name=null,tmpData){
+       chinaMaprsult(name=null,tmpData){
       console.log("chinaMaprsult调用成功")
       let _this = this;
       // console.log(name)
@@ -140,13 +149,13 @@ export default {
           realtime: false,
           calculable: true,
           inRange: {
-            color: [ 'lightyellow', 'red']
+            color: [ 'lightgreen', 'yellow']
           }},
         tooltip: { // 鼠标移到图里面的浮动提示框
           trigger: 'item',  //数据项图形触发
           // triggerOn: 'click', //这里根据业务需要给点击事件做跳转,所以不能做悬浮了,如果做悬浮 点击不了文字跳转
           formatter:
-              '产业数量: {c0}<br />'
+              '风险数量: {c0}<br />'
           // function(params){
           //   console.log(params)
           //   let dat=params.data
@@ -217,7 +226,9 @@ export default {
           },
         },
         dataset:{
-          source: name=='china'?this.mapData:tmpData
+          //老的逻辑，为了根据点击切换市区数据
+          // source: name==='china'?this.mapData:tmpData
+          source:tmpData
         },
         series: [
           {
diff --git a/src/components/riskIndexComponent.vue b/src/components/riskIndexComponent.vue
new file mode 100644
index 0000000..af05f2c
--- /dev/null
+++ b/src/components/riskIndexComponent.vue
@@ -0,0 +1,152 @@
+<template>
+  <div>
+    <div ref="index"  style="width: 1200px; height: 400px;margin-left: 0px;margin-top: 0px;"></div>
+
+  </div>
+
+
+
+</template>
+
+<script>
+import * as echarts from "echarts";
+import http from "@/utils/request";
+
+export default {
+  props: {
+    date:[],
+    result:[],
+    title:String,
+    zoom:{
+      type:Array,
+      default: function () {
+        return []
+      }
+    }
+  },
+  data(){
+    return {
+      //数据库结构映射
+    mapTable:{'个体风险状态':["经营风险","信用风险","流动性风险","市场风险","非流动性"],'风险关联与溢出':["条件在险价值差额","Coplua","协整关系","吸收率"],'市场系统结构':['聚类系数','密度变化','同配性'],
+      '市场波动和趋势':['vixPlus指数','市场受损性']},
+      datazoom:[],
+    state:'个体风险状态'
+    }
+  },
+watch:{
+    title(newValue){
+    this.state=newValue
+    },
+  zoom(newVal){
+    this.datazoom=newVal
+  }
+},
+  mounted() {
+    var that=this
+  http.get('/risk/index/?table='+this.title).then((res)=>{
+    that.date=res.data.date
+    that.result=res.data.result
+    var series=[]
+    let nameLis=[]
+    for (let yaxis in this.result){
+      nameLis.push(this.result[yaxis].name)
+      series.push({
+        data:this.result[yaxis].data,
+        type:'line',
+        name:this.result[yaxis].name
+      })
+    }
+
+    this.initChart(nameLis,series)
+
+  })
+
+
+  },
+
+  methods:{
+    initChart(nameLis,series){
+      /*
+      示例参考如下
+      * https://echarts.apache.org/v4/examples/zh/editor.html?c=line-aqi
+      *
+      * https://cdn.jsdelivr.net/gh/apache/echarts-website@asf-site/examples/data/asset/data/aqi-beijing.json
+      *
+      * */
+      var myChart = echarts.init(this.$refs["index"])
+      let option = {
+        title: {
+          text: this.title,
+          left:'center'
+        },
+        grid:{
+          show:true,
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true,
+          backgroundColor:'#eee'
+        },
+        legend: {
+          top:30,
+          data: nameLis
+        }
+        ,
+        tooltip: {
+          trigger: 'axis'
+        },
+        xAxis: {
+          data: this.date
+        },
+        yAxis: {
+          scale:true,
+          splitLine: {
+            show: false
+          }
+        },
+
+        toolbox: {
+          right: 120,
+          feature: {
+            // dataZoom: {
+            //   yAxisIndex: 'none'
+            // },
+            dataView:{
+              show:true,
+              title: '查看数据',
+            },
+            restore: {},
+            saveAsImage: {}
+          }
+        },
+        //以下是时间轴
+        dataZoom: [{
+          //也应该是动态的
+          startValue: '2022-07-01'
+        }, {
+          type: 'inside'
+        }],
+        //以上是时间轴
+
+        series: series,
+
+      }
+      myChart.setOption(option);
+      myChart.dispatchAction({
+        type: 'dataZoom',
+        batch: [{
+          // 第一个 dataZoom 组件
+          start: this.datazoom[0],
+          end: this.datazoom[1]
+        }]
+      })
+    }
+
+  },
+
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/systemRiskComponent.vue b/src/components/systemRiskComponent.vue
new file mode 100644
index 0000000..c3a3aa7
--- /dev/null
+++ b/src/components/systemRiskComponent.vue
@@ -0,0 +1,389 @@
+<template>
+<div>
+  <div style="display: flex;">
+    <div  ref="whole risk"  style=" float: left;width: 1200px; height: 350px;margin-left: 15px;margin-top: 0px;margin-right: 0px"></div>
+    <div  ref="future"  style=" float: left; width: 50px; height: 350px;margin-left: -127px;margin-top: 0px;"></div>
+
+  </div>
+  <div class="warning-component">
+    <div class="warning-dates">
+      <div class="date-item">前日：<span>{{ prevDayRisk }}</span></div>
+      <div class="date-item">昨日：<span>{{ yesterdayRisk }}</span></div>
+      <div class="date-item">今日：<span>{{ todayRisk }}</span></div>
+      <div class="date-item">明日：<span>{{ tomorrowRisk }}</span></div>
+      <div class="warning-recent">
+        最近预警：<span>{{ warningRisk }}</span>
+
+      </div>
+    </div>
+  </div>
+</div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import http from "@/utils/request";
+
+export default {
+
+  data(){
+    return {
+      yMax:2,
+      yMin:0,
+      prevDayRisk:'',
+      yesterdayRisk:'',
+      todayRisk:'',
+      tomorrowRisk:'',
+      warningRisk:'',
+      riskData:[],
+      markLine: [],
+      markPoint: [],
+      markArea:[],
+      future:[],
+      datazoom:[]
+    }
+  },
+props:{
+    zoom:{
+      type:Array,
+      default: function () {
+        return []
+      }
+    }
+},
+  watch:{
+    zoom(newVal){
+      this.datazoom=newVal
+    },
+    yMax(newVal){
+      console.log(newVal)
+    }
+
+  },
+  mounted() {
+    http.get('/risk/whole/').then((res)=>{
+      this.riskData=res.data.wholerisk
+      this.markPoint=res.data.markpoint
+      this.markLine=res.data.markline
+      this.markArea=res.data.markarea
+      this.prevDayRisk=res.data.detail[0]
+      this.yesterdayRisk=res.data.detail[1]
+      this.todayRisk=res.data.detail[2]
+      this.tomorrowRisk=res.data.detail[3]
+      this.warningRisk=res.data.detail[4]
+      this.future=res.data.future
+      // console.log(this.riskData,this.markLine,this.markPoint[0])
+      this.initChart()
+    })
+
+    // this.initChart(this.dat)
+
+  },
+
+  methods:{
+    initChart(){
+      /*
+      示例参考如下
+      * https://echarts.apache.org/v4/examples/zh/editor.html?c=line-aqi
+      *
+      * https://cdn.jsdelivr.net/gh/apache/echarts-website@asf-site/examples/data/asset/data/aqi-beijing.json
+      *
+      * */
+      let data=this.riskData
+      const future=this.future
+      var myChart = echarts.init(this.$refs["whole risk"])
+      var myChartFuture= echarts.init(this.$refs["future"])
+      let option = {
+        title: {
+          text: '系统性风险指数',
+          left:'center'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        xAxis: {
+          axisLabel:{
+            fontSize:5
+          },
+          data: data.map(function (item) {
+            return item[0];
+          })
+        },
+        yAxis: {
+          scale:true,
+          splitLine: {
+            show: false
+          }
+        },
+
+        toolbox: {
+          right: 120,
+          feature: {
+            // dataZoom: {
+            //   yAxisIndex: 'none'
+            // },
+            dataView:{
+              show:true,
+              title: '查看数据',
+            },
+            restore: {},
+            saveAsImage: {}
+          }
+        },
+        //以下是时间轴
+        dataZoom: [{
+          //也应该是动态的
+          startValue: '2022-07-01'
+        }, {
+          type: 'inside'
+        }],
+        //以上是时间轴
+        visualMap: {
+          top: 10,
+          right: 0,
+          precision:2,
+          pieces: [
+            {
+              gt: 0,
+              lte: parseFloat(this.markLine[0]),
+              color: '#096'
+            },
+            {
+              gt: parseFloat(this.markLine[0]),
+              lte: parseFloat(this.markLine[1]),
+              color: '#ffde33'
+            },
+            //   {
+            //   gt: 100,
+            //   lte: 150,
+            //   color: '#ff9933'
+            // },
+            //   {
+            //   gt: 150,
+            //   lte: 200,
+            //   color: '#cc0033'
+            // },
+            //   {
+            //   gt: 200,
+            //   lte: 300,
+            //   color: '#660099'
+            // },
+            //   {
+            //   gt: 300,
+            //   color: '#7e0023'
+            // }
+          ],
+          outOfRange: {
+            color: '#fa0744'
+          }
+        },
+        series: {
+          name: '系统性风险指数',
+          type: 'line',
+          data: data.map(function (item) {
+            return item[1];
+          }),
+
+          //标记极端值
+          markPoint:{
+            symbol:'circle',
+            symbolSize:10,
+            data: [{
+              itemStyle:{
+                //标注的颜色
+                color: {
+                  type: 'radial',
+                  x: 0.5,
+                  y: 0.5,
+                  r: 0.5,
+                  colorStops: [{
+                    offset: 0, color: 'purple' // 0% 处的颜色
+                  }, {
+                    offset: 1, color: '#258ddc' // 100% 处的颜色
+                  }],
+                  global: false // 缺省为 false
+                }
+              },
+              //x轴的index和y值
+              coord: this.markPoint[0] // 其中 5 表示 xAxis.data[5]，即 '33' 这个元素。
+              // coord: ['5', 33.4] // 其中 '5' 表示 xAxis.data中的 '5' 这个元素。
+              // 注意，使用这种方式时，xAxis.data 不能写成 [number, number, ...]
+              // 而只能写成 [string, string, ...]
+            }]
+
+          },
+          markLine: {
+            //阈值标记线  这里应该是动态的
+            silent: true,
+            symbol:'none',
+            label:{ position:'middle',},
+
+            lineStyle:{
+              color:'black'
+
+            },
+            data: [{
+              yAxis: this.markLine[0]
+            }, {
+              yAxis:this.markLine[1]
+            },
+
+              //   {
+              //   yAxis: 200
+              // }, {
+              //   yAxis: 300
+              // }
+            ]
+          },
+          markArea:{
+            label: { // 分界线上的文字标签
+              // position: 'end',
+              formatter: '预测值'
+            },
+            data:[[{
+              xAxis:this.markArea[0]},
+              {
+                xAxis:this.markArea[1]
+                // x:'100%'
+              },
+            ]]
+
+          }
+        }
+      }
+      let opt2={
+        tooltip: {
+          trigger: 'item',
+        },
+        grid:
+
+          {backgroundColor: '#eeb0ae',
+            left:'0%',
+            show:true,
+            zlevel:0,
+          }
+        ,
+        xAxis:
+          {
+            data:[{value:'未来一个月'}],
+            axisLabel:{
+              fontSize:5
+            }
+            // gridIndex: 0,
+          },
+        yAxis: {
+          min:0.8,
+          max:2,
+          type: 'value',
+          show:false,
+
+          // gridIndex: 1
+        },
+        series: {
+          type: 'boxplot',
+          boxWidth : [2, 10],
+          data:[{value: this.future,} ],
+          // 确保箱型图显示在折线图之后
+          // zlevel: 3,
+          // 箱型图的x轴数据应对应未来一个月的日期，由于这些日期没有具体值，我们使用null，ECharts会自动处
+          // ... 箱型图其他配置，如颜色、样式等
+          markArea:{
+            label: { // 分界线上的文字标签
+              // position: 'end',
+              formatter: '预测值'
+            },
+            itemStyle:{
+              color:'yellow'
+            }
+            // data: [[  {
+            //   name: '平均值到最大值',
+            //   type: 'average'
+            // },
+            //   {
+            //     type: 'max'
+            //   }]]
+          },
+          tooltip: {
+            formatter: function (param) {
+              return [
+                // 'Experiment ' + param.name + ': ',
+                '最大值: ' + future[4],
+                '均值+标准差: ' + future[3],
+                '中位数: ' +future[2],
+                '均值-标准差: ' + future[1],
+                '最小值: ' + future[0]
+              ].join('<br/>');
+            }
+          }
+        }
+      }
+      myChart.setOption(option);
+      myChartFuture.setOption(opt2)
+      const that=this
+      myChart.on('datazoom', function (params) {
+        // Y轴最大值
+        this.yMax = myChart.getModel().getComponent('yAxis').axis.scale._extent[1];
+        // Y轴最小值
+        this.yMin = myChart.getModel().getComponent('yAxis').axis.scale._extent[0];
+
+        that.$nextTick(() => {
+          // 设置 myChartFuture 的 y 轴值
+          myChartFuture.setOption({
+            yAxis: {
+              min: this.yMin,
+              max: this.yMax
+            }
+          });
+        });
+
+        // that.$emit("datazoom",[params.start,params.end])
+
+      });
+
+      // myChart.dispatchAction({
+      //   type: 'dataZoom',
+      //   batch: [{
+      //     // 第一个 dataZoom 组件
+      //     start: this.datazoom[0],
+      //     end: this.datazoom[1]
+      //   }]
+      // })
+
+    }
+
+  },
+
+}
+</script>
+
+<style scoped>
+.warning-component {
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  padding: 10px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  max-width: 100%;
+  text-align: center;
+
+  margin: auto;
+}
+
+.warning-dates {
+  display: flex;
+  justify-content: space-between;
+//margin-bottom: 10px;
+}
+
+.date-item {
+  margin: 0 10px;
+  font-weight: bold;
+}
+
+.warning-recent {
+  color: #ff4d4f;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/components/systemRiskFuture.vue b/src/components/systemRiskFuture.vue
new file mode 100644
index 0000000..5155002
--- /dev/null
+++ b/src/components/systemRiskFuture.vue
@@ -0,0 +1,112 @@
+<template>
+<div>
+  <el-carousel :interval="5000" arrow="always" height="380px" :autoplay="false" indicator-position="outside" style="margin-top: 9px">
+    <el-carousel-item v-for="item in 8" :key="item">
+<!--      <h3 class="medium">{{ item }}</h3>-->
+<!--      <el-button type="mini" icon="el-icon-arrow-left" circle style="margin: 3px" @click="sendMessage"> </el-button>-->
+      <div ref="chartContainer" style="width:1150px; height: 330px;margin: 1px"></div>
+    </el-carousel-item>
+  </el-carousel>
+</div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import http from "@/utils/request";
+export default {
+  name: "systemRiskFuture",
+  data(){
+    return{
+      date:[],
+      rate:[],
+      macro:[],
+      montary:[],
+      income:[],
+      investment:[],
+      loan:[],
+      lever:[],
+      other:[],
+      whole:[],
+      title:['利率','宏观指标','货币','收入和融资','银行理财','信贷','整体杠杆','其他']
+    }
+  },
+  mounted() {
+    this.initGraph()
+
+  },
+  methods:{
+    sendMessage(){
+      this.$emit('transmit', 'systemRiskComponent')
+
+    },
+    initGraph(){
+      http.get('/risk/future_risk/').then((res)=>{
+        this.date=res.data.date
+        this.rate=res.data.rate
+        this.macro=res.data.macro
+        this.montary=res.data.montary
+        this.income=res.data.income
+        this.investment=res.data.investment
+        this.loan=res.data.loan
+        this.lever=res.data.lever
+        this.other=res.data.other
+        this.whole.push(this.rate)
+        this.whole.push(this.macro)
+        this.whole.push(this.montary)
+        this.whole.push(this.income)
+        this.whole.push(this.investment)
+        this.whole.push(this.loan)
+        this.whole.push(this.lever)
+        this.whole.push(this.other)
+      }).then(()=>{
+        for(let i = 0; i < 8; i++) {
+        let echart = echarts.init(this.$refs.chartContainer[i])
+
+        const option = {
+          title:{text:this.title[i],
+          left:'center'
+          },
+          tooltip: {
+            trigger: 'axis'
+          },
+            legend: {
+              top:30,
+
+            },
+          xAxis: {
+            type: 'category',
+            data: this.date
+          },
+          yAxis: {
+            type: 'value'
+          },
+          series: this.whole[i]
+        };
+        echart.setOption(option)
+      }}
+
+      )
+
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+.el-carousel__item h3 {
+  color: #475669;
+  font-size: 18px;
+  opacity: 0.75;
+  line-height: 300px;
+  margin: 0;
+}
+
+.el-carousel__item:nth-child(2n) {
+  background-color: #d3dce6;
+}
+
+.el-carousel__item:nth-child(2n+1) {
+  background-color: #d3dce6;
+}
+</style>
\ No newline at end of file
diff --git a/src/libs/rem.js b/src/libs/rem.js
new file mode 100644
index 0000000..9058a86
--- /dev/null
+++ b/src/libs/rem.js
@@ -0,0 +1,58 @@
+class DevicePixelRatio {
+    constructor() {
+      // this.flag = false;
+    }
+    // 获取系统类型
+    _getSystem() {
+      // let flag = false;
+      var agent = navigator.userAgent.toLowerCase();
+      //		var isMac = /macintosh|mac os x/i.test(navigator.userAgent);
+      //		if(isMac) {
+      //			return false;
+      //		}
+      // 现只针对windows处理，其它系统暂无该情况，如有，继续在此添加
+      if (agent.indexOf('windows') >= 0) {
+        return true;
+      }
+    }
+    // 获取页面缩放比例
+    //	_getDevicePixelRatio() {
+    //		let t = this;
+    //	}
+    // 监听方法兼容写法
+    _addHandler(element, type, handler) {
+      if (element.addEventListener) {
+        element.addEventListener(type, handler, false);
+      } else if (element.attachEvent) {
+        element.attachEvent('on' + type, handler);
+      } else {
+        element['on' + type] = handler;
+      }
+    }
+    // 校正浏览器缩放比例
+    _correct() {
+      let t = this;
+      // 页面devicePixelRatio（设备像素比例）变化后，计算页面body标签zoom修改其大小，来抵消devicePixelRatio带来的变化。
+      document.getElementsByTagName('body')[0].style.zoom = 1.2 / window.devicePixelRatio;
+    //   修改这个代码可以调整显示大小：参考代码是1/……style.zoom = 1.2 / window.devicePixelRatio; 参考链接：https://blog.csdn.net/qq_39548550/article/details/127664450
+    }
+    // 监听页面缩放
+    _watch() {
+      let t = this;
+      t._addHandler(window, 'resize', function() { // 注意这个方法是解决全局有两个window.resize
+        // 重新校正
+        t._correct()
+      })
+    }
+    // 初始化页面比例
+    init() {
+      let t = this;
+      if (t._getSystem()) { // 判断设备，目前只在windows系统下校正浏览器缩放比例
+        // 初始化页面校正浏览器缩放比例
+        t._correct();
+        // 开启监听页面缩放
+        t._watch();
+      }
+    }
+  }
+  export default DevicePixelRatio;
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 031f792..47687b2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,7 +18,7 @@ Vue.use(ElementUI);//全局引入
 // 5以上的echarts不用引入，4要引入
 // import * as echarts from 'echarts'
 
-import echarts from "echarts";
+import   *  as echarts from "echarts";
 Vue.prototype.$echarts = echarts;
 
 
diff --git a/src/resources/scripts/axure/action.js b/src/resources/scripts/axure/action.js
index 14b3264..8c1bbbd 100644
--- a/src/resources/scripts/axure/action.js
+++ b/src/resources/scripts/axure/action.js
@@ -1970,7 +1970,7 @@
                     img = evaluatedImgs.mouseOver;
                 }
 
-                //            $('#' + $ax.repeater.applySuffixToElementId(elementId, '_img')).attr('src', img);
+                //            $('#' + $ax.repeater.applySuffixToElementId(elementId, '_img')).attr('src_old', img);
                 $jobj($ax.GetImageIdFromShape(elementId)).attr('src', img);
 
                 //Set up overrides
diff --git a/src/resources/scripts/axure/flyout.js b/src/resources/scripts/axure/flyout.js
index e98303f..1bdfa94 100644
--- a/src/resources/scripts/axure/flyout.js
+++ b/src/resources/scripts/axure/flyout.js
@@ -105,7 +105,7 @@ $axure.internal(function($ax) {
     var getSmallPolygon = function(r0, r1, info) {
         var points = [];
 
-        // NOTE: currently I make the assumption that if horizontal/vertical connecting lines from the src hit the target
+        // NOTE: currently I make the assumption that if horizontal/vertical connecting lines from the src_old hit the target
         //        Meaning if horizontal, rlr and lrl are true, and if vertical, tbt and bab are true.
 
         var r0Left = r0.Left();
diff --git a/src/resources/scripts/axure/ie.js b/src/resources/scripts/axure/ie.js
index cd99447..3b18723 100644
--- a/src/resources/scripts/axure/ie.js
+++ b/src/resources/scripts/axure/ie.js
@@ -227,7 +227,7 @@
 //        var imageInfo = viewId ? $ax.pageData.viewIdToBackgroundImageInfo && $ax.pageData.viewIdToBackgroundImageInfo[viewId] : $ax.pageData.defaultBackgroundImageInfo;
 //        if(imageInfo && imageInfo.path) {
 //            if($('#bg_img').length == 0) $('body').append('<img id="bg_img"/>');
-//            $('#bg_img').attr('src', imageInfo.path).css('position', 'fixed').css('z-index', '-10000');
+//            $('#bg_img').attr('src_old', imageInfo.path).css('position', 'fixed').css('z-index', '-10000');
 //            _resizeIEBackground();
 //        } else $('#bg_img').remove();
 //    };
@@ -281,7 +281,7 @@
 //    var _fixAllPngs = function() {
 //        if(!(/MSIE ((5\.5)|6)/.test(window.navigator.userAgent) && window.navigator.platform == "Win32")) return;
 
-//        $('img[src$=".png"]').each(function() {
+//        $('img[src_old$=".png"]').each(function() {
 //            if(!this.complete) {
 //                this.onload = function() { $axure.utils.fixPng(this); };
 //            } else {
diff --git a/src/resources/scripts/axure/move.js b/src/resources/scripts/axure/move.js
index 9c9224d..7ad7f25 100644
--- a/src/resources/scripts/axure/move.js
+++ b/src/resources/scripts/axure/move.js
@@ -3,7 +3,7 @@
     $ax.move = _move;
 
     var widgetMoveInfo = {};
-    //register and return move info, also create container for rootlayer if needed
+    //user and return move info, also create container for rootlayer if needed
     $ax.move.PrepareForMove = function (id, x, y, to, options, jobj, rootLayer, skipContainerForRootLayer) {
         var fixedInfo = jobj ? {} : $ax.dynamicPanelManager.getFixedInfo(id);
 
@@ -46,7 +46,7 @@
         }
 
         //todo currently this always save the info, which is not needed for compound vector children and maybe some other cases
-        //let's optimize it later, only register if registerid is valid..
+        //let's optimize it later, only user if registerid is valid..
         widgetMoveInfo[id] = {
             x: leftChanges === undefined ? horzX : leftChanges,
             y: topChanges === undefined ? vertY : topChanges,
@@ -88,7 +88,7 @@
         var object = $obj(id);
         if(object && $ax.public.fn.IsLayer(object.type)) {
             var childrenIds = $ax.public.fn.getLayerChildrenDeep(id, true);
-            //don't push container when register moveinfo for child
+            //don't push container when user moveinfo for child
             if(!skipOnMoveEvent) {
                 for(var i = 0; i < childrenIds.length; i++) $ax.move.PrepareForMove(childrenIds[i], x, y, to, options, null, moveInfo.rootLayer, true);
             }
diff --git a/src/resources/scripts/axutils.js b/src/resources/scripts/axutils.js
index 8579ee0..c720039 100644
--- a/src/resources/scripts/axutils.js
+++ b/src/resources/scripts/axutils.js
@@ -77,7 +77,7 @@ const GLOBAL_VAR_CHECKSUM = 'CSUM';
      };
 
      $axure.utils.loadJS = function(url) {
-         $('head').append('<script text="text/javascript" language="JavaScript" src="' + url + '"></script>');
+         $('head').append('<script text="text/javascript" language="JavaScript" src_old="' + url + '"></script>');
      };
 
      $axure.utils.curry = function(fn) {
diff --git a/src/resources/scripts/player/axplayer.js b/src/resources/scripts/player/axplayer.js
index 9b7ad43..21fb5df 100644
--- a/src/resources/scripts/player/axplayer.js
+++ b/src/resources/scripts/player/axplayer.js
@@ -1055,10 +1055,10 @@ var toolBarOnly = true;
         //    //    $('#interfaceControlFrameContainer').css('margin-left', '-' + $('#logoImage').width() / 2 + 'px');
         //    //    //$axure.player.resizeContent();
         //    //};
-        //    image.src = $axure.document.configuration.logoImagePath;
+        //    image.src_old = $axure.document.configuration.logoImagePath;
 
-        //    $('#interfaceControlFrameLogoImageContainer').html('<img id="logoImage" src="" />');
-        //    $('#logoImage').attr('src', $axure.document.configuration.logoImagePath);//.on('load', function () { $axure.player.resizeContent(); });
+        //    $('#interfaceControlFrameLogoImageContainer').html('<img id="logoImage" src_old="" />');
+        //    $('#logoImage').attr('src_old', $axure.document.configuration.logoImagePath);//.on('load', function () { $axure.player.resizeContent(); });
         //} else $('#interfaceControlFrameLogoImageContainer').hide();
 
         //if ($axure.document.configuration.logoImageCaption) {
@@ -1486,7 +1486,7 @@ var toolBarOnly = true;
                     /******* DEBUG: Allows for debugging/viewing feedback9.js in browser inspect mode ******/
                     //var hdr = document.createElement('script');
                     //hdr.type = "text/javascript"
-                    //hdr.src = '/Scripts/plugins/feedback/feedback9.js';
+                    //hdr.src_old = '/Scripts/plugins/feedback/feedback9.js';
                     //document.head.appendChild(hdr);
                 }
             }
diff --git a/src/router/index.js b/src/router/index.js
index e8683d9..ab85589 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,25 +8,31 @@ import VueRouter from 'vue-router'
 
 import Main from '../views/Main.vue'
 import Home from '../views/Home.vue'
-import register from '@/register/index'
-import login2 from '@/views/login'
+import register from '@/user/register'
+import test from "@/views/test";
 import 	市场主体分析	from   '../views/市场主体分析.vue'
 import 	系统性风险分析	from   '../views/系统性风险分析.vue'
+import systemRiskV2 from "@/components/systemRiskComponent";
 import 	个体风险分析	from   '../views/个体风险分析.vue'
-import  login from "@/views/index";
+import  login from "@/user/login";
 import 	高影响力主体分析	from '../views/高影响力主体分析.vue'
 import 	预警服务	from       '../views/预警服务.vue'
 import 	风险预警	from       '../views/风险预警.vue'
 import 	异常检测	from       '../views/异常检测.vue'
-
+import warn from '@/views/404'
 import 	健康指数	from       '../views/健康指数.vue'
 import 	压力测试	from       '../views/压力测试.vue'
 import 	行情分析	from       '../views/行情分析.vue'
 import 	事件分析	from       '../views/事件分析.vue'
 import 	事件图谱	from       '../views/事件图谱.vue'
 import graphViewV4 from "@/views/graphViewV4";
+import 风险传导 from "@/views/风险传导"
 import 	大屏	from       '../bigscreen/大屏.vue'
-import user from "@/store/user";
+import 	UserManagement	from     '../views/UserManagement.vue'
+
+import SSE from "@/views/SSE";
+// import tab from "@/store/tab";
+
 
 // 解决重复点击页面报NavigationDuplicated: Avoided redundant navigation to current locat
 const originalPush = VueRouter.prototype.push
@@ -51,49 +57,105 @@ const routes = [
 
   { path:'/',
     component:Main,
-    redirect:'home',//当地址是/时就重定向到home
-    // meta : {                      //加一个自定义obj
-    //   requireAuth:true      //这个参数 true 代表需要登录才能进入A
-    // },
+    redirect:'systematic_risk',//当地址是/时就重定向到market_entities
+    meta : {                      //加一个自定义obj
+      requireAuth:true      //这个参数 true 代表需要登录才能进入A
+    },
     children:[
       //子路由
       {path:'/home', name:'home',component:Home},//首页
       {path:'/market_entities',name:'market_entities',component:市场主体分析,
-        // meta : {                      //加一个自定义obj
-        //   requireAuth:true      //这个参数 true 代表需要登录才能进入A
-        // }
+        meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }
         },//1
-      {path:'/systematic_risk',name:'systematic_risk', component:系统性风险分析},//2-1
-      {path:'/individual_risk',name:'individual_risk', component:个体风险分析},//2-2
+      {path:'/systematic_risk',name:'systematic_risk', component:系统性风险分析, meta : {                      //加一个自定义obj
+          requireAuth:true      //这个参数 true 代表需要登录才能进入A
+        },},//2-1
 
-      {path:'/influential_entities', name:'influential_entities', component:高影响力主体分析},//3
+      // {path:'/systemriskV2',name:'systemriskV2', component:systemRiskV2, meta : {                      //加一个自定义obj
+      //     requireAuth:true      //这个参数 true 代表需要登录才能进入A
+      //   },},//2-1
 
-      {path:'/warning',       name:'warning',       component:预警服务},//4-1
-      {path:'/risk_warning',       name:'risk_warning',       component:风险预警},//4-1
-      {path:'/abnormal_detection', name:'abnormal_detection', component:异常检测},//4-2
-      {path:'/health',    name:'health',    component:健康指数},//5
+      {path:'/individual_risk',name:'individual_risk', component:个体风险分析, meta : {                      //加一个自定义obj
+          requireAuth:true      //这个参数 true 代表需要登录才能进入A
+        },},//2-2
+
+      {path:'/influential_entities', name:'influential_entities', component:高影响力主体分析, meta : {                      //加一个自定义obj
+          requireAuth:true      //这个参数 true 代表需要登录才能进入A
+        },},//3
+
+      {path:'/warning',       name:'warning',       component:预警服务,
+      meta : {                      //加一个自定义obj
+          keepAlive:true,
+        requireAuth:true
+        }},//4-1
+
+      {path:'/risk_warning',       name:'risk_warning',       component:风险预警,
+        meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},//4-1
+      {path:'/abnormal_detection', name:'abnormal_detection', component:异常检测,
+        meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},//4-2
+      {path:'/health',    name:'health',    component:健康指数, meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},//5
+      {path:'/diffus',    name:'diffus',  props: true, // 启用路由参数作为组件属性传递
+        component:风险传导, meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},
       {path:'/pressure',  name:'pressure',  component:压力测试,    meta : {                      //加一个自定义obj
           requireAuth:true      //这个参数 true 代表需要登录才能进入A
         }},//6
-      {path:'/quotation', name:'quotation', component:行情分析},//7
-      {path:'/event_analysis',  name:'event_analysis',  component:事件分析},//8-1
-      {path:'/event_graph',     name:'event_graph',     component:事件图谱},//8-2
-      {path:'/knowladgeGraph',     name:'knowladgeGraph',     component:graphViewV4},
-      
+      {path:'/quotation', name:'quotation', component:行情分析, meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},//7
+      {path:'/event_analysis',  name:'event_analysis',  component:事件分析,
+        meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},//8-1
+      {path:'/event_graph',     name:'event_graph',     component:事件图谱,
+        meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},//8-2
+      {path:'/knowladgeGraph',     name:'knowladgeGraph',     component:graphViewV4,meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},
+
+        // 用户管理
+      {path:'/UserManagement',name :'UserManagement',component: UserManagement, meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},
+
+
     ]
 
   },
+  // 登录
   {path:'/login',name :'login',component: login},
   // {path:'/login2',name :'login2',component: login2},
-  {path:'/register',name :'register',component: register},
-  //大屏
-  {
-    path:'/bigscreen',
-    component: 大屏,
-  }
 
-   
-     
+  // 注册
+  {path:'/register',name :'register',component: register},
+
+
+  //大屏
+  {path:'/bigscreen',name :'bigscreen',component: 大屏,},
+  {path:'/test',name :'test',component: test,},
+  {path:'/sse',name :'sse',component: SSE,},
+  {path:'/systemrisk',name :'systemrisk',component: systemRiskV2,}
   ]
 
 
@@ -109,9 +171,17 @@ export  const isLogin=false;
 
 //路由守卫
 router.beforeEach(async(to,from,next) => {
-  console.log(to.name)
+  const allowedRoutes = ['/systematic_risk', '/market_entities','/individual_risk','/influential_entities'
+    ,'/warning','/risk_warning','/abnormal_detection','/health','/diffus','/pressure','/quotation','/event_analysis',
+    '/event_graph','/knowladgeGraph','/UserManagement','/login','/register','/bigscreen','/test','/sse','/systemrisk'];
+  const name=sessionStorage.getItem('user')
+  // if (allowedRoutes.includes(to.path)) {
+  //   next();
+  // } else {
+  //   next('/'); // 重定向到首页或其他允许的路由
+  // }
   if (to.meta.requireAuth){//需要认证
-    if (user.state.isLogin || !user.state.isLogin && (to.name==='/register' || to.name==='/login')){
+    if (name || !name && (to.name==='/user' || to.name==='/login')){
       next()
     }else {
       next('/login')
@@ -125,49 +195,4 @@ router.beforeEach(async(to,from,next) => {
     next()
   }
 })
-//   //next() :是否通过
-//   //  参数   ：无         通过
-//   //          false       不通过
-//   //          具体地址     跳转到指定的地址
-//
-//
-//   /*
-//   验证登录
-//   有些路由是需要登录的，判断登录状态
-//       1，没有登录：跳转到登录页
-//       2，登录，直接进入
-//   有些路由不需要登录，直接进入；
-//   ps:是否需要登录 --meta
-//   */
-//   const token = sessionStorage.getItem('token');
-//   const isLogin = !!token;
-//   console.log(isLogin)
-//   // 考虑到token非法？ 进入路由的时候，需要向后端发送token，验证是否合法
-//   // const data = function () {
-//   //   http.get('/login')
-//   //   return 'sucess'
-//   // };
-//   // Store.commit('chageUserInfo',data.data);
-//
-//   console.log(to.name);
-//     if(isLogin){ //已经登录的 直接通过
-//       // if(data.error===400){
-//       //   next({name:'home'});
-//       //   localStorage.removeItem('token');
-//       //   return;
-//       // }
-//       if(to.name === '/login'){
-//         next({name:'/home'});
-//       }else{
-//         next();
-//       }
-//     }
-//     if(!isLogin && to.name !== '/login'){ //未登录，去的也不是登录页
-//       next({name:'/login'});
-//     }
-//     else{
-//     next()
-//   }
-//
-// })
 
diff --git a/src/store/tab.js b/src/store/tab.js
index bd023a8..eb793b8 100644
--- a/src/store/tab.js
+++ b/src/store/tab.js
@@ -1,35 +1,79 @@
+// import user from "@/store/user";
+
 export default{
     state:{
         tabsList:[
-            {
-                path: "/",
-                name: "home",
-                label: "首页",
-                icon: "s-home",
-                url: "Home/Home",
-              },
+            // {
+            //     path: "/",
+            //     name: "home",
+            //     label: "首页",
+            //     icon: "s-home",
+            //     url: "Home/Home",
+            //   },
+        ],//tags(位于上导航栏)
+        cachedList:[],
+        //用户
+        isAdmin:'',
+        userId : '',
+        isLogin:false,
+        token:'',
+        isCollapse:false,
 
-        ]//tags(位于上导航栏)
     },
     mutations:{//mutations往往接收两个数据，第二个才是我们想要的数据
+        collapseMenu(state){
+            state.isCollapse= !state.isCollapse
+
+        },
         // 更新导航栏tag标签
         selectMenu(state,val){
             // console.log(val , 'val')
-            if(val.name!=='home'){
+            // if(val.name!=='home'){
                 const index = state.tabsList.findIndex(item => item.name===val.name)//index是判断是否在tabsList里面，在就显示索引，不在就显示-1
+                const length = state.tabsList.length
+                // console.log(state.tabsList)
+                // console.log(length)
+
                 //如果不存在
                 if(index===-1){
                     state.tabsList.push(val)//列表添加
+                    state.cachedList.push(val.name)//列表添加
+
                 }
-            }
+
         },
         // 删除指定的tag数据
         closeTag(state,item){
             // console.log(item,'item')//后面参数，优化打印查看，类似于更换数据名
             const index=state.tabsList.findIndex(val => val.name===item.name)
             state.tabsList.splice(index,1)//删除index（一个）
-    
-            
-        }
+            state.cachedList.splice(index,1)//列表添加
+
+        },
+
+    login(state,user){
+        state.isLogin=true
+        sessionStorage.setItem('token',user.token)
+        sessionStorage.setItem('user',user.name)
+        // 管理员字段
+        sessionStorage.setItem('stats',user.stats)
+        // console.log('login:'+state.isLogin)
+        // console.log('token:u'+user.token)
+    },
+    // 关闭会话（页面），session会自动清除？
+    logout(state){
+        state.isLogin=false
+        state.name=''
+        sessionStorage.clear()
     }
+},
+    getters: {
+        getUserState(state) {
+            return state.isLogin;
+        },
+
+    }
+
+
+
 }
\ No newline at end of file
diff --git a/src/store/user.js b/src/store/user.js
deleted file mode 100644
index 228d7c3..0000000
--- a/src/store/user.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-Vue.use(Vuex)
-//这个理论来说
-const user = new Vuex.Store({
-    state:{
-        userId : '',
-        isLogin:'',
-        token:''
-    }
-})
-
-export default user
diff --git a/src/views/index.vue b/src/user/login.vue
similarity index 67%
rename from src/views/index.vue
rename to src/user/login.vue
index 91a2f86..1d70764 100644
--- a/src/views/index.vue
+++ b/src/user/login.vue
@@ -8,22 +8,24 @@
 
       <el-form-item prop="userName">
         <span class="svg-container">
-          <svg-icon icon-class="user" />
+<!--          <svg-icon icon-class="user" />-->
         </span>
         <el-input
           ref="userName"
           v-model="loginForm.userName"
-          placeholder="邮箱"
+          placeholder="账号"
           name="userName"
           type="text"
           tabindex="1"
           auto-complete="on"
+          @keyup.enter.native="handleLogin"
+          @submit.native.prevent
         />
       </el-form-item>
 
       <el-form-item prop="password">
         <span class="svg-container">
-          <svg-icon icon-class="password" />
+<!--          <svg-icon icon-class="password" />-->
         </span>
         <el-input
           :key="passwordType"
@@ -37,23 +39,21 @@
           @keyup.enter.native="handleLogin"
         />
         <span class="show-pwd" @click="showPwd">
-          <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
+<!--          <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />-->
         </span>
       </el-form-item>
       <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">登录</el-button>
 <!--      <p class="tips">-->
-<!--        <a href="/register" type="primary" @click="toRegister">还没有帐号？立即注册</a>-->
+<!--        <a href="/user" type="primary" @click="toRegister">还没有帐号？立即注册</a>-->
 <!--      </p>-->
-      <router-link to="/register" >还没有帐号？立即注册</router-link>
+      <router-link to="/register" style="color: white">还没有帐号？立即注册</router-link>
     </el-form>
-
   </div>
 </template>
 
 <script>
-
+import axios from "axios";
 import http from "@/utils/request";
-
 export default {
   name: 'login',
   data() {
@@ -63,12 +63,13 @@ export default {
         password: ''
       },
       loginRules: {
-        userName: [{ type: 'email', required: true, trigger: 'blur', message: '请输入邮箱' }],
+        userName: [{ type: 'email', required: true, trigger: 'blur', message: '请输入账号' }],
         password: [{
           required: true,
-          message: '创建密码',
+          message: '输入密码',
           trigger: 'blur'
-        }, { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,15}$/, message: '密码必须同时包含数字与字母,且长度为 6-15位' }]
+        }]
+          // { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,15}$/, message: '密码必须同时包含数字与字母,且长度为 6-15位' }]
       },
       loading: false,
       passwordType: 'password',
@@ -85,7 +86,7 @@ export default {
   },
   methods: {
     toRegister(){
-      this.$router.push('/register')
+      this.$router.push('/user')
     },
     showPwd() {
       if (this.passwordType === 'password') {
@@ -99,24 +100,60 @@ export default {
     },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
-        if (valid) {
           this.loading = true
-          http.get('/users/token_get/',{params:{
-              username:this.username
-            }})
+        //-www-form-urlencoded的格式可以有多种方式，详见axios文档
+        const params = new URLSearchParams();
+        params.append('username', this.loginForm.userName);
+        params.append('password', this.loginForm.password);
+        http.post('/users/login/', params)
+        // axios({
+        //   method: 'post',
+        //   url: 'http://61.240.140.173:8000/users/login/',
+        //   // url:'/api/users/login/',
+        //   headers: {
+        //         'Content-Type': 'application/x-www-form-urlencoded'
+        //       },
+        //   data: {
+        //     username:this.loginForm.userName,
+        //     password:this.loginForm.password
+        //   }
+        .then((res)=>{
+          if (res.data.message===1){
+            this.loading = false
+            // if (res.data.data)
+            let user={token:res.data.data,name:this.loginForm.userName,stats:res.data.stats}
+            this.$store.commit('login',user)
+            this.$router.push('/systematic_risk')
+          }
+          else {
+            this.$message({
+              showClose: true,
+              message: res.data.data,
+              type: 'warning'
+            });
+            this.loading = false
+          }
+
+          }).catch((error)=>{
+            console.log(error)
+            this.loading = false
+          alert('登陆失败')
+          })
           // this.$store.dispatch('login', this.loginForm).then(() => {
           //   this.$router.push({ path: this.redirect || '/' })
           //   this.loading = false
           // }).catch(() => {
           //   this.loading = false
-          // })
-        } else {
-          console.log('error submit!!')
-          return false
-        }
+          // }
+
       })
     }
-  }
+  },
+  computed:{
+    isLogin(){
+      return this.$store.state.isLogin
+    }
+  },
 }
 </script>
 
@@ -172,6 +209,15 @@ $bg:#2d3a4b;
 $dark_gray:#889aa4;
 $light_gray:#eee;
 
+.router-link-active {
+  text-decoration: none;
+  color: #fff;
+}
+a {
+  text-decoration: none;
+  color: #fff;
+}
+
 .login-container {
   min-height: 100vh;
   width: 100%;
diff --git a/src/register/index.vue b/src/user/register.vue
similarity index 72%
rename from src/register/index.vue
rename to src/user/register.vue
index ae11a84..17344e3 100644
--- a/src/register/index.vue
+++ b/src/user/register.vue
@@ -30,7 +30,25 @@
               <el-input v-model="ruleForm.account" />
             </el-col>
           </el-form-item>
-
+          <el-form-item label="真实姓名" prop="name">
+            <el-col :span="10">
+              <el-input v-model="ruleForm.name" />
+            </el-col>
+          </el-form-item>
+          <el-form-item label="电话" prop="tele">
+          <el-col :span="10">
+            <el-input v-model="ruleForm.tele" />
+          </el-col>
+        </el-form-item>
+          <el-form-item label="单位" prop="unit">
+          <el-col :span="10">
+            <el-input v-model="ruleForm.unit" />
+          </el-col>
+        </el-form-item> <el-form-item label="职位" prop="position">
+          <el-col :span="10">
+            <el-input v-model="ruleForm.position" />
+          </el-col>
+        </el-form-item>
           <el-form-item label="邮箱" prop="email">
             <el-col :span="10">
               <el-input
@@ -57,6 +75,15 @@
               />
             </el-col>
           </el-form-item>
+          <el-form-item label="邀请码" prop="invite">
+            <el-col :span="10">
+              <el-input
+                  v-model="ruleForm.invite"
+                  maxlength="8"
+                  placeholder="请联系管理员获取邀请码"
+              />
+            </el-col>
+          </el-form-item>
           <el-form-item label="密码" prop="pwd">
             <el-col :span="10">
               <el-input v-model="ruleForm.pwd" type="password" />
@@ -83,7 +110,7 @@
 </template>
 
 <script>
-// import { getEmailCode, register } from '@/api/register'
+// import { getEmailCode, user } from '@/api/user'
 // import { encrypt } from '@/utils/rsaEncrypt'
 import http from "@/utils/request";
 
@@ -91,15 +118,20 @@ export default {
   name: 'register',
   data() {
     return {
+
       statusMsg: '',
       error: '',
       isDisable: false,
       codeLoading: false,
       ruleForm: {
         name:'',
+        unit:'',
+        position:'',
+        tele:'',
         account:'',
         email: '',
         code: '',
+        invite:'',
         pwd: '',
         cpwd: ''
       },
@@ -107,9 +139,10 @@ export default {
         name: [{
           required: true,
           type: 'string',
-          message: '请输入姓名',
-          trigger: 'blur'
-        }],
+          message: '真实姓名',
+          trigger: 'blur',
+        },{pattern:/^[\u4e00-\u9fa5]{2,4}$/,message:'请输入正确姓名'}
+        ],
         account: [{
           required: true,
           type: 'string',
@@ -121,13 +154,21 @@ export default {
           type: 'email',
           message: '请输入邮箱',
           trigger: 'blur'
-        }],
+        },
+          {pattern:/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.(com|cn|net)$/,message:'请输入正确邮箱'}
+        ],
         code: [{
           required: true,
           type: 'string',
           message: '请输入验证码',
           trigger: 'blur'
         }],
+        invite: [{
+          required: true,
+          type: 'string',
+          message: '请输入邀请码',
+          trigger: 'blur'
+        }],
         pwd: [{
           required: true,
           message: '创建密码',
@@ -169,7 +210,7 @@ export default {
       if (!emailPass) {
         self.codeLoading = true
         self.statusMsg = '验证码已发送...'
-        http.get('/users/send',{params:{
+        http.get('/users/send/',{params:{
             email:self.ruleForm.email
         }}).then((res)=>{
           let count = 60
@@ -190,7 +231,7 @@ export default {
           this.isDisable = false
           this.statusMsg = ''
           this.codeLoading = false
-          console.log(err.response.data.message)
+          console.log(err)
         })
 
         // getEmailCode(self.ruleForm.email).then(res => {
@@ -215,19 +256,46 @@ export default {
           //   //这里删除源码的加密
           //   password: this.ruleForm.pwd
           // }
-          http.get('/users/register',{
-            params:{
-              username:this.ruleForm.account,
-              email:this.ruleForm.email,
-              password:this.ruleForm.pwd,
-              security_code:this.ruleForm.code
+          const params = new URLSearchParams();
+          params.append('username', this.ruleForm.account);
+          params.append('password', this.ruleForm.pwd);
+          params.append('email', this.ruleForm.email);
+          params.append('security_code', this.ruleForm.code);
+          params.append('invite_code', this.ruleForm.invite);
+          params.append('realname', this.ruleForm.name);
+          params.append('telephone', this.ruleForm.tele);
+          params.append('unit', this.ruleForm.unit);
+          params.append('position', this.ruleForm.position);
+
+          // http.post('/users/register/',{
+          //   params:{
+          //     username:this.ruleForm.account,
+          //     email:this.ruleForm.email,
+          //     password:this.ruleForm.pwd,
+          //     security_code:this.ruleForm.code,
+          //     invite_code:this.ruleForm.invite,
+          //     realname:this.ruleForm.name,
+          //     telephone:this.ruleForm.tele,
+          //     unit:this.ruleForm.unit,
+          //     position:this.ruleForm.position
+          //   }
+          http.post('/users/register/',params).then((res)=>{
+            if (res.data.message===1){
+              this.$message({
+                showClose: true,
+                message: res.data.data,
+                type: 'warning'
+              });
+              // 跳转回登录
+              this.$router.push('/login')
+            }
+           else {
+              alert(res.data.data)
             }
-          }).then((res)=>{
-            alert(res.data)
           }).catch((error)=>{
             alert(error)
           })
-          // register(user).then(res => {
+          // user(user).then(res => {
           //   console.log(res)
           //   this.$message({
           //     showClose: true,
@@ -241,6 +309,13 @@ export default {
           //   console.log(err.response.data.message)
           // })
         }
+        else {
+          this.$message({
+            showClose: true,
+            message:'请检查信息是否正确',
+            type: 'warning'
+          });
+        }
       })
     }
   }
diff --git a/src/utils/EventBus.js b/src/utils/EventBus.js
new file mode 100644
index 0000000..f9ef51b
--- /dev/null
+++ b/src/utils/EventBus.js
@@ -0,0 +1,2 @@
+import Vue from 'vue'
+export default new Vue()
\ No newline at end of file
diff --git a/src/utils/javaRequest.js b/src/utils/javaRequest.js
new file mode 100644
index 0000000..75f1b76
--- /dev/null
+++ b/src/utils/javaRequest.js
@@ -0,0 +1,8 @@
+import axios from "axios";
+
+const javaReq=axios.create({
+    // baseURL:'http://61.240.140.173:8088/',//java的地址前缀
+    baseURL:'/api/',//后端的地址前缀
+})
+
+export default javaReq
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 3b33ea3..b954b6a 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -5,12 +5,30 @@ import axios from 'axios'
 const http = axios.create({
     //通用请求
     baseURL:'http://61.240.140.173:8000/',//后端的地址前缀
-    // baseURL:'/proxy_url',//后端的地址前缀
-    // baseURL:'/api/',//mock前缀
+    // baseURL:'/api/',//后端的地址前缀
+    // withCredentials:truenpm run serve
     // async:true,
     // timeout:'10000',//10s 超时时间
+    // headers:{token:sessionStorage.getItem('token')?sessionStorage.getItem('token'):'null'}
+
 })
 
+http.interceptors.request.use(
+    function(config) {
+        // 在请求发送之前，为 headers 添加 token
+        const token =sessionStorage.getItem('token')?sessionStorage.getItem('token'):'null';
+        const name =sessionStorage.getItem('user')?sessionStorage.getItem('user'):'null';
+
+        config.headers['token'] = token
+        // config.headers['user_name']=name
+
+
+        return config;
+    },
+    function(error) {
+        return Promise.reject(error);
+    }
+);
 
 // // 添加请求拦截器
 // http.interceptors.request.use(function (config) {
@@ -32,3 +50,4 @@ const http = axios.create({
 
 
 export default http//将实例对外暴露
+
diff --git a/src/views/404.vue b/src/views/404.vue
new file mode 100644
index 0000000..06d885f
--- /dev/null
+++ b/src/views/404.vue
@@ -0,0 +1,18 @@
+<template>
+  <div>
+    <h1>404 - Page Not Found</h1>
+    <p>The page you are looking for does not exist.</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'NotFound'
+};
+</script>
+
+<style scoped>
+h1 {
+  color: #ffce2a;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Main.vue b/src/views/Main.vue
index 7f3de5a..53efc6a 100644
--- a/src/views/Main.vue
+++ b/src/views/Main.vue
@@ -7,7 +7,8 @@
 
     <el-container>
       <el-header>
-        <common-header />
+        <common-header-user v-if="!state"/>
+        <common-header-admin v-if="state"/>
       </el-header>
 
       <el-main>
@@ -15,9 +16,11 @@
         <!-- 路由匹配组建将渲染到这里 -->
         <!-- 将每个页面提供边距(封套) -->
         <div class='wrapper'>
-          <router-view> </router-view>
+          <keep-alive :include="cachedList" > 
+            <router-view :key="$route.fullPath"/>
+          </keep-alive>
         </div>
-       
+
       </el-main>
     </el-container>
   </el-container>
@@ -26,14 +29,16 @@
 <script>
 import CommonAside from "../components/CommonAside.vue";
 import CommonHeader from "../components/CommonHeader.vue";
-import user from "@/store/user";
-let isLogin=false
+import CommonHeaderAdmin from "@/components/CommonHeaderAdmin";
+import CommonHeaderUser from "@/components/CommonHeaderUser";
+import {mapState} from "vuex";
+
 export default {
   //
   // beforeRouteEnter(to ,from,next){
   //   console.log(to.name)
   //   if (to.meta.requireAuth){//需要认证
-  //     if (user.state.isLogin || !user.state.isLogin && (to.name==='/register' ||to.name==='/login')){
+  //     if (user.state.isLogin || !user.state.isLogin && (to.name==='/user' ||to.name==='/login')){
   //       next()
   //     }else {
   //       next('/login')
@@ -52,7 +57,7 @@ export default {
 
     // beforeRouteEnter(to ,from,next){
     //   console.log(to.name)
-    //   if (to.name==='/register' || to.name==='/login'){
+    //   if (to.name==='/user' || to.name==='/login'){
     //     next()
     //   }
     //     else if (isLogin){
@@ -64,12 +69,51 @@ export default {
     //
     // },
   data() {
-    return {};
+    return {
+      user:''
+    };
   },
+  computed:{
+    // state(){
+    //   return this.$store.state.isLogin
+    //
+    // },
+    ...mapState(['isLogin']),
+    // state(){
+    //   return this.$store.getters.getUserState || sessionStorage.getItem('stats')!==null
+    // }
+
+    //接收缓存列表cached
+    ...mapState({//mapState返回一个对象，表示扩展运算符，起到解构的作用...
+      cached: state => state.tab.cachedList
+    }),
+    cachedList(){
+      // console.log('main接收到的cachedList' ,this.cached)
+      return this.cached
+    },
+
+    state(){
+      return sessionStorage.getItem('stats') === '1'
+    },
+
+  },
+  watch:{
+    // state(newValue){
+    //   console.log(1)
+    //   console.log(newValue)
+    // }
+  },
+
+
+mounted() {
+  console.log(this.state)
+},
 
   //引入组件
   components: {
     CommonAside,
+    CommonHeaderUser,
+    CommonHeaderAdmin,
     CommonHeader,
   },
 };
diff --git a/src/views/MarketRisk.vue b/src/views/MarketRisk.vue
index 28dac6a..3b18948 100644
--- a/src/views/MarketRisk.vue
+++ b/src/views/MarketRisk.vue
@@ -4,7 +4,7 @@
         <el-card style='height: 750px;margin-bottom: 10px;' :body-style={padding:0}>
        <!-- height:400px -->
        <!-- 1、上标 -->
-        <span class="superscript" style="width: 20px; height: 40px;">系统风险分析</span>
+        <span class="superscript" style="width: 20px; height: 40px;">系统性影响指标分析</span>
         <!-- 2、产品搜索栏 -->
 
         <div class="form">
@@ -29,11 +29,20 @@
 <!--                  <el-checkbox v-model="other">其他</el-checkbox>-->
                 </el-select>
               </el-form-item>
+
+              <el-form-item label="地区" prop="地区">
+                <el-select size="mini" v-model="formInline1.region" multiple clearable>
+                  <el-option v-for='(val,key) in region' :prop="key" :label="val"  :value="val" :key="key"/>
+
+
+                </el-select>
+
+              </el-form-item>
               <el-form-item label="开始时间" prop="开始时间">
                 <el-date-picker
                     v-model="formInline1.start_date"
                     type="date"
-                    placeholder="年/月/日" 
+                    placeholder="年/月/日"
                     size="mini">
                 </el-date-picker>
               </el-form-item>
@@ -42,7 +51,7 @@
               <el-date-picker
                   v-model="formInline1.end_date"
                   type="date"
-                  placeholder="年/月/日" 
+                  placeholder="年/月/日"
                   size="mini">
               </el-date-picker>
             </el-form-item>
@@ -71,6 +80,7 @@
                   :cell-style="{padding:'0px'}"
                   header-row-class-name="active_header"
                   header-cell-class-name="active_header"
+                          height="370"
                   cell-class-name="content_center">
                   <!-- header-row-class-name 表头行 加classname -->
                   <!-- cell-class-name 单元格加名字 -->
@@ -84,7 +94,11 @@
               </el-table-column><!--插槽里面没有东西就可以用单标签  -->
                                                                               <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
                </el-table>
-              </div> 
+               <el-card style='height: 170px; margin: 5px 5px 2px 5px;background-color: rgba(200, 200, 200, 0.812);'>
+                <span v-html="info" ></span>
+               </el-card>
+
+              </div>
             </el-tab-pane>
               <!-- 风险价值动态变化 -->
               <el-tab-pane label="风险价值动态变化">
@@ -125,6 +139,7 @@
                   :cell-style="{padding:'0px'}"
                   header-row-class-name="active_header"
                   header-cell-class-name="active_header"
+                          height="370"
                   cell-class-name="content_center">
                   <!-- header-row-class-name 表头行 加classname -->
                   <!-- cell-class-name 单元格加名字 -->
@@ -153,6 +168,8 @@
   </template>
   
   <script>
+
+  import qs from 'qs'
   import * as echarts from "echarts"
   import http from '../utils/request'
   import addline from "../components/addline.vue";
@@ -163,7 +180,45 @@
   // },
     data() {
       return {
-         cp:{},
+        region:
+            [
+                '全部',
+              '北京市',
+              '天津市',
+              '河北省',
+              '山西省',
+              '内蒙古自治区',
+              '辽宁省',
+              '吉林省',
+              '黑龙江省',
+              '上海市',
+              '江苏省',
+              '浙江省',
+              '安徽省',
+              '福建省',
+              '江西省',
+              '山东省',
+              '河南省',
+              '湖北省',
+              '湖南省',
+              '广东省',
+              '广西壮族自治区',
+              '海南省',
+              '重庆市',
+              '四川省',
+              '贵州省',
+              '云南省',
+              '西藏自治区',
+              '陕西省',
+              '甘肃省',
+              '青海省',
+              '宁夏回族自治区',
+              '新疆维吾尔自治区',
+              '台湾省',
+              '香港特别行政区',
+              '澳门特别行政区'
+            ],
+        cp:{},
         dat:{},
         ra:[],
         // bank:false,
@@ -178,6 +233,7 @@
         industry:[],
         start_date:'',
         end_date:'',
+      region:[]
     },
 // 表单2-个体风险分析
 formInline2: {
@@ -249,7 +305,8 @@ formInline2: {
             name:'华夏商行',
             },
       ],
-//【线形图数据】
+      // 解释说明
+      info:"·第一个指标：β系数，表示公司i(或金融机构)与整体回报（损失）之间的相关性，同时它也是影响公司i(或金融机构)陷入危机时对整体的风险溢出大小的要素之一。按照该指标进行排名时，排名靠前的公司(或金融机构)，如浙商银行、紫金银行、民生银行等，说明其与整体之间的联动性比较强，对系统风险的贡献排名比较靠前。<br/>·第二个指标：条件风险价值，表示当i公司(或金融机构)处于极端困境情况时，系统整体的最大可能损失。<br/>·第三个指标，风险价值(机构处于极端困境情况时)，表示由于某种市场因素如股票价格、汇率或者利率等突然发生变化时，某项金融产品头寸或者资产组合在特定置信水平及持有期条件下所可能遭受的最大损失。按照该指标进行排名时，排名靠前的公司(或金融机构)，说明其风险较高，风险防控能力还需要加强。该指标对于公司i(或金融机构)自身的风险监控尤为重要，风险较高时很容易成为系统性危机的诱因。<br/>·第四个指标，风险价值(机构处于常态时)，表示该机构处于常态时，某项金融产品头寸或者资产组合在特定置信水平及持有期条件下所可能遭受的最大损失。<br/>·第五个指标：溢出风险价值，可以直观的反映公司i(或金融机构)的风险事件对整体的风险溢出值，衡量了公司i(或金融机构)对系统风险的贡献程度。按照该指标进行排名时，排名靠前的公司(或金融机构)，说明其对系统造成的影响(系统溢出效应)将更加明显，监管部门需要尤为关注。"
 
 
       }
@@ -257,12 +314,12 @@ formInline2: {
     mounted(){},
 
 
-
     methods: {
       // 清空功能
       resetForm(formInline) {
         this.$refs[formInline].resetFields();
-        console.log(this.formInline)
+        this.formInline1= {}
+        console.log(this.formInline1)
         console.log('正在清空')
         
       },
@@ -270,388 +327,400 @@ formInline2: {
       onSubmit1_query() {//确定
         console.log("系统风险分析查询")
         console.log(this.formInline1.market)
-        console.log(this.formInline1.industry)
-        http.get(
-                "/risk/risk_set",
-                {params:{
-                    name1: this.formInline1.industry,//行业
-                    name2: this.formInline1.market,//市场
-                    start_date:this.formInline1.start_date,
-                    end_date:this.formInline1.end_date,
-        }}).then(response => {
+        if(this.formInline1.region.includes('全部') && this.formInline1.region.length!==1  ){
+
+          this.$message.warning('请重新选择')
+        }
+        else {
+          http.get(
+              "/risk/risk_set/",
+              {params:{
+                  industry: this.formInline1.industry,//行业
+                  market: this.formInline1.market,//市场
+                  start_date:this.formInline1.start_date,
+                  end_date:this.formInline1.end_date,
+                  region:this.formInline1.region
+                },
+                //   防止带中括号
+                paramsSerializer:params => {
+                  return qs.stringify(params,{indices:false})
+                }
+              }).then(response => {
             this.tableData_1_1= response.data.data['covar_table']
-          this.tableData_1_2= response.data.data['ra']
+            this.tableData_1_2= response.data.data['ra']
             this.dat=response.data.data['data']
             this.ra=response.data.data['ra']
             this.cp=response.data.data['cp']
-          //拿到所有数据
-          //风险价值动态变化
-          const echarts1 = echarts.init(this.$refs.echarts_1)
-          { let keys,x,bank,insurance,security,other,legend
+            //拿到所有数据
+            //风险价值动态变化
+            const echarts1 = echarts.init(this.$refs.echarts_1)
+            { let keys,x,bank,insurance,security,other,legend
 
-          for (keys in this.cp['Var']){
-            if (keys=== 'x'){
-               x=this.cp['Var']['x']
-            }
-            if (keys=== 'bank'){
-              bank=this.cp['Var']['bank']
-            }
-            if (keys=== 'insurance'){
-              insurance=this.cp['Var']['insurance']
-            }
-            if (keys=== 'zhengquan'){
-              security=this.cp['Var']['zhengquan']
-            }
-            if (keys=== 'other'){
-              other=this.cp['Var']['other']
-            }
-            if (keys=== 'data1'){
-              legend=this.cp['Var']['data1']
-            }
-          }
-          const option_1 = {
-          // 右上角存图
-          toolbox: {
-            feature: {
-              saveAsImage: {}
-            }
-          },
-            legend: {
-              data: legend},
-            title: [
-              {
-              x :'center',
-              y:'bottom',
-
-                text: '各行业风险价值（机构处于极端困难情况时）的时序变化'
-              },
-            ],
-            tooltip: {
-              trigger: 'axis'
-            },
-            xAxis: {
-            data:x
-            },
-
-            yAxis: [
-              {},
-            ],
-
-            series: [
-              {
-                type: 'line',
-                showSymbol: true,
-                // color：
-                name:'银行',
-                data:bank
-              },
-              {
-                type: 'line',
-                showSymbol: true,
-                // color：
-                name:'保险',
-                data:insurance
-              },
-              {
-                type: 'line',
-                showSymbol: true,
-                // color：
-                name:'证券',
-                data:security
-              },
-              {
-                type: 'line',
-                showSymbol: true,
-                // color：
-                name:'其他',
-                data:other
-              },
-
-            ]
-          };
-          echarts1.setOption(option_1)}
-    //溢出风险动态变化
-          const echarts2 = echarts.init(this.$refs.echarts_2)
-          {let keys,x,bank,insurance,security,other,legend
-
-          for (keys in this.cp['Delta_Covar']){
-            if (keys=== 'x'){
-              x=this.cp['Delta_Covar']['x']
-            }
-            if (keys=== 'bank'){
-              bank=this.cp['Delta_Covar']['bank']
-            }
-            if (keys=== 'insurance'){
-              insurance=this.cp['Delta_Covar']['insurance']
-            }
-            if (keys=== 'zhengquan'){
-              security=this.cp['Delta_Covar']['zhengquan']
-            }
-            if (keys=== 'other'){
-              other=this.cp['Delta_Covar']['other']
-            }
-            if (keys=== 'data1'){
-              legend=this.cp['Delta_Covar']['data1']
-            }
-          }
-          const option_2 = {
-            // 右上角存图
-            toolbox: {
-              feature: {
-                saveAsImage: {}
+              for (keys in this.cp['Var']){
+                if (keys=== 'x'){
+                  x=this.cp['Var']['x']
+                }
+                if (keys=== 'bank'){
+                  bank=this.cp['Var']['bank']
+                }
+                if (keys=== 'insurance'){
+                  insurance=this.cp['Var']['insurance']
+                }
+                if (keys=== 'zhengquan'){
+                  security=this.cp['Var']['zhengquan']
+                }
+                if (keys=== 'other'){
+                  other=this.cp['Var']['other']
+                }
+                if (keys=== 'data1'){
+                  legend=this.cp['Var']['data1']
+                }
               }
-            },
-            legend: {
-              data: legend},
-            title: [
-              {
-                x :'center',
-                y:'bottom',
+              const option_1 = {
+                // 右上角存图
+                toolbox: {
+                  feature: {
+                    saveAsImage: {}
+                  }
+                },
+                legend: {
+                  data: legend},
+                title: [
+                  {
+                    x :'center',
+                    y:'bottom',
 
-                text: '各行业风险价值（机构处于极端困难情况时）的时序变化'
-              },
-            ],
-            tooltip: {
-              trigger: 'axis'
-            },
-            xAxis: {
-              data:x
-            },
+                    text: '各行业风险价值（机构处于极端困难情况时）的时序变化'
+                  },
+                ],
+                tooltip: {
+                  trigger: 'axis'
+                },
+                xAxis: {
+                  data:x
+                },
 
-            yAxis: [
-              {},
-            ],
+                yAxis: [
+                  {},
+                ],
 
-            series: [
-              {
-                type: 'line',
-                showSymbol: true,
-                // color：
-                name:'银行',
-                data:bank
-              },
-              {
-                type: 'line',
-                showSymbol: true,
-                // color：
-                name:'保险',
-                data:insurance
-              },
-              {
-                type: 'line',
-                showSymbol: true,
-                // color：
-                name:'证券',
-                data:security
-              },
-              {
-                type: 'line',
-                showSymbol: true,
-                // color：
-                name:'其他',
-                data:other
-              },
+                series: [
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'银行',
+                    data:bank
+                  },
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'保险',
+                    data:insurance
+                  },
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'证券',
+                    data:security
+                  },
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'其他',
+                    data:other
+                  },
 
-            ]
-          };
-            echarts2.setOption(option_2)}
+                ]
+              };
+              echarts1.setOption(option_1)}
+            //溢出风险动态变化
+            const echarts2 = echarts.init(this.$refs.echarts_2)
+            {let keys,x,bank,insurance,security,other,legend
+
+              for (keys in this.cp['Delta_Covar']){
+                if (keys=== 'x'){
+                  x=this.cp['Delta_Covar']['x']
+                }
+                if (keys=== 'bank'){
+                  bank=this.cp['Delta_Covar']['bank']
+                }
+                if (keys=== 'insurance'){
+                  insurance=this.cp['Delta_Covar']['insurance']
+                }
+                if (keys=== 'zhengquan'){
+                  security=this.cp['Delta_Covar']['zhengquan']
+                }
+                if (keys=== 'other'){
+                  other=this.cp['Delta_Covar']['other']
+                }
+                if (keys=== 'data1'){
+                  legend=this.cp['Delta_Covar']['data1']
+                }
+              }
+              const option_2 = {
+                // 右上角存图
+                toolbox: {
+                  feature: {
+                    saveAsImage: {}
+                  }
+                },
+                legend: {
+                  data: legend},
+                title: [
+                  {
+                    x :'center',
+                    y:'bottom',
+
+                    text: '各行业风险价值（机构处于极端困难情况时）的时序变化'
+                  },
+                ],
+                tooltip: {
+                  trigger: 'axis'
+                },
+                xAxis: {
+                  data:x
+                },
+
+                yAxis: [
+                  {},
+                ],
+
+                series: [
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'银行',
+                    data:bank
+                  },
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'保险',
+                    data:insurance
+                  },
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'证券',
+                    data:security
+                  },
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'其他',
+                    data:other
+                  },
+
+                ]
+              };
+              echarts2.setOption(option_2)}
 
             // 波动率预测
 
             const echarts3 = echarts.init(this.$refs.echarts_3)
-          {let keys,GRACH_Volatility,Real_Volatility,x
+            {let keys,GRACH_Volatility,Real_Volatility,x
 
-            for (keys in this.dat['GARCH']){
-              if (keys=== 'GARCH_Volatility'){
-                GRACH_Volatility=this.dat['GARCH']['GARCH_Volatility']
-              }
-              if (keys=== 'Real_Volatility'){
-                Real_Volatility=this.dat['GARCH']['Real_Volatility']
-              }
-              if (keys=== 'x'){
-                x=this.dat['GARCH']['x']
-              }}
-
-
-            const option_3 = {
-              // 右上角存图
-              toolbox: {
-                feature: {
-                  saveAsImage: {}
+              for (keys in this.dat['GARCH']){
+                if (keys=== 'GARCH_Volatility'){
+                  GRACH_Volatility=this.dat['GARCH']['GARCH_Volatility']
                 }
-              },
-              // Make gradient line here
+                if (keys=== 'Real_Volatility'){
+                  Real_Volatility=this.dat['GARCH']['Real_Volatility']
+                }
+                if (keys=== 'x'){
+                  x=this.dat['GARCH']['x']
+                }}
 
-              // visualMap: [//将第一个数据组用不同啊颜色展示
-              //   {
-              //     show: false,
-              //     type: 'continuous',
-              //     seriesIndex: 0,
-              //     min: 0,
-              //     max: 400
-              //   },
 
-              // ],
-              // title: [
-              //   {
-              //   x : 'center',
-              //   y:'bottom',
-
-              //     text: '各行业溢出风险价值的时序变化'
-              //   },
-              // ],
-              legend: {
-                data: ['GARCH(1,1) Volatility', 'Real Volatility']
-              },
-              tooltip: {
-                trigger: 'axis'
-              },
-              xAxis: {
-                data:x
-              },
-              yAxis: [
-                {},
-              ],
-
-              series: [
-                {
-                  name: 'GARCH(1,1) Volatility',
-                  type: 'line',
-                  showSymbol: true,
-                  color:'#654e3e',//深褐色
-                  data: GRACH_Volatility
-                },
-                {
-                  name: 'Real Volatility',
-                  type: 'line',
-                  showSymbol: true,
-                  color:'#b0896d',//浅褐色
-                  data: Real_Volatility,//加入新数据
+              const option_3 = {
+                // 右上角存图
+                toolbox: {
+                  feature: {
+                    saveAsImage: {}
+                  }
                 },
+                // Make gradient line here
 
-              ]
-            };
-            echarts3.setOption(option_3)}
+                // visualMap: [//将第一个数据组用不同啊颜色展示
+                //   {
+                //     show: false,
+                //     type: 'continuous',
+                //     seriesIndex: 0,
+                //     min: 0,
+                //     max: 400
+                //   },
+
+                // ],
+                // title: [
+                //   {
+                //   x : 'center',
+                //   y:'bottom',
+
+                //     text: '各行业溢出风险价值的时序变化'
+                //   },
+                // ],
+                legend: {
+                  data: ['GARCH(1,1) Volatility', 'Real Volatility']
+                },
+                tooltip: {
+                  trigger: 'axis'
+                },
+                xAxis: {
+                  data:x
+                },
+                yAxis: [
+                  {},
+                ],
+
+                series: [
+                  {
+                    name: 'GARCH(1,1) Volatility',
+                    type: 'line',
+                    showSymbol: true,
+                    color:'#654e3e',//深褐色
+                    data: GRACH_Volatility
+                  },
+                  {
+                    name: 'Real Volatility',
+                    type: 'line',
+                    showSymbol: true,
+                    color:'#b0896d',//浅褐色
+                    data: Real_Volatility,//加入新数据
+                  },
+
+                ]
+              };
+              echarts3.setOption(option_3)}
 
             //累计风险分数
             const echarts4 = echarts.init(this.$refs.echarts_4)
-          {let keys,PCA1,PCA10,PCA5,PCA25,x
+            {let keys,PCA1,PCA10,PCA5,PCA25,x
 
-            for (keys in this.dat['PCA']){
-              if (keys=== 'PCA1'){
-                PCA1=this.dat['PCA']['PCA1']
-              }
-              if (keys=== 'PCA10'){
-                PCA10=this.dat['PCA']['PCA10']
-              }
-              if (keys=== 'x'){
-                x=this.dat['PCA']['x']
-              }
-            if (keys=== 'PCA25'){
-              PCA25=this.dat['PCA']['PCA25']
-            }
-            if (keys=== 'PCA5'){
-              PCA5=this.dat['PCA']['PCA5']
-            }}
-
-            const option_4 = {
-              // 右上角存图
-              toolbox: {
-                feature: {
-                  saveAsImage: {}
+              for (keys in this.dat['PCA']){
+                if (keys=== 'PCA1'){
+                  PCA1=this.dat['PCA']['PCA1']
                 }
-              },
-              title: {
-                text: '主成分解释股票收益率变动的比例'
+                if (keys=== 'PCA10'){
+                  PCA10=this.dat['PCA']['PCA10']
+                }
+                if (keys=== 'x'){
+                  x=this.dat['PCA']['x']
+                }
+                if (keys=== 'PCA25'){
+                  PCA25=this.dat['PCA']['PCA25']
+                }
+                if (keys=== 'PCA5'){
+                  PCA5=this.dat['PCA']['PCA5']
+                }}
 
-              },
-              tooltip: {
-                trigger: 'axis',
-                axisPointer: {
-                  type: 'cross',
-                  label: {
-                    backgroundColor: '#6a7985'
+              const option_4 = {
+                // 右上角存图
+                toolbox: {
+                  feature: {
+                    saveAsImage: {}
                   }
-                }
-              },
-              legend: {
-                data: ['PC1', 'PC5', 'PC10', 'PC25']
-              },
+                },
+                title: {
+                  text: '主成分解释股票收益率变动的比例'
+
+                },
+                tooltip: {
+                  trigger: 'axis',
+                  axisPointer: {
+                    type: 'cross',
+                    label: {
+                      backgroundColor: '#6a7985'
+                    }
+                  }
+                },
+                legend: {
+                  data: ['PC1', 'PC5', 'PC10', 'PC25']
+                },
 
 
-              grid: {
-                left: '3%',
-                right: '4%',
-                bottom: '3%',
-                containLabel: true
-              },
-              xAxis: [
-                {
-                  type: 'category',
-                  boundaryGap: false,
-                  data: x,
-                }
-              ],
-              yAxis: [
-                {
-                  type: 'value'
-                }
-              ],
-              series: [
-                {
-                  name: 'PC1',
-                  type: 'line',
-                  stack: 'Total',
-                  areaStyle: {},
-                  emphasis: {
-                    focus: 'series'
-                  },
-                  data: PCA1
+                grid: {
+                  left: '3%',
+                  right: '4%',
+                  bottom: '3%',
+                  containLabel: true
                 },
-                {
-                  name: 'PC5',
-                  type: 'line',
-                  stack: 'Total',
-                  areaStyle: {},
-                  emphasis: {
-                    focus: 'series'
+                xAxis: [
+                  {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: x,
+                  }
+                ],
+                yAxis: [
+                  {
+                    type: 'value'
+                  }
+                ],
+                series: [
+                  {
+                    name: 'PC1',
+                    type: 'line',
+                    stack: 'Total',
+                    areaStyle: {},
+                    emphasis: {
+                      focus: 'series'
+                    },
+                    data: PCA1
                   },
-                  data: PCA5
-                },
-                {
-                  name: 'PC10',
-                  type: 'line',
-                  stack: 'Total',
-                  areaStyle: {},
-                  emphasis: {
-                    focus: 'series'
+                  {
+                    name: 'PC5',
+                    type: 'line',
+                    stack: 'Total',
+                    areaStyle: {},
+                    emphasis: {
+                      focus: 'series'
+                    },
+                    data: PCA5
                   },
-                  data:PCA10
-                },
-                {
-                  name: 'PC25',
-                  type: 'line',
-                  stack: 'Total',
-                  areaStyle: {},
-                  emphasis: {
-                    focus: 'series'
+                  {
+                    name: 'PC10',
+                    type: 'line',
+                    stack: 'Total',
+                    areaStyle: {},
+                    emphasis: {
+                      focus: 'series'
+                    },
+                    data:PCA10
+                  },
+                  {
+                    name: 'PC25',
+                    type: 'line',
+                    stack: 'Total',
+                    areaStyle: {},
+                    emphasis: {
+                      focus: 'series'
+                    },
+                    data: PCA25
                   },
-                  data: PCA25
-                },
 
-              ]
+                ]
+              }
+              echarts4.setOption(option_4)
+
             }
-            echarts4.setOption(option_4)
-
-          }
           })
+        }
+
       },
 
       // 查看格兰杰因果关系网络
       onSubmit_grayish(){
         console.log("查看格兰杰因果关系网络")
         http.get(
-            "/risk/risk_net",).then(response => {
+            "/risk/risk_net/",).then(response => {
               let links= response.data.data['links']
               let nodes=response.data.data['nodes']
         const graph=echarts.init(this.$refs.echarts_5)
@@ -703,7 +772,7 @@ formInline2: {
       onSubmit2_query() {
         console.log("个体风险分析")
         http.get(
-                "/risk/risk_individual",
+                "/risk/risk_individual/",
                 {params:{
                     name1: this.formInline.industry,//行业
                     name2: this.formInline.market,//省or市场
@@ -765,25 +834,42 @@ formInline2: {
   }
     
     // 调整表头间隔、设置表头下方边框颜色
-    /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
-      border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
-      padding: 8px 0 !important;//这个页面表头大，可以调整一下间距
-      min-width: 0 !important;
-    }
-    .el-table .el-table__cell {
-      padding: 12px 0; 
-      min-width: 0;
-    }
-    /deep/ .active_header{//表头
-      color: #110101;
-      font-size: 9px;
-      text-align: center !important;
-      // height: 1px;
-    }
-    /deep/ .content_center{//表的内容
-      text-align: center !important;
-      font-size: 10px;
-    }
+
+
+    .table{
+  // 和选项框隔开
+  // margin:10px;
+  font-size: 12px;
+  padding: 0px 5px 2px 5px;//返回表格添加间隙 上 右
+
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 1px 1px 1px;
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0;
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #110101;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+}
 .kala_text {
   white-space: pre-wrap;
   word-break: break-word;
diff --git a/src/views/SSE.vue b/src/views/SSE.vue
new file mode 100644
index 0000000..1384914
--- /dev/null
+++ b/src/views/SSE.vue
@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <h1>SSE数据：</h1>
+    <ul>
+      <li v-for="message in messages" :key="message.id">{{ message.data }}</li>
+    </ul>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "SSE.vue",
+  data(){
+    return{
+      message:''
+
+    }
+  },
+  methods:{
+      longConnect(){
+        const eventSource=new EventSource('http://61.240.140.173:9999/sse?message="fine"')
+        eventSource.onmessage=function (event){
+          const result= event.data;
+          console.log('receive:',result)
+        }
+        eventSource.addEventListener('message', (event) => {
+          this.messages.push({ id: Date.now(), data: event.data });
+          console.log( event.data)
+        });
+      }
+  },
+  mounted() {
+    this.longConnect()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/UserManagement.vue b/src/views/UserManagement.vue
new file mode 100644
index 0000000..d00bfe2
--- /dev/null
+++ b/src/views/UserManagement.vue
@@ -0,0 +1,594 @@
+<!-- 用户管理 -->
+<template>
+
+    
+  <div>
+    <el-row>
+      <el-tabs type="border-card">
+      <el-tab-pane label="邀请码">
+    <div class="form">
+        
+                                                        <!-- inline="true"表单域在一行 -->
+          <el-form :inline="true"  :model="formInline" class="demo-form-inline">
+
+
+<!--            <el-form-item label="搜索用户名">-->
+<!--                <el-input v-model="formInline.name" size="mini" placeholder="" ></el-input>-->
+<!--            </el-form-item>-->
+
+            <el-form-item style="margin-left: 10px;">
+              <el-button  @click="onSubmit" >查看所有用户</el-button>
+            </el-form-item>
+          </el-form>
+
+
+        
+            <el-form :inline="true"  :model="formInline" class="demo-form-inline">
+
+
+<!--            <el-form-item>-->
+<!--                <el-button v-if="permissions=='管理员'" type="warning"   plain @click="onSubmit" icon="el-icon-postcard" size="mini" >点击生成邀请码</el-button>-->
+<!--            </el-form-item>-->
+
+            <el-form-item >
+                <el-button type="primary" plain style="margin-right: 10px;margin-left: 10px;" size="mini" icon="el-icon-plus" @click="addInviteCode">点击添加邀请码</el-button>
+            </el-form-item>
+           
+          </el-form>
+
+    </div>
+
+    <el-table v-if="permissions=='管理员'" class='table' :data="tableData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                border
+                height="100%"   
+                :row-style="{height:'36px'}"
+                :cell-style="{padding:'0px'}"
+                header-row-class-name="active_header"
+                header-cell-class-name="active_header"
+                cell-class-name="content_center">
+                
+                <el-table-column v-for='(val,key) in tableLabel' :prop="key" :label="val" /><!--插槽里面没有东西就可以用单标签  -->
+
+                <el-table-column
+                    prop="scale"
+                    label="操作">
+                    <template slot-scope="scope">
+
+                         <!-- <el-button v-if="scope.row.权限=='管理员'" v-on:click="detail(scope.row)" size="mini" type="primary">生成邀请码</el-button> -->
+                         <el-button v-on:click="modify(scope.row)" size="mini" >修改</el-button>
+                         <el-button v-on:click="delete(scope.row)" size="mini" >删除</el-button>
+
+                    </template>
+                </el-table-column>
+              </el-table>
+    <el-button style='width: 150px;' @click="queryInviteCode">邀请码管理</el-button>
+    <el-dialog title="邀请码使用情况" :visible.sync="dialogVisible" width="100%">
+        <el-table
+            :data="inviteCodeData"
+            stripe
+            style="width: 100%">
+          <el-table-column
+              prop="code"
+              label="邀请码"
+              width="200">
+          </el-table-column>
+          <el-table-column
+              prop="ctime"
+              label="生成时间"
+              width="300">
+          </el-table-column>
+          <el-table-column
+              prop="tuser"
+              label="使用者"
+          width="100">
+          </el-table-column>
+          <el-table-column
+              prop="status"
+              label="是否使用"
+              width="100">
+          </el-table-column>
+          <el-table-column
+              prop="utime"
+              label="使用时间"
+              width="300">
+          </el-table-column>
+        </el-table>
+    </el-dialog>
+    <el-dialog title="用户列表" :visible.sync="usertDataVisible" width="100%">
+      <el-table
+          :data="usertData"
+          stripe
+          style="width: 100%">
+        <el-table-column
+            prop="realname"
+            label="姓名"
+            width="200">
+        </el-table-column>
+        <el-table-column
+            prop="username"
+            label="用户名"
+            width="200">
+        </el-table-column>
+        <el-table-column
+            prop="telephone"
+            label="电话"
+            width="300">
+        </el-table-column>
+        <el-table-column
+            prop="email"
+            label="邮箱"
+            width="200">
+        </el-table-column>
+        <el-table-column
+            prop="unit"
+            label="单位"
+            width="200">
+        </el-table-column>
+        <el-table-column
+            prop="position"
+            label="职位"
+            width="200">
+        </el-table-column>
+        <el-table-column
+            prop="status"
+            label="是否为管理员（1为管理员）"
+            width="80">
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+    <el-dialog title="当前生成的邀请码" :visible.sync="inviteCodeVisible" width="100%">
+      {{inviteCode}}
+    </el-dialog>
+    </el-tab-pane>
+
+    <el-tab-pane label="用户活动" height="500px">
+    <el-form :inline="true">
+
+      <el-form-item >
+        <el-input v-model="name"  placeholder="请输入用户名" size="mini" @keyup.enter.native="activity(name,start,end)" @submit.native.prevent></el-input>
+      </el-form-item>
+
+      <el-form-item label="开始时间" prop="开始时间">
+        <el-date-picker
+            v-model="start"
+            type="date"
+            placeholder="年/月/日"
+            size="mini"
+            value-format="yyyy-MM-dd[T]hh:mm:ss[.000Z]"
+        >
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="结束时间" prop="结束时间">
+        <el-date-picker
+            v-model="end"
+            type="date"
+            placeholder="年/月/日"
+            size="mini"
+            value-format="yyyy-MM-dd[T]hh:mm:ss[.000Z]"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item >
+        <el-button type="primary" plain style="margin-right: 10px;margin-left: 10px;"   @click="activity(name,start,end)">查看</el-button>
+      </el-form-item>
+    </el-form>
+<!--用户表-->
+      <el-table class='table' :data="activityData.slice((currentPage-1)*pageSize,currentPage*pageSize)" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                border
+                height="100%"
+                :row-style="{height:'36px'}"
+                :cell-style="{padding:'0px'}"
+                header-row-class-name="active_header"
+                header-cell-class-name="active_header"
+                cell-class-name="content_center">
+
+        <el-table-column v-for='(val,key) in activityLabel' :prop="key" :label="val" /><!--插槽里面没有东西就可以用单标签  -->
+
+<!--        <el-table-column-->
+<!--            prop="scale"-->
+<!--            label="操作">-->
+<!--          <template slot-scope="scope">-->
+
+<!--            &lt;!&ndash; <el-button v-if="scope.row.权限=='管理员'" v-on:click="detail(scope.row)" size="mini" type="primary">生成邀请码</el-button> &ndash;&gt;-->
+<!--            <el-button v-on:click="modify(scope.row)" size="mini" >修改</el-button>-->
+<!--            <el-button v-on:click="delete(scope.row)" size="mini" >删除</el-button>-->
+
+<!--          </template>-->
+<!--        </el-table-column>-->
+      </el-table>
+
+<!--      分页-->
+      <div class="block" style="margin-top:15px;">
+        <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                       :current-page="currentPage"
+
+                       :page-size="pageSize"
+                       layout="total, sizes, prev, pager, next, jumper"
+                       :total="activityData.length">
+        </el-pagination>
+      </div>
+
+
+
+    </el-tab-pane>
+        <el-tab-pane label="访问模块" height="500px">
+          <el-form :inline="true">
+
+          <el-form-item label="开始时间" prop="开始时间">
+            <el-date-picker
+                v-model="moduleStart"
+                type="date"
+                placeholder="年/月/日"
+                size="mini"
+                value-format="yyyy-MM-dd[T]hh:mm:ss[.000Z]"
+            >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="结束时间" prop="结束时间">
+            <el-date-picker
+                v-model="moduleEnd"
+                type="date"
+                placeholder="年/月/日"
+                size="mini"
+                value-format="yyyy-MM-dd[T]hh:mm:ss[.000Z]"
+            >
+            </el-date-picker>
+          </el-form-item>
+            <el-form-item >
+              <el-button type="primary" plain style="margin-right: 10px;margin-left: 10px;"   @click="moduleAct(moduleStart,moduleEnd)">查看</el-button>
+            </el-form-item>
+          </el-form>
+
+          <div id="module" ref="module"  style="width:100%;height:300px;"></div>
+          <div id="time" ref="time"  style="width:100%;height:300px;"></div>
+        </el-tab-pane>
+
+      </el-tabs>
+    </el-row>
+
+  </div>
+
+</template>
+
+<script>
+import http from "@/utils/request";
+import * as echarts from "echarts"
+import {Loading} from "element-ui";
+export default {
+  components:{
+  },
+  data () {
+    return {
+      moduleStart:'',
+      moduleEnd:'',
+      start:'',
+      end:'',
+      currentPage: 1, // 当前页码
+      total: 20, // 总条数
+      pageSize: 10, // 每页的数据条数
+      name:'',
+      activityData:[],
+      usertData:'',
+      usertDataVisible:false,
+      inviteCode:'',
+      inviteCodeData:[],
+      dialogVisible:false,
+      inviteCodeVisible:false,
+        formInline:{
+            name:''
+        },
+        // 当前用户
+        // permissions:'管理员',
+        permissions:'普通用户',
+
+      activityLabel:{
+        用户名:'用户名',
+        IP:'IP',
+        访问模块:'访问模块',
+        关键词:'关键词',
+        时间:'时间',
+
+
+      },
+
+        tableLabel: {
+                  用户名: '用户名',
+                  姓名: '姓名',
+                  电话: '电话',
+                  邮箱: '邮箱',
+                  单位:'单位',
+                  职位:'职位',
+                  权限:'权限',
+                  
+
+        },
+        tableData:[
+            {
+                用户名: 'user1',
+                权限:'管理员',
+            },
+            {
+                用户名: 'test1',
+                权限:'普通用户',
+            },
+            {
+                用户名: 'test2',
+                权限:'普通用户',
+            },
+            {
+                用户名: 'test3',
+                权限:'普通用户',
+            },
+            {
+                用户名: 'user2',
+                权限:'管理员',
+            },
+            {
+                用户名: 'test4',
+                权限:'普通用户',
+            },
+            {
+                用户名: 'test5',
+                权限:'普通用户',
+            },
+                ]
+    }
+  },
+  mounted(){
+
+  },
+  watch:{
+    activityData(){
+      console.log(this.activityData.length)
+      this.total= this.activityData.length
+    }
+
+  },
+  methods:{
+
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.currentPage = 1;
+      this.pageSize = val;
+    },
+    //当前页改变时触发 跳转其他页
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.currentPage = val;
+    },
+
+
+    activity(name,start,end){
+      const params = new URLSearchParams();
+      params.append('username', name);
+      params.append('stime',start);
+      params.append('etime',end);
+      // if (start!=='' && end!==''){
+      //   ''
+      // }
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
+      http.post('/users/user_act/',params).then((res)=>{
+        this.activityData=res.data
+        loadingInstance.close()
+      }).finally(()=>
+          loadingInstance.close()
+      )
+    },
+
+    moduleAct(moduleStart,moduleEnd){
+      const params = new URLSearchParams();
+      params.append('stime',moduleStart)
+      params.append('etime',moduleEnd)
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
+      http.post('/users/model_act/',params).then((res)=>{
+        let data=[]
+        for (let i in res.data){
+          let tmp={}
+          tmp['name']=res.data[i]['访问模块']
+          tmp['value']=res.data[i]['次数']
+          data.push(tmp)
+        }
+        // let chartDom = document.getElementById('module');
+        let myChart = echarts.init(this.$refs.module)
+        let option = {
+          tooltip: {
+            trigger: 'item'
+          },
+          legend: {
+            top: '5%',
+            left: 'center'
+          },
+          series: [
+            // {
+            //   name: '访问来源',
+            //   type: 'pie',
+            //   radius: ['50%', '70%'],
+            //   avoidLabelOverlap: false,
+            //   label: {
+            //     show: false,
+            //     position: 'center'
+            //   },
+            //   emphasis: {
+            //     label: {
+            //       show: true,
+            //       fontSize: '30',
+            //       fontWeight: 'bold'
+            //     }
+            //   },
+            //   labelLine: {
+            //     show: false
+            //   },
+            //   data: data
+            // }
+
+            {
+              name: 'Access From',
+              type: 'pie',
+              radius: ['40%', '70%'],
+              avoidLabelOverlap: false,
+              padAngle: 5,
+              itemStyle: {
+                borderRadius: 10
+              },
+              label: {
+                show: false,
+                position: 'center'
+              },
+              emphasis: {
+                label: {
+                  show: true,
+                  fontSize: 40,
+                  fontWeight: 'bold'
+                }
+              },
+              labelLine: {
+                show: false
+              },
+              data: data
+            }
+          ]
+        };
+        // console.log(option)
+    myChart.setOption(option)
+        console.log(myChart.getOption())
+
+      })
+      http.post('/users/time_act/',params).then((res)=>{
+
+       let  data=[]
+        let time=[]
+        for (let i in res.data){
+         time.push(res.data[i]['访问模块'])
+          data.push(res.data[i]['访问量'])
+        }
+        // let chartDom = document.getElementById('time');
+
+        let myChart = echarts.init(this.$refs.time);
+        let option = {
+          xAxis: {
+            type: 'category',
+            data: data
+          },
+          yAxis: {
+            type: 'value'
+          },
+          series: [
+            {
+              data: time,
+              type: 'line',
+              smooth: true
+            }
+          ]
+        };
+        // console.log(option)
+        myChart.setOption(option);
+        console.log(myChart.getOption())
+      })
+      loadingInstance.close()
+
+
+    },
+
+    queryInviteCode(){
+      http.get('/users/invite_all/').then((res)=>{
+        this.inviteCodeData=res.data
+        this.dialogVisible=true
+      })
+    },
+    addInviteCode(){
+      http.get('/users/invite/').then((res)=>{
+
+        this.inviteCode=res.data
+        this.inviteCodeVisible=true
+      })
+    },
+    onSubmit(){
+      http.post('/users/all_users/').then((res)=>{
+        this.usertData=res.data
+        this.usertDataVisible=true
+      })
+
+
+    },
+    modify(){},
+    delete(){},
+  },
+}
+</script>
+<style lang='less' scoped>
+.form1{//2、产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin:0px; 
+    // height: 40px;
+    padding-left: 5px;
+    .el-form-item {
+    margin-bottom: 5px;
+}
+
+  }
+  .form{//搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    // margin-top:5px; 
+    // height: 40px;
+    padding-left: 5px;
+  }
+
+  .table{
+    margin-top: 0px;
+    margin-right: 0px;
+    margin-left: 5px;
+    padding: 0px;
+    }
+//     /deep/ .el-table {
+//   width: 98.5% !important;
+// }
+// /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+//       border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
+//       padding: 0px 0 !important;
+//       min-width: 0 !important;
+//     }
+//     .el-table .el-table__cell {
+//       padding: 20px 0; 
+//       min-width: 0;
+//     }
+    /deep/ .active_header{//表头
+      color: #333333;
+      font-size: 13px;
+      text-align: center !important;
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      font-size: 13px;
+    }
+
+
+    
+  .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+
+.el-tabs--card {
+  height: calc(100vh - 110px);
+  /* overflow-y: auto; */
+}
+.el-tab-pane {
+  height: calc(100vh - 110px);
+  overflow-y: auto;
+}
+
+</style>
diff --git a/src/views/graphViewV4.vue b/src/views/graphViewV4.vue
index 2cca7c7..523f1de 100644
--- a/src/views/graphViewV4.vue
+++ b/src/views/graphViewV4.vue
@@ -1,96 +1,184 @@
-<template>
-  <div >
+<template xmlns:position="http://www.w3.org/1999/xhtml">
+  <div class="container" >
 <!--    <form action="">-->
 <!--      <input type="text"   v-model="content">-->
 <!--      <button @click="findNode(content)" type="button">搜索图谱</button>-->
 <!--    </form>-->
     <el-form :inline="true">
       <el-form-item label="公司名称">
-        <el-input v-model="content"  placeholder="请输入"></el-input>
+<!--        回车查询-->
+        <form @submit.prevent>
+        <el-input v-model="content"  placeholder="请输入" size="mini" @keyup.enter.native="findNode(content)" @submit.native.prevent></el-input>
+        </form>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="findNode(content)">查询</el-button>
+        <el-button class="grayish_btn" @click="findNode(content)" size="mini" >查询</el-button>
       </el-form-item>
+      <el-button @click="drawer = true" type="primary" plain style="margin-left: 20px;">更多功能</el-button>
     </el-form>
-  <div class="graph" ref="graph" id="graph" ></div>
-    <div id="hovertip"></div>
-    <table id="node_info_table"><tbody id="tbody1" style=""></tbody></table>
+
     <!--    详细信息弹窗-->
-    <el-button type="text" @click="dialogVisible = true">查看详细信息</el-button>
+    <el-button type="text" @click="dialogVisible = true" >查看详细信息</el-button>
     <el-dialog title="详细信息" :visible.sync="dialogVisible" width="100%">
-      <el-table style="width: 100%" border :data="tableData" empty-text="暂无数据">
+      <el-table style="width: 100%" border :data="tableData" empty-text="暂无数据" >
         <template v-for="(item,index) in tableHead">
           <el-table-column  :prop="item.prop" :label="item.label" :key="index" :width="item.width"></el-table-column>
         </template>
+
       </el-table>
     </el-dialog>
-    <el-form label-position='top' label-width="80px" >
-    <el-form-item label="更改布局">
-      <el-button  @click="cose" size="mini">CoSE</el-button>
-<!--      <el-button  @click="euler" size="mini">euler</el-button>-->
-      <el-button  @click="circle" size="mini">circle</el-button>
-      <el-button  @click="concentric" size="mini">concentric</el-button>
-      <el-button  @click="collapseAllEdges" size="mini">折叠所有边</el-button>
-      <el-button  @click="expandAllEdges" size="mini">展开所有边</el-button>
-<!--      <el-button  @click="collapseAllnode" size="mini">折叠节点</el-button>-->
-<!--      <el-button  @click="expandAllnode" size="mini">展开节点</el-button>-->
-      <el-button  @click="displayNode" size="mini">显示节点名称</el-button>
-      <el-button  @click="hideNode" size="mini">隐藏节点名称</el-button>
-      <el-button  @click="displayEdge" size="mini">显示边名称</el-button>
-      <el-button  @click="hideEdge" size="mini">隐藏边名称</el-button>
-      <el-button  @click="BFS" size="mini">查找并高亮所选节点BFS路径</el-button>
-      <el-button  @click="cancleBFS" size="mini">取消所选节点BFS路径</el-button>
+
+<!--    关联实体弹窗-->
+    <el-dialog title="关联实体信息" :visible.sync="relationDialog" width="70%" >
+        <el-table :data="relationData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                  border
+                  stripe
+                  style="width: 100%">          <!-- style="width: 40%"               height="215"  -->
+          <el-table-column
+              prop="关联实体"
+              label="关联实体 "
+              width="180">
+          </el-table-column>
+          <el-table-column
+              prop="类型"
+              label="关联类型"
+              width="180">
+          </el-table-column>
+          <el-table-column
+              prop="权重"
+              label="权重"
+              width="300">
+          </el-table-column>
+          <el-table-column
+              prop="相似性强度"
+              label="相似性强度"
+              width="80">
+          </el-table-column>
+        </el-table>
+      <div class="flex-charts">
+        <div ref="relationChart" style="height:300px;width:1000px; border: 1px solid #e0e0e0;margin:20px"></div>
+      </div>
+
+    </el-dialog>
+
+  <div class="graph" ref="graph" id="graph" ></div>
+<!--    <div id="hovertip" position: absolute; ></div>-->
+<!--    <div id="timebrush_div" style="z-index: 999;position: absolute;margin-top: -35px;width:100%;bottom: 20px" class="test1"></div>-->
+    <table id="node_info_table"><tbody id="tbody1" style=""></tbody></table>
+
+
+    <el-drawer
+      title="功能选项卡"
+      :visible.sync="drawer"
+      :modal="false"
+      :show-close="true"
+      :with-header="false">
+
+
+      <!-- 1、更改布局 -->
+      <el-form label-position='top' label-width="80px" >
+
+      <div style="margin-top: 20px;">
+      <el-divider content-position="left"><p style="font-weight: bold">更改布局</p></el-divider>
+      </div>
+
+      <el-form-item >
+        <el-button  @click="saveImg" size="mini" style="margin-left:12px ;">导出图谱</el-button>
+        <el-button  @click="cose" size="mini" style="margin-left:12px ;">CoSE</el-button>
+  <!--      <el-button  @click="euler" size="mini">euler</el-button>-->
+        <el-button  @click="circle" size="mini">Circle</el-button>
+        <el-button  @click="concentric" size="mini">Concentric</el-button>
+        <el-button  @click="collapseAllEdges" size="mini">折叠所有边</el-button>
+        <el-button  @click="expandAllEdges" size="mini">展开所有边</el-button>
+  <!--      <el-button  @click="collapseAllnode" size="mini">折叠节点</el-button>-->
+  <!--      <el-button  @click="expandAllnode" size="mini">展开节点</el-button>-->
+        <el-button  @click="displayNode" size="mini">显示节点名称</el-button>
+        <el-button  @click="hideNode" size="mini">隐藏节点名称</el-button>
+        <el-button  @click="displayEdge" size="mini">显示边名称</el-button>
+        <el-button  @click="hideEdge" size="mini">隐藏边名称</el-button>
+        <el-button  @click="BFS" size="mini">查找并高亮所选节点BFS路径</el-button>
+        <el-button  @click="cancleBFS" size="mini">取消所选节点BFS路径</el-button>
+        <el-button  @click="recover" size="mini">复原隐藏元素</el-button>
+        <el-button  @click="clearAll" size="mini">清空</el-button>
     </el-form-item >
       </el-form>
 
+      <!--    百分比高亮边-->
+      <el-form :inline="true" >
+        <div style="margin-top: 20px;">
+          <el-divider content-position="left"><p style="font-weight: bold">按百分比高亮边</p></el-divider>
+        </div>
+        <div class="block">
+          <span class="demonstration">自定义初始值</span>
+          <el-slider v-model="percentage" :format-tooltip="formatTooltip"></el-slider>
+        </div>
+
+      </el-form>
 <!--    节点最短路径-->
     <el-form :inline="true" >
-      <p >  最短路径</p>
-      <el-form-item label="开始节点">
-        <el-input v-model="startID" placeholder="节点ID"></el-input>
+      <div style="margin-top: 20px;">
+        <el-divider content-position="left"><p style="font-weight: bold">最短路径</p></el-divider>
+      </div>
+
+
+      <el-form-item label="开始节点:" style="padding: 0; margin: 5px;margin-left:12px ;">
+        <el-input v-model="startID" placeholder="节点ID" size="mini" ></el-input><!-- 修改宽度 -->
       </el-form-item>
-      <el-form-item label="结束节点">
-        <el-input v-model="endID" placeholder="节点ID"></el-input>
+      <el-form-item label="结束节点:" style="padding: 0;margin: 5px;margin-left:12px ;">
+        <el-input v-model="endID" placeholder="节点ID" size="mini" ></el-input>
       </el-form-item>
       <el-switch
           v-model="directed"
           active-text="有向"
-          inactive-text="无向">
+          inactive-text="无向"
+          style="padding-top: 10px;margin: 5px;">
       </el-switch>
       <el-form-item>
-        <el-button type="primary" @click="shortestPath(startID,endID,directed)">查询</el-button>
+        <el-button type="primary" plain size="mini" @click="shortestPath(startID,endID,directed)" style="margin-left: 20px;margin-bottom: 0px;">查询</el-button>
       </el-form-item>
+
     </el-form>
 <!--    拓展节点-->
     <el-form :inline="true"  class="demo-form-inline">
-      <el-form-item label="选择节点类型以拓展节点">
+
+      <div style="margin-top: 20px;">
+        <el-divider content-position="left"><p style="font-weight: bold">节点</p></el-divider>
+      </div>
+      <el-form-item label="选择节点类型以拓展节点" style="padding: 0; margin: 0px;margin-left:12px ;">
 <!--        <el-select v-model="formInline.region" placeholder="类型">-->
 <!--          <el-option label="区域一" value="shanghai"></el-option>-->
 <!--          <el-option label="区域二" value="beijing"></el-option>-->
 <!--        </el-select>-->
-        <el-select v-model="typeSelect" placeholder="类型">
+      <el-select v-model="typeSelect" placeholder="类型"  size="mini">
           <el-option v-for="item in type" :key="item.value" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="onSubmit">查询</el-button>
+      <el-form-item style="display:block">
+        <el-button type="primary" plain size="mini" @click="onSubmit" style="margin-left: 20px;">查询</el-button>
       </el-form-item>
     </el-form>
 <!--    寻找关键节点-->
     <el-form :inline="true" >
-      <p >  关键节点</p>
-      <el-form-item label="输入节点个数">
-        <el-input v-model="num" placeholder="个数"></el-input>
+      <div style="margin-top: 20px;">
+        <el-divider content-position="left"><p style="font-weight: bold">关键节点</p></el-divider>
+      </div>
+
+      <el-form-item label="输入节点个数:" style="padding: 0; margin: 5px;margin-left:12px ;">
+        <el-input v-model="num" placeholder="个数" size="mini"></el-input>
       </el-form-item>
-      <el-radio v-model="keyNodeType" label="pr">pagerank</el-radio>
-      <el-radio v-model="keyNodeType" label="bc">中介中心性</el-radio>
-      <el-radio v-model="keyNodeType" label="dc">度中心性</el-radio>
-      <el-radio v-model="keyNodeType" label="cc">紧密中心性</el-radio>
-      <el-form-item>
-        <el-button type="primary" @click="keyNode">查询</el-button>
+      <el-form-item style="padding: 0px; margin: 0px;margin-left:9px ;">
+        <el-radio v-model="keyNodeType" label="pr" style="padding: 0px; margin: 4px;">PageRank</el-radio>
+        <el-radio v-model="keyNodeType" label="bc" style="padding: 0px; margin: 4px;">中介中心性</el-radio>
+        <el-radio v-model="keyNodeType" label="dc" style="padding: 0px; margin: 4px;">度中心性</el-radio>
+        <el-radio v-model="keyNodeType" label="cc" style="padding: 0px; margin: 4px;">紧密中心性</el-radio>
       </el-form-item>
-      <el-button type="text" @click="keynodeVisible = true">查看详细信息</el-button>
-      <el-dialog title="详细信息" :visible.sync="keynodeVisible" width="60%">
+      <el-form-item style="padding: 0px; margin: 5px;">
+        <el-button type="primary" plain size="mini" @click="keyNode" style="margin-left: 20px;">查询</el-button>
+      </el-form-item>
+      <el-button type="text" @click="keynodeVisible = true" style="display:block;padding-top: 10px;margin-left: 10px;">查看详细信息</el-button>
+
+
+      <el-dialog title="详细信息" :visible.sync="keynodeVisible" width="60%"  :modal="false">
         <el-table style="width: 100%" border :data="keyNodeTable" empty-text="暂无数据">
 
             <el-table-column
@@ -114,8 +202,76 @@
         </el-table>
       </el-dialog>
     </el-form>
-<!--    时间轴-->
-    <div id="timebrush_div" style="z-index: 999;position: absolute;margin-top: -35px;width:100%;" class="test1"></div>
+      <!--    社团划分-->
+      <el-form :inline="true" >
+        <div style="margin-top: 20px;">
+        <el-divider content-position="left">
+          <p style="font-weight: bold">社团划分</p></el-divider>
+      </div>
+        <el-form-item label="社团划分方式:"  style="padding: 0px; margin: 0px;margin-left:9px ;">
+        <el-radio v-model="communityType" label="lpa">LPA    </el-radio>
+        <el-radio v-model="communityType" label="inf">infomap</el-radio>
+        <el-radio v-model="communityType" label="lou">Louvain</el-radio>
+        <el-radio v-model="communityType" label="le">leading_eigenvector</el-radio>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" plain size="mini" @click="community" style="margin-left: 20px;">查询</el-button>
+          <el-button type="primary" plain size="mini" @click="communityCancel" style="margin-left: 20px;">取消</el-button>
+        </el-form-item>
+        <el-button type="text" @click="communityVisible = true" style="display:block;padding-top: 10px;margin-left: 10px;">查看详细信息</el-button>
+        <el-dialog title="详细信息" :visible.sync="communityVisible" width="100%"  :modal="false">
+          <el-table style="width: 100%" border :data="communityTable" empty-text="暂无数据">
+
+            <el-table-column
+                prop="order"
+                label="社团"
+                width="100">
+            </el-table-column>
+            <el-table-column
+                prop="data"
+                label="节点"
+                width="700">
+            </el-table-column>
+            <!--          <template v-for="(item,index) in keyNodeTable">-->
+            <!--            <el-table-column  :prop="item.prop" :label="item.label" :key="index" :width="item.width"></el-table-column>-->
+            <!--          </template>-->
+          </el-table>
+        </el-dialog>
+      </el-form>
+<!--      按边显示-->
+    <div style="margin-top: 20px;">
+        <el-divider content-position="left">
+          <p style="font-weight: bold">按边类型显示</p></el-divider>
+      </div>
+      <div class='checkbox1' style="margin-left:10px;">
+        <el-checkbox :indeterminate="edgeIndeterminate" v-model="checkAllEdges" @change="handleCheckedAllEdges">全选</el-checkbox>
+        <div style="margin: 15px 0;"></div>
+        <el-checkbox-group v-model="checkedEdges" @change="handleCheckedEdges">
+          <el-checkbox v-for="edge in edgesTypes" :label="edge" :key="edge">{{edge}}</el-checkbox>
+        </el-checkbox-group>
+      </div>
+
+      <!--      按节点显示-->
+      <div style="margin-top: 20px;">
+        <el-divider content-position="left">
+          <p style="font-weight: bold">按节点类型显示</p></el-divider>
+      </div>
+
+      <div  class="checkbox2" style="margin-left:10px;">
+        <el-checkbox :indeterminate="nodeIndeterminate" v-model="checkAllNodes" @change="handleCheckedAllNodes" >全选</el-checkbox>
+        <div style="margin: 15px 0;"></div>
+        <el-checkbox-group v-model="checkedNodes" @change="handleCheckedNodes">
+          <el-checkbox v-for="node in nodeTypes" :label="node" :key="node">{{node}}</el-checkbox>
+        </el-checkbox-group>
+      </div>
+
+      <!--    时间轴-->
+    </el-drawer>
+    <div id="hovertip" class="info" ></div>
+    <div id="timebrush_div" style="z-index: 999;position: absolute;margin-top: -35px;width:100%;bottom: 20px" class="test1">
+      <div v-html="svg"></div>
+<!--      <div id="hovertip" style="position: absolute;margin-top: -35px;width:100%;bottom: 40px" ></div>-->
+    </div>
   </div>
 </template>
 
@@ -127,6 +283,7 @@ import { Loading } from 'element-ui';
 import euler from "cytoscape-euler"
 import expandCollapse from "cytoscape-expand-collapse"
 import * as d3 from "d3"
+import BubbleSets from "cytoscape-bubblesets";
 // cytoscape.use(euler)
 // cytoscape.use(expandCollapse)
 // cytoscape.use(cxtmenu)
@@ -134,15 +291,47 @@ export default {
   name: "graphViewV4",
   data() {
     return {
+      svg:null,
+      parentSide:null,
+      timebrustStart:null,
+      timebrustEnd:null,
+      colors: [
+        {color: '#f56c6c', percentage: 20},
+        {color: '#e6a23c', percentage: 40},
+        {color: '#5cb87a', percentage: 60},
+        {color: '#1989fa', percentage: 80},
+        {color: '#6f7ad3', percentage: 100}
+      ],
+      percentage:0,
+      relationData:[],
+      relationDialog:false,
+      checkAllEdges: false,
+      checkAllNodes: false,
+      checkedCities: ['上海', '北京'],
+      edges:[' 股东', ' 流通股东', ' 股权质押', ' 股权赎回', ' 发行', ' 法律顾问', ' 财务审计', ' 战略合作', ' 竞争', ' 业务链', ' 监管', ' 成员', ' 保荐承销', ' 担保', ' 法人代表', ' 客户', ' 高管', ' 购买', ' 属于', ' 投资', ' 委托管理', ' 管理', ' 原材料', ' 补充', ' 注册', ' 设立', ' 交易', ' 经营', ' 毕业', ' 位于', ' 同学', ' 亲属', ' 同乡', ' 好友', ' 出生', ' 工作', ' 任职', ' 合作'],
+      edgesTypes: [' 股东', ' 流通股东', ' 股权质押', ' 股权赎回', ' 发行', ' 法律顾问', ' 财务审计', ' 战略合作', ' 竞争', ' 业务链', ' 监管', ' 成员', ' 保荐承销', ' 担保', ' 法人代表', ' 客户', ' 高管', ' 购买', ' 属于', ' 投资', ' 委托管理', ' 管理', ' 原材料', ' 补充', ' 注册', ' 设立', ' 交易', ' 经营', ' 毕业', ' 位于', ' 同学', ' 亲属', ' 同乡', ' 好友', ' 出生', ' 工作', ' 任职', ' 合作'],
+      checkedEdges:[],
+      nodes:[ ' 上市公司', ' 上市公司-实体企业', ' 上市公司-金融机构', ' 上市公司-金融机构-银行', ' 上市公司-金融机构-证券', ' 上市公司-金融机构-保险', ' 上市公司-金融机构-信托', ' 上市公司-金融机构-基金', ' 上市公司-金融机构-基金-公募基金', ' 上市公司-金融机构-基金-私募基金', ' 上市公司-金融机构-其他金融机构', ' 非上市公司其他公司', ' 非上市公司-实体企业', ' 非上市公司-金融机构', ' 非上市公司-金融机构-银行', ' 非上市公司-金融机构-证券', ' 非上市公司-金融机构-保险', ' 非上市公司-金融机构-信托', ' 非上市公司-金融机构-基金', ' 非上市公司-金融机构-基金-公募基金', ' 非上市公司-金融机构-基金-私募基金', ' 非上市公司-金融机构-其他金融机构', ' 非上市公司其他公司',  ' 人物-普通人物', ' 人物-基金经理', ' 人物-投资经理', ' 机构-国务院国有资产监督管理委员会',  ' 监管机构-银保监会', ' 监管机构-证监会', ' 监管机构-人民银行', ' 监管机构-食药监局', ' 监管机构-网信', ' 监管机构-工信', ' 监管机构-行业协会', ' 交易所', ' 板块',  ' 地点-国家', '地点-省', '地点-县/区', ' 地点-市',  ' 行业-门类', ' 行业-大类', ' 行业-中类',  ' 产品-一般产品', ' 产品-服务产品',  ' 产品-金融产品-股票', ' 产品-金融产品-债券', ' 产品-金融产品-基金', ' 产品-金融产品-基金--公募', ' 产品-金融产品-基金--私募', ' 产品-金融产品-基金--REITS', ' 产品-金融产品-信托', ' 产品-金融产品-其他', ' 学校', '时间','事件-股东减持','事件-股东增持','事件-重大安全事故','事件-重大对外赔付',' 事件-重大资产损失','事件-高层死亡',' 事件-股权质押',' 事件-股权冻结','事件-破产清算','报道媒体',' 未知'],
+      nodeTypes:[ ' 上市公司', ' 上市公司-实体企业', ' 上市公司-金融机构', ' 上市公司-金融机构-银行', ' 上市公司-金融机构-证券', ' 上市公司-金融机构-保险', ' 上市公司-金融机构-信托', ' 上市公司-金融机构-基金', ' 上市公司-金融机构-基金-公募基金', ' 上市公司-金融机构-基金-私募基金', ' 上市公司-金融机构-其他金融机构', ' 非上市公司其他公司', ' 非上市公司-实体企业', ' 非上市公司-金融机构', ' 非上市公司-金融机构-银行', ' 非上市公司-金融机构-证券', ' 非上市公司-金融机构-保险', ' 非上市公司-金融机构-信托', ' 非上市公司-金融机构-基金', ' 非上市公司-金融机构-基金-公募基金', ' 非上市公司-金融机构-基金-私募基金', ' 非上市公司-金融机构-其他金融机构', ' 非上市公司其他公司',  ' 人物-普通人物', ' 人物-基金经理', ' 人物-投资经理', ' 机构-国务院国有资产监督管理委员会',  ' 监管机构-银保监会', ' 监管机构-证监会', ' 监管机构-人民银行', ' 监管机构-食药监局', ' 监管机构-网信', ' 监管机构-工信', ' 监管机构-行业协会', ' 交易所', ' 板块',  ' 地点-国家', '地点-省', '地点-县/区', ' 地点-市',  ' 行业-门类', ' 行业-大类', ' 行业-中类',  ' 产品-一般产品', ' 产品-服务产品',  ' 产品-金融产品-股票', ' 产品-金融产品-债券', ' 产品-金融产品-基金', ' 产品-金融产品-基金--公募', ' 产品-金融产品-基金--私募', ' 产品-金融产品-基金--REITS', ' 产品-金融产品-信托', ' 产品-金融产品-其他', ' 学校', '时间','事件-股东减持','事件-股东增持','事件-重大安全事故','事件-重大对外赔付',' 事件-重大资产损失','事件-高层死亡',' 事件-股权质押',' 事件-股权冻结','事件-破产清算','报道媒体',' 未知'],
+      checkedNodes:[],
+      edgeIndeterminate: true,
+      nodeIndeterminate: true,
+      shetuan_paths:[],
+      communityData:null,
+      communityVisible:false,
+      communityTable:[],
+      communityType:'',
       keynodeVisible:false,
       keyNodeTable:[],
       keyNodeType:'',
       num:'',
+      // 控制抽屉是否展开
+      drawer: false,
       typeSelect:'',
       directed:false,
       startID:null,
       endID:null,
-      svg:null,
+
       x:null,
       brush:null,
       search_memory:[],
@@ -157,6 +346,259 @@ export default {
     }
   },
   methods: {
+    clearAll(){
+
+      this.$cy.elements().remove()
+      this.$cy.destroy()
+      this.content=''
+      this.tableData=[]
+      this.mindata=''
+      this.mindata=''
+      this.search_memory.length = 0
+      this.num=''
+      this.typeSelect=''
+      http.get(
+          '/graph/clear/').then()
+    },
+    recover(){
+      this.$cy.elements().removeClass("light-off")
+      this.timebrustStart=null
+      this.timebrustEnd=null
+    },
+    formatTooltip(val){
+      return val/100
+    },
+    displayAsPercentage(){
+      var that=this
+        this.$cy.elements().addClass("light-off");
+          this.$cy.edges().filter(function (ele, i,eles) {
+            var w = ele.data('w');
+            if (w === '') return false;
+            else if (w.substr(w.length - 1, 1) === '%') {
+              w = parseFloat(w.substr(0, w.length - 1));
+              if (w >= that.percentage/100)
+                return true
+              else return false;
+            }
+          }).removeClass("light-off");
+          this.$cy.edges().filter(function (ele, i,eles) {
+            var w = ele.data('w');
+            if (w === '') return false;
+            else if (w.substr(w.length - 1, 1) === '%') {
+              w = parseFloat(w.substr(0, w.length - 1));
+              if (w >= that.percentage/100)
+                return true
+              else return false;
+            }
+          }).connectedNodes().removeClass("light-off");
+          if (this.percentage===100)
+            this.$cy.elements().addClass("light-off");
+          if(this.percentage===0)
+            this.recover()
+
+    },
+
+
+    saveImg () {
+
+
+      let blob = this.$cy.png({
+        output: 'blob', bg: 'transparent',
+        full: true, scale: 4, quality: 1
+      });
+      let aLink = document.createElement('a');
+      let evt = document.createEvent("HTMLEvents");
+      evt.initEvent("click", true, true);
+      aLink.download = `${new Date().getTime()}.png`;
+      aLink.href = URL.createObjectURL(blob);
+      aLink.dispatchEvent(evt);
+      aLink.click();
+    },
+
+    resize(){
+      console.log(document.getElementById('graph').style.height)
+      document.getElementById('graph').style.height=String(window.screen.height/108000*this.getRatio()*630)+'px'
+      console.log(document.getElementById('graph').style.height)
+    },
+     getRatio()
+{
+  var ratio=0;
+  var screen=window.screen;
+  var ua=navigator.userAgent.toLowerCase();
+
+  if(window.devicePixelRatio !== undefined)
+  {
+    ratio=window.devicePixelRatio;
+  }
+  else if(~ua.indexOf('msie'))
+  {
+    if(screen.deviceXDPI && screen.logicalXDPI)
+    {
+      ratio=screen.deviceXDPI/screen.logicalXDPI;
+    }
+
+  }
+  else if(window.outerWidth !== undefined && window.innerWidth !== undefined)
+  {
+    ratio=window.outerWidth/window.innerWidth;
+  }
+
+  if(ratio)
+  {
+    ratio=Math.round(ratio*100);
+  }
+  return ratio;
+},
+    updateStatus(){
+      let checked=[]
+      // 去除空格
+      for(let i in  this.checkedEdges)
+        checked.push(this.checkedEdges[i].replace(/\s*/g,""))
+      for(let i in  this.checkedNodes)
+        checked.push(this.checkedNodes[i].replace(/\s*/g,""))
+      // this.$cy.elements().hide()
+      // console.log(this.$cy.elements().hidden())
+      this.$cy.elements().hide();
+      // this.$cy.elements(':hidden').removeClass('hidden')
+      if (checked.length > 0) {
+        let list = [];
+        for (let i = 0; i < checked.length; i++) {
+          list.push(checked[i])
+        }
+        for (let i = 0; i < checked.length; i++) {
+          let checked_v = checked[i];
+          console.log(checked_v)
+          this.$cy.edges().filter(function (element, i) {
+            return element.data('relationship') === checked_v
+          }).show()
+          //筛选边连接的点显示，避免悬空边
+          this.$cy.edges().filter(function (element, i) {
+            // console.log(element.connectedNodes(), element.connectedNodes().data('label'),'ppppppppppp')
+            return element.data('relationship') === checked_v && list.indexOf(element.connectedNodes()[0].data('label')) !== -1 && list.indexOf(element.connectedNodes()[1].data('label')) !== -1
+          }).connectedNodes()
+              .show();
+          this.$cy.nodes().filter(function (element, i) {
+            return element.data('label') === checked_v
+          }).show();
+          this.$cy.nodes().filter(function (element, i) {
+                if (element.data('label') === checked_v) {
+                  for (var t = 0; t < element.connectedEdges(); t++) {
+                    if (list.indexOf(element.connectedEdges()[t].data('relationship')) !== -1)
+                      element.connectedEdges()[t].show();
+                  }
+                }
+              }
+          )
+        }
+      }
+
+
+    },
+    handleCheckedAllEdges(val){
+      this.checkedEdges = val ? this.edgesTypes : [];
+      this.edgeIndeterminate = false;
+    },
+    handleCheckedEdges(value) {
+      let checkedCount = value.length;
+      this.checkAllEdges = checkedCount === this.edges.length;
+      this.edgeIndeterminate = checkedCount > 0 && checkedCount < this.edges.length;
+    },
+    handleCheckedAllNodes(val){
+      this.checkedNodes = val ? this.nodeTypes : [];
+      this.nodeIndeterminate = false;
+    },
+    handleCheckedNodes(value) {
+      let checkedCount = value.length;
+      this.checkAllNodes = checkedCount === this.nodes.length;
+      this.nodeIndeterminate = checkedCount > 0 && checkedCount < this.nodes.length;
+    },
+    communityCancel(){
+      const  path =this.$bb.getPaths()
+      for (let i in  path)
+      this.$bb.removePath(path[i])
+          },
+     getRandomColor(){
+  var r = Math.floor(Math.random() * 256);
+  var g = Math.floor(Math.random() * 256);
+  var b = Math.floor(Math.random() * 256);
+  if (r === 255 && g === 255 && b === 255)
+    this.getRandomColor();
+  else
+    return "rgb(" + r + ',' + g + ',' + b + ")";
+},
+    community(){
+      if (this.communityData){
+        this.communityData.length=0
+      }
+      if (this.communityType==='')
+        alert('请选择划分方式')
+      else
+      http.get('/graph/divide/?wh='+this.communityType).then((res)=>{
+        this.$cy.elements().removeClass("light-off");
+
+        var get_color = [];
+        this.$cy.ready(() => {
+          this.$bb = this.$cy.bubbleSets({
+            interactive: true,
+            zIndex: 100
+          })
+          //const ids = Array.from(new Set(cy.elements().map(el => el.data().label)))
+          const ids = res.data.data;
+          this.communityData=res.data.data
+          ids.forEach(id => {
+            const nodes = this.$cy.nodes().filter(function (ele) {
+              let g = false;
+              for (let t = 0; t < id.length; t++) {
+                if (ele.data('id') === id[t]) g = true;
+              }
+              return g
+            })
+
+            let i_color = this.getRandomColor();
+            get_color.push(i_color);
+
+            let pp = this.$bb.addPath(nodes, null, null, {
+              virtualEdges: true,
+              style: {
+                fill: 'rgba(255, 0, 0, 0)',
+                stroke: i_color,
+                strokeDasharray: '7, 7, 7'
+              }
+            })
+            // this.shetuan_paths.push(pp);
+
+          for (let i in res.data.data){
+
+            this.communityTable.push({'order':i,'data':String(res.data.data[i])})
+            // console.log(res.data.data[i])
+          }
+
+        })
+
+        //表格信息
+        // st_data = res.data.data;
+        // if (st_data.length != 0) {
+        //   document.getElementById("shetuan_div").style.height = '400px';
+        //   document.getElementById("tishi_div").innerText = '提示：点击表格的某一行，高亮对应的社团';
+        //   var tableData1 = "<tr style='border:1px solid black;'>" + //<td style='width: 30%;font-weight:bold;border:1px solid black;'>ID</td>
+        //       "<td style='border:1px solid black;width:50px;'>社团</td>" +
+        //       "<td style='border:1px solid black;'>社团成员ID</td>" +
+        //       "</tr>";
+        //   for (var i = 0; i < st_data.length; i++) {
+        //     tableData1 += "<tr style='border:1px solid black;'>" + //<td style='width: 30%;font-weight:bold;border:1px solid black;'>"+info_data[i].id+"</td>
+        //         "<td style='border:1px solid black;background-color: " + get_color[i] + "'>" + i + "</td>" +
+        //         "<td style='border:1px solid black;'>" + st_data[i] + "</td>" +
+        //         "</tr>";
+        //   }
+        //   $("#shetuan_tbody").html(tableData1);
+        //
+        // }
+      //
+      })
+    }
+    )},
+    expandAllNodes(){this.$api.expandAll()},
+    collapseAllNodes(){this.$api.collapseAll()},
     keyNode(){
       console.log(this.keyNodeType)
         if (!(/^[0-9]+$/.test(this.num))) alert("请输入非负整数！");
@@ -187,10 +629,10 @@ export default {
       let input_label = this.typeSelect
       let name_list = [];
       this.$cy.nodes().filter(function (ele) {
-        if (ele.data('label') == input_label)
+        if (ele.data('label') === input_label)
           name_list.push(ele.data('id'))
       });
-
+      console.log(name_list)
       let name_str = "";
 
       for (let j = 0; j < name_list.length - 1; j++) {
@@ -240,14 +682,24 @@ export default {
           this.x = d3.scaleTime()
               .domain([new Date(this.mindate), new Date(this.maxdate) - 1])
               .rangeRound([0, width]);
-
-          let svg = d3.select("#timebrush_div").append("svg")
+            this.brush=d3.brushX()
+                .extent([[0, 0], [width, height+30]])
+                //.on("start",brushstart)
+                .on("brush",this.brushmove)
+          // let svg = d3.select("#timebrush_div").append("svg")
+            this.svg.selectAll("*").remove()
+            this.svg = d3.select("#timebrush_div").append("svg")
+                .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
+                .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
+                .append("g")
+                .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+        this.svg
               .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
               .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
               .append("g")
               .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
 
-          svg.append("g")
+          this.svg.append("g")
               .attr("class", "axis axis--x")
               .attr("transform", "translate(0," + height + ")")
               .call(d3.axisBottom(this.x)
@@ -258,7 +710,7 @@ export default {
               .attr("fill", "#ef5b9c")
               .attr("x", 0);
 
-          svg.append("g")
+          this.svg.append("g")
               .attr("class", "brush")
               .call(d3.brushX()
                   .extent([[0, 0], [width, height + 30]])
@@ -360,14 +812,24 @@ export default {
       this.x = d3.scaleTime()
           .domain([new Date(that.mindate), new Date(that.maxdate) - 1])
           .rangeRound([0, width]);
-
-      let svg = d3.select("#timebrush_div").append("svg")
+    this.brush=d3.brushX()
+        .extent([[0, 0], [width, height+30]])
+        //.on("start",brushstart)
+        .on("brush",this.brushmove)
+      // let svg = d3.select("#timebrush_div").append("svg")
+    this.svg.selectAll("*").remove()
+    this.svg = d3.select("#timebrush_div").append("svg")
+        .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
+        .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
+        .append("g")
+        .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+    this.svg
           .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
           .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
           .append("g")
           .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
 
-      svg.append("g")
+      this.svg.append("g")
           .attr("class", "axis axis--x")
           .attr("transform", "translate(0," + height + ")")
           .call(d3.axisBottom(that.x)
@@ -378,7 +840,7 @@ export default {
           .attr("fill","#ef5b9c")
           .attr("x", 0);
 
-      svg.append("g")
+      this.svg.append("g")
           .attr("class", "brush")
           .call(d3.brushX()
               .extent([[0, 0], [width, height+30]])
@@ -419,12 +881,12 @@ export default {
       return _res;
     },
     zhedie(ele) {
-      if ( this.$cy.nodes().filter(function (element, i) {return element.data('id') == ele}).scratch().restData == null) {
+      if ( this.$cy.nodes().filter(function (element, i) {return element.data('id') === ele}).scratch().restData == null) {
         // Save node data and remove
-        this.$cy.nodes().filter(function (element, i) { return element.data('id') == ele })
+        this.$cy.nodes().filter(function (element, i) { return element.data('id') === ele })
             .scratch({// restData: this.connectedEdges().targets().remove()
               restData:  this.$cy.nodes().filter(function (element, i) {
-                return element.data('id') == ele
+                return element.data('id') === ele
               }).successors().targets().hide()//remove()
             });
       } else {
@@ -439,6 +901,138 @@ export default {
         });
       }
     },
+     chuantou(node_id) {
+  // var parentC_flag = this.parentSide.css("display");//记录原来的状态
+  //
+  // if (parentC_flag === 'block') {
+  //   this.parentSide.css("display", 'none');
+  // }
+
+       let options={
+         text:'请稍等'
+       }
+       let loadingInstance = Loading.service(options);
+
+
+       http.get('/graph/control/?id=' + node_id,
+       ).then((response) => {
+      this.$cy.add(response.data.data['nodes'])
+      this.$cy.add(response.data.data['edges'])
+
+      let node_id = [], nodes=response.data.data['nodes'];
+      for(let i=0;i<nodes.length;i++){
+        node_id.push(nodes[i].data.id)
+
+        for(let k in nodes[i].data){
+          this.$cy.$('#'+nodes[i].data.id).data(k, nodes[i].data[k])
+        }
+      }
+      let edge_id = [], edges=response.data.data['edges'];
+      for(let i=0;i<edges.length;i++){
+        edge_id.push(edges[i].data.id)
+      }
+
+      // console.log(node_id);
+      // console.log(edge_id);
+      for(let nn of node_id){
+        this.$cy.$('#' + nn).addClass("search_node");
+      }
+
+      this.$cy.edges().filter(function (ele) {
+        if (edge_id.indexOf(ele.data('id')) !== -1)
+          return true;
+      }).addClass("search_edge");
+
+      var layout = this.$cy.layout({
+        name: 'euler',
+        randomize: true,
+        animate: false,
+      });
+      layout.run();
+
+
+      if (this.search_memory.length === 0 || this.mindate === "" || this.maxdate === "") {
+        this.mindate = response.data.data['mindate']
+        this.maxdate = response.data.data['maxdate']
+      }
+      else {
+        if (this.mindate > response.data.data['mindate'] && response.data.data['mindate'] !== "")
+          this.mindate = response.data.data['mindate']
+        if (this.maxdate < response.data.data['maxdate'] && response.data.data['maxdate'] !== "")
+          this.maxdate = response.data.data['maxdate']
+      }
+
+
+      if (response.data.data['id'] !== "")
+        this.$cy.$('#' + response.data.data['id']).addClass("search_node");
+
+      // document.getElementById('fade').innerText = "";
+      // document.getElementById('fade').style.display = 'none';
+
+      // if (parentC_flag == 'block') {
+      //   parentSide.css("display", 'block');
+      // }
+
+      //时间轴
+      // document.querySelector("#timeEle").innerHTML = ''
+      // document.getElementById("timebrush_div").innerHTML = "";
+      var margin = { top: -12, right: 27, bottom: 21, left: 0 },
+          width = document.all.graph.offsetWidth,
+          height = 55 - margin.top - margin.bottom;
+
+      this.x = d3.scaleTime()
+          .domain([new Date(this.mindate), new Date(this.maxdate) - 1])
+          .rangeRound([0, width]);
+
+         this.brush=d3.brushX()
+             .extent([[0, 0], [width, height+30]])
+             //.on("start",brushstart)
+             .on("brush",this.brushmove)
+
+      this.svg.selectAll("*").remove()
+         // document.getElementById('timebrush_div').
+      // let svg = d3.select("#timebrush_div").append("svg")
+
+         this.svg = d3.select("#timebrush_div").append("svg")
+             .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
+             .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
+             .append("g")
+             .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+         this.svg
+          .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
+          .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
+          .append("g")
+          .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+      this.svg.append("g")
+          .attr("class", "axis axis--x")
+          .attr("transform", "translate(0," + height + ")")
+          .call(d3.axisBottom(this.x)
+              .ticks(d3.timeYear)
+              .tickPadding(0))
+          .attr("text-anchor", null)
+          .selectAll("text")
+          .attr("fill", "#ef5b9c")
+          .attr("x", 0);
+
+      this.svg.append("g")
+          .attr("class", "brush")
+          .call(d3.brushX()
+              .extent([[0, 0], [width, height + 30]])
+              // .on("start",brushstart)
+              .on("brush", this.brushmove))
+              // .on("end",brushended));
+    }).catch((err)=>{
+         // document.getElementById('fade').innerText = "";
+         // document.getElementById('fade').style.display = 'none'
+         alert("err！"+err)
+       }
+       ).finally(()=>
+       loadingInstance.close()
+       )
+},
+
      tongji(node_id)
        {
         document.getElementById("light1_h").innerText=cy.$('#'+node_id).data("name")+"("+cy.$('#'+node_id).data("label")+")";
@@ -537,8 +1131,8 @@ export default {
     var name = param.name;
 
     var a_info=[];
-    cy.$('#'+node_id).outgoers().edges().filter(function (ele) {
-      if(ele.data('relationship')==name)
+    this.$cy.$('#'+node_id).outgoers().edges().filter(function (ele) {
+      if(ele.data('relationship')===name)
         a_info.push(ele);
     });
 
@@ -563,8 +1157,8 @@ export default {
       //else
       tableData+="<tr style='border:1px solid black;'><td style='width: 20%;font-weight:bold;border:1px solid black;'>"+cy.$("#"+a_info[h].data('source')).data('name')+"</td>"
           +"<td style='width: 10%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('relationship')+"</td>"
-          +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+cy.$("#"+a_info[h].data('target')).data('name')+"</td>"
-          +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+cy.$("#"+a_info[h].data('target')).data('label')+"</td>"
+          +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+this.$cy.$("#"+a_info[h].data('target')).data('name')+"</td>"
+          +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+this.$cy.$("#"+a_info[h].data('target')).data('label')+"</td>"
           +"<td style='width: 5%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('w')+"</td>"
           +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('开始日期')+"</td>"
           +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('结束日期')+"</td>"
@@ -666,10 +1260,87 @@ export default {
 
   });
 
-
-
-
 },
+    relationChart(name,seriesData,timeData){
+    this.$nextTick(()=>{
+          let myChart = this.$echarts.init(this.$refs.relationChart);
+          let option;
+          option = {
+            title: {
+              text: '关联实体'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            legend: {
+              data: name
+            },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            toolbox: {
+              feature: {
+                saveAsImage: {}
+              }
+            },
+            xAxis: {
+              type: 'category',
+              boundaryGap: false,
+              data: timeData
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series:seriesData
+          }
+          option && myChart.setOption(option);
+      console.log(option)
+    })
+    },
+    entity_relationship(id){
+      http.get('/graph/get_current_similarity/?company_id=' + id,
+      ).then((response) => {
+        this.relationData.length=0
+        if(response.data.data) {
+          this.relationData= response.data.data
+          http.get('/graph/get_similarity_history/',{
+            params:{
+              company_id:id,
+              start:this.timebrustStart,
+              end:this.timebrustEnd
+            }
+              }
+          ).then((res) => {
+            let dat=res.data.data
+            let time=res.data.time
+            let name=res.data.name
+            let seriesData=[]
+            for(let i in dat) {
+              let tmp=[]
+              Object.values(dat[i]).forEach(value=>{
+                tmp.push(value)
+              })
+              seriesData.push({name:name[i],type:'line',data:tmp})
+            }
+              this.relationData= response.data.data
+            console.log(seriesData)
+              this.relationChart(name,seriesData,time)
+            // this.relationDialog = true
+          })
+          this.relationDialog=true
+        }
+        else this.$notify.info({
+          title: '提示',
+          message: '暂无数据'
+        });
+      })
+
+
+    },
+
     xianshi_neigh(id){
       this.$cy.$('#'+id).neighborhood().show();
   // cy.nodes().filter(function( element, i ){return element.data('id') == id}).neighborhood().nodes().show();
@@ -693,12 +1364,12 @@ export default {
       let  d0 = event.selection.map(this.x.invert),  //开始、最终 随过程变化
       d1 = d0.map(d3.timeDay.round);    //最终的开始、最终 [,]
       //
-      // console.log(d0)
-      // console.log(d1)
+
 
       let datetime_s=d1[0].getFullYear() + '-' + (d1[0].getMonth() + 1) + '-' + d1[0].getDate(); //+ ' ' + d1[0].getHours() + ':' + d1[0].getMinutes() + ':' + d1[0].getSeconds();
       let datetime_e=d1[1].getFullYear() + '-' + (d1[1].getMonth() + 1) + '-' + d1[1].getDate(); //+ ' ' + d1[1].getHours() + ':' + d1[1].getMinutes() + ':' + d1[1].getSeconds();
-
+      this.timebrustStart=datetime_s
+      this.timebrustEnd=datetime_e
       this.$cy.elements().addClass("light-off");
 
   //满足
@@ -800,6 +1471,10 @@ export default {
         if (!cytoscape().euler) {
           cytoscape.use(euler)
         }
+        if (!cytoscape().BubbleSets) {
+          cytoscape.use(BubbleSets)
+        }
+        cytoscape.use(BubbleSets);
         if( this.search_memory.length ===0 || this.mindate==="" || this.maxdate==="")
         {
           this.mindate = graphData['mindate']
@@ -1017,7 +1692,7 @@ export default {
                 // 'height': '17px',
                 'width': function (node) {
                   var w = node.data('w');
-                  if (w == "") return '17px';
+                  if (w === "" || w===undefined) return '17px';
                   else {
                     w = parseFloat(w.substr(0, w.length - 1));
                     if (w < 1.0) return (17 + Math.log2(w + 1) * 2) + 'px';
@@ -1027,7 +1702,7 @@ export default {
                 },
                 'height': function (node) {
                   var w = node.data('w');
-                  if (w == "") return '17px';
+                  if (w === ""|| w===undefined) return '17px';
                   else {
                     w = parseFloat(w.substr(0, w.length - 1));
                     if (w < 1.0) return (17 + Math.log2(w + 1) * 2) + 'px';
@@ -1035,6 +1710,18 @@ export default {
                   }
                 },
               })
+              // 显示隐藏节点样式
+              .selector (".hidden")
+              .style({
+                "display": "none"
+               })
+
+              .selector (".show")
+              .style({
+                "display": "element"
+              })
+
+
               .selector('edge')   //定义边的样式
               .style({
                 //'label': 'data(relationship)',
@@ -1278,10 +1965,11 @@ export default {
             return [
               {
                 fillColor: '#a1a3a6', // optional: custom background color for item
-                content: '<span style="font-size: 7px">无操作</span>', // html/text content to be displayed in the menu
+                content: '<span style="font-size: 7px">关联实体计算</span>', // html/text content to be displayed in the menu
                 // content: '显示邻居',
                 contentStyle: {}, // css key:value pairs to set the command's css in js if you want
-                enabled: false, // whether the command is selectable
+                select: (ele) =>this.entity_relationship(ele.id()),
+                enabled: true, // whether the command is selectable
               },
               {
                 fillColor: '#33a3dc', // optional: custom background color for item
@@ -1319,6 +2007,14 @@ export default {
                 select: (ele) => this.tuozhan(ele.data('id'), ele.data('label')),
                 enabled: true, // whether the command is selectable
               },
+              {
+                fillColor: '#b2d235', // optional: custom background color for item
+                content: '<span style="font-size: 7px">股权穿透</span>', // html/text content to be displayed in the menu
+                contentStyle: {}, // css key:value pairs to set the command's css in js if you want
+                select: (ele) => this.chuantou(ele.id()),
+                enabled: true, // whether the command is selectable
+              },
+
               // {
               //   fillColor: '#7d5886', // optional: custom background color for item
               //   content: '<span style="font-size: 7px">统计信息</span>', // html/text content to be displayed in the menu
@@ -1358,13 +2054,13 @@ export default {
             .extent([[0, 0], [width, height+30]])
             //.on("start",brushstart)
             .on("brush",this.brushmove)
-        let svg = d3.select("#timebrush_div").append("svg")
+        this.svg = d3.select("#timebrush_div").append("svg")
             .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
             .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
             .append("g")
             .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
 
-        svg.append("g")
+        this.svg.append("g")
             .attr("class", "axis axis--x")
             .attr("transform", "translate(0," + height + ")")
             .call(d3.axisBottom(this.x)
@@ -1375,14 +2071,18 @@ export default {
             .attr("fill","#ef5b9c")
             .attr("x", 0);
 
-        svg.append("g")
+        this.svg.append("g")
             .attr("class", "brush")
             .call(this.brush)
-            .on("dblclick", this.dblclicked(svg))
+            .on("dblclick", this.dblclicked(this.svg))
         // .on("end",brushended));
         // svg.append("g").on("dblclick", this.dblclicked(svg))
 
       })
+      .catch(error=>{
+        loadingInstance.close()
+        this.$message.warning(error)
+      })
     },
     collapseAllEdges(){
       this.$api.collapseAllEdges()
@@ -1523,7 +2223,6 @@ export default {
       highlightNextEle()
     },
     shortestPath (start,end,di) {
-      let that=this
       let node1 = start;
       let node2 = end;
       //console.log(node1, node2)
@@ -1626,18 +2325,112 @@ export default {
     },
 
   },
-
-
   mounted() {
+    // let infoDiv = document.getElementById('hovertip');
+    //
+    // // 监听窗口缩放事件
+    // window.addEventListener('resize', function() {
+    //   // 计算元素与窗口底部的距离
+    //   var windowHeight = window.innerHeight;
+    //   var distanceFromBottom = 40; // 你要设置的距离
+    //   var elementHeight = infoDiv.offsetHeight;
+    //
+    //   var newBottomDistance = windowHeight - elementHeight - distanceFromBottom;
+    //
+    //   // 设置元素的样式
+    //   infoDiv.style.bottom = newBottomDistance + 'px';
+    // });
+
+  },
+  watch:{
+  percentage(){
+      this.displayAsPercentage()
+
+    },
+  changeNodes(){
+    console.log('changeNodes')
+    this.updateStatus()
+  },
+  changeEdges(){
+    console.log('changeEdges')
+    this.updateStatus()
+  }
+},
+  computed:{
+    // eslint-disable-next-line vue/no-dupe-keys
+    changeNodes(){
+      return this.checkedNodes
+    },
+    // eslint-disable-next-line vue/no-dupe-keys
+    changeEdges(){
+      return this.checkedEdges
+    }
+  },
+
+  afterM() {
+    this.resize()
   }
 }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+
+.info{
+  position: fixed;
+  //margin-top: -35px;
+  //width:100%;
+  bottom: 80px ;
+  white-space:nowrap
+}
+.contain{
+  //overflow: hidden;
+  //position: relative;
+  //bottom: 0px;
+  //padding-left:15%;
+  //right: 0px;
+
+}
 .graph {
 /*//margin-left: -800px;*/
 /*  transform: translate(0,0);*/
-  height: 800px;
+  height: 700px;
   /*width: */
 }
+.grayish_btn{
+/*//浅灰色按钮*/
+  color: #fff;
+/*//文字颜色*/
+  background-color: #aaaaaa;
+/*//背景颜色*/
+}
+
+
+.checkbox1{
+/deep/ .el-checkbox-group {
+  text-align: left;  /* 这个很关键，否则最后一行是居中状态 */
+  margin-bottom: 5px;
+}
+
+
+ /deep/ .el-checkbox {
+  width: 80px;       /* 根据内容设置宽度 */
+  padding-left: 0px;
+  text-align: left;  /* 这个很关键，否则每一行都是居中状态 */
+  margin-right: 20px;
+}
+
+}
+
+.checkbox2{
+  /deep/ .el-checkbox-group {
+    line-height: 20px !important;
+    // 不起作用
+
+}
+
+
+
+}
+
+
 </style>
\ No newline at end of file
diff --git a/src/views/login.vue b/src/views/login.vue
deleted file mode 100644
index 5cfe010..0000000
--- a/src/views/login.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-  <div id="backcont">
-    <div class="meituan-contentr">
-      <div class="login-cont ">
-        <div class="meituan-title">登录</div>
-
-        <div class="meituan-user">
-          <p>账号</p>
-          <el-input v-model='account' class="inptflex" placeholder="请输入账号" clearable />
-        </div>
-
-        <div class="meituan-user">
-          <p>密码</p>
-          <el-input v-model='password' class="inptflex" placeholder="请输入密码" clearable />
-        </div>
-        <!-- 登录和注册的按钮切换 -->
-        <div class="reg-view" @click="regi= regi=='登录'? '注册':'登录'"><p>{{regi}}</p></div>
-        <!-- 登录或注册按钮提交 -->
-        <el-button v-if="regi=='注册'"  @click="signin" type="primary" class="meituan-btn">登录</el-button>
-        <el-button v-else @click="register" type="primary" class="meituan-btn">注册</el-button>
-
-
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { reactive,toRefs } from 'vue';
-
-import http from "axios"
-
-export default{
-  setup(){
-    const user =reactive({
-      account:'',
-      password:'',
-      regi:'注册'
-    })
-    //登录
-
-    const signin=()=>{
-      console.log(user.account,user.password)
-      http({
-        url:'/sign',
-        method:'post'
-      }).then((res)=>{
-        alert('请求成功!');
-        let username=user.account;
-        let password=user.password;
-
-
-      });
-    }
-
-    
-    
-    //注册
-    const register=()=>{
-      console.log(user.account,user.password)}
-
-
-
-    return{...toRefs(user),signin,register}
-  }
-}
-</script>
-
-<style  lang="less" scoped>
-#backcont {
-    background-image: url(../assets/background.jpg);
-    background-attachment : fixed;
-    background-repeat: no-repeat;
-    background-size: cover;
-    -webkit-background-size: cover;
-    moz-background-size: cover;
-    min-height: 100vh;
-}
-
-.meituan-contentr {
-    position : absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate( -50%,-50%);
-
-}
-
-
-.login-cont {
-width: 500px;
-height: 300px;
-background: rgba(255, 255, 255, 0.795);
-border-radius: 5px;
-}
-
-.meituan-title {
-    text-align: center;
-    color:#0000009b;
-    font-size: 30px;
-    padding-top: 15px;
-    font-family : Arial,Helvetica,sans-serif;
-    
-}
-
-.meituan-user {
-    width: 400px;
-    margin: 0 auto;
-    padding-top: 30px;
-    height: 40px;
-    display: flex;
-    align-items : center;
-}    
-
-.meituan-user p {
-    width: 50px;
-    color: #000000;
-    font-size: 16px;
-}
-
-.inptflex {
-    flex: 1;
-}
-    
-.reg-view {
-    width: 400px;
-    display: flex;
-    justify-content: flex-end;
-    margin: 0 auto;
-    padding-top: 10px;
-
-}
-.reg-view p {
-    cursor: ·pointer;
-    display: contents;
-}
-    
-.meituan-btn {
-    width: 200px;
-    display: flex;
-    align-items : center;
-    justify-content: center;
-    margin: 10px auto 0 auto;
-    font-size: 16px;
-}
-    
-</style>
diff --git a/src/views/test.vue b/src/views/test.vue
new file mode 100644
index 0000000..ace6051
--- /dev/null
+++ b/src/views/test.vue
@@ -0,0 +1,198 @@
+<template>
+  <div>
+<!--    <script type="module" src_old="https://unpkg.com/@splinetool/viewer@1.1.9/build/spline-viewer.js"></script>-->
+<!--    <spline-viewer url="https://prod.spline.design/EV4wkoOZwj4KpemL/scene.splinecode"></spline-viewer>-->
+
+    <div ref="graph" style="width:1150px; height: 330px"></div>
+<!--    <el-card style=" height:600px;width: 31%;" :body-style={padding:0} overflow:hidden >-->
+<!--      <div style="display:flex;">-->
+<!--        <el-divider direction="vertical" class="sublabel"></el-divider>-->
+<!--        <span class='title'>预警提示</span>-->
+<!--      </div>-->
+<!--      <vue-seamless-scroll :data="listData" class="warp">-->
+<!--        <ul class="item">-->
+<!--          <li v-for="(item, index) in listData" :key="index">-->
+<!--            <span class="title" v-text="item.title"></span>-->
+<!--            <span class="date" v-text="item.date">检测大</span>-->
+<!--            <span class="t" v-text="item.t"></span>-->
+<!--          </li>-->
+<!--        </ul>-->
+<!--      </vue-seamless-scroll>-->
+<!--    </el-card>-->
+
+  </div>
+
+</template>
+
+<script>
+
+import http from "@/utils/request";
+import * as echarts from "echarts";
+export default {
+  name: 'Example01Basic',
+  components: {
+
+  },
+  data () {
+    return {
+      listData: [{
+        'title': '无缝滚动第一行无缝滚动第一行',
+        'date': '2017-12-16',
+        't':'ss'
+      }, {
+        'title': '无缝滚动第二行无缝滚动第二行',
+        'date': '2017-12-16',
+        't':'qq'
+      }, {
+        'title': '无缝滚动第三行无缝滚动第三行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第四行无缝滚动第四行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第五行无缝滚动第五行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第六行无缝滚动第六行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第七行无缝滚动第七行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第八行无缝滚动第八行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第九行无缝滚动第九行',
+        'date': '2017-12-16'
+      }],
+    }
+  },
+  mounted() {
+    this.init()
+    // console.log('start')
+    // http.get('http://61.240.140.173:8000/graph/get_similarity_history/?company_id=91510100201958223R').then((res)=>{
+    //   console.log(res.data.data)
+    // })
+    // this.loadFunc().then((v)=>{
+    //   console.log(v)
+    // })
+    // console.log('end')
+  },
+  methods:{
+    init(){
+      const boxplotData =[100,200,560,222,456]
+      let echart = echarts.init(this.$refs.graph)
+      let option = {
+
+        title: {
+          text: '折线图堆叠'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+
+        grid: [
+          // 第一个grid用于折线图
+          {
+            left: '0%', // 或其他适合的百分比，留出左侧空间
+            right: '95%', // 为右侧箱型图预留空间
+            height: '80%', // 调整高度，按需设定
+          },
+          // 第二个grid用于箱型图，紧挨着第一个grid的右侧
+          {
+            left: '5%', // 紧接上一个grid右侧开始
+            right: '0%', // 保持一定右侧边距
+
+            height: '80%', // 调整高度，与第一个grid一致
+          },
+        ],
+        toolbox: {
+          feature: {
+            saveAsImage: {}
+          }
+        },
+        xAxis: [{
+          type: 'category',
+          position: 'bottom',
+          gridIndex: 0,
+          boundaryGap: false,
+          data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
+        },{
+        type: 'category',
+            data: ['1','2','3'], // 可以为空，因为我们不直接在x轴上显示数据
+          gridIndex: 1,
+          // show: false, // 可选，隐藏这个x轴的标签和轴线
+            position: 'bottom',
+      },],
+        yAxis: [{
+          type: 'value',
+
+          gridIndex: 0
+        },
+      {
+        type: 'value',
+        show:false,
+            gridIndex: 1
+      }],
+        series: [
+
+          {
+            name: '直接访问',
+            type: 'line',
+            stack: '总量',
+            xAxisIndex: 0,
+            data: [320, 332, 301, 334, 390, 330, 320]
+          },
+          {
+            name: '搜索引擎',
+            type: 'line',
+            stack: '总量',
+            xAxisIndex: 0,
+            yAxisIndex: 0,
+            data: [820, 932, 901, 934, 1290, 1330, 1320]
+          },
+          {
+            type: 'boxplot',
+            data:[{value: boxplotData,} ],
+            // 确保箱型图显示在折线图之后
+            // zlevel: 3,
+            // 箱型图的x轴数据应对应未来一个月的日期，由于这些日期没有具体值，我们使用null，ECharts会自动处理
+            xAxisIndex: 1, // 确保使用同一个x轴
+            yAxisIndex: 1, // 确保使用同一个x轴
+            // ... 箱型图其他配置，如颜色、样式等
+          },
+        ]
+      };
+      echart.setOption(option)
+    },
+    loadFunc(){
+      return new Promise((resolve,reject)=>{
+        setTimeout( resolve,3000,'success')
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.warp {
+  height: 270px;
+  width: 360px;
+  margin: 0 auto;
+  overflow: hidden;
+   ul {
+    list-style: none;
+    padding: 0;
+    margin: 0 auto;
+    li,
+     span {
+      display: block;
+      height: 30px;
+      line-height: 30px;
+      display: flex;
+      justify-content: space-between;
+      font-size: 15px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/个体风险分析.vue b/src/views/个体风险分析.vue
index 27e7766..4b797a4 100644
--- a/src/views/个体风险分析.vue
+++ b/src/views/个体风险分析.vue
@@ -1,323 +1,815 @@
 <!-- 个体风险分析 -->
 <template>
   <div>
-    <div>
-        <el-card style='height: auto;' :body-style={padding:0}> 
-       <!-- height:400px -->
-       <!-- 1、上标 -->
-        <span class="superscript" style="width: 20px; height: 40px;">个体风险分析</span>
-        <!-- 2、产品搜索栏 -->
+            <!-- 卡片化的标签页 -->
+            <el-tabs type="border-card">
+          <!-- 【1】股市 -->
+          <el-tab-pane label="股市">
+            <el-card style='height: auto;' :body-style={padding:0}>
+            <!-- 1、上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">股市实体分析</span>
+              <!-- 2、产品搜索栏 -->
+              <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                  <el-form :inline="true"  class="demo-form-inline" :model="formInline" ref="formInline">
+<!--                    <el-form-item label="市场">-->
+<!--                      <el-select  v-model="formInline.market" size="mini">-->
+<!--                        <el-option label="股票" value="stock"></el-option>-->
+<!--                        <el-option label="基金" value="bond"></el-option>-->
+<!--                      </el-select>-->
+<!--                    </el-form-item>-->
 
-        <div class="form">
-                                                         <!-- inline="true"表单域在一行 -->
-            <el-form :inline="true"  class="demo-form-inline" :model="formInline" ref="formInline">
-              <el-form-item label="市场">
-                <el-select  v-model="formInline.market">
-                  <el-option label="股票" value="股票"></el-option>
-                  <el-option label="基金" value="基金"></el-option>
-                </el-select>
-              </el-form-item>
+                    <el-form-item label="行业" >
+                      <el-select   v-model="formInline.industry" size="mini">
+                        <el-option-group
+                            v-for="group in options_industry"
+                            :key="group.label"
+                            :label="group.label">
+                          <el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                        </el-option-group>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="季度" >
+                      <quter-component v-model="formInline.quarter_year" placeholder="选择季度" />
+      <!--              <el-form-item label="开始时间">-->
+      <!--                <el-date-picker-->
+      <!--                    v-model="formInline.start_date"-->
+      <!--                    type="date"-->
+      <!--                    placeholder="年/月/日" -->
+      <!--                    size="mini">-->
+      <!--                </el-date-picker>-->
+      <!--              </el-form-item>-->
 
-              <el-form-item label="行业" >
-                <el-select   v-model="formInline.industry">
-                  <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
-                </el-select>
-              </el-form-item>
-              <quter-component v-model="formInline.quarter_year" placeholder="选择季度" />
-<!--              <el-form-item label="开始时间">-->
-<!--                <el-date-picker-->
-<!--                    v-model="formInline.start_date"-->
-<!--                    type="date"-->
-<!--                    placeholder="年/月/日" -->
-<!--                    size="mini">-->
-<!--                </el-date-picker>-->
-<!--              </el-form-item>-->
+      <!--              <el-form-item label="结束时间">-->
+      <!--              <el-date-picker-->
+      <!--                  v-model="formInline.end_date"-->
+      <!--                  type="date"-->
+      <!--                  placeholder="年/月/日" -->
+      <!--                  size="mini">-->
+      <!--              </el-date-picker>-->
+      <!--            </el-form-item>-->
+                  </el-form-item>
+                    <el-form-item>
+                      <el-button class="grayish_btn" @click="onSubmit('stock')" size="mini">查询</el-button>
+                    </el-form-item>
+                </el-form>
+              </div>
+              <!-- 3、个体风险分析返回数据 -->
+              <div class="content">
+                <el-table class='table'
+                    :data="tableData"
+                    style="width: 100%;padding: 0px 20px 0px 20px;"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+                    height="420"
+                    :row-style="{height:'28px'}"
+                          @row-click="handleRowContextMenu"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center">
 
-<!--              <el-form-item label="结束时间">-->
-<!--              <el-date-picker-->
-<!--                  v-model="formInline.end_date"-->
-<!--                  type="date"-->
-<!--                  placeholder="年/月/日" -->
-<!--                  size="mini">-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-              <el-form-item>
-                <el-button class="grayish_btn" @click="onSubmit" size="mini">查询</el-button>
-              </el-form-item>
-          </el-form>
-        </div>
+                    <el-table-column
+                    prop="name"
+                    label="公司名称"
+                    width="100">
+                      <template slot-scope="scope">
+<!--                        <div v-contextmenu:row="scope.row" @contextmenu.prevent="showContextMenu(scope.row)">-->
+<!--                          {{ scope.row.name }}-->
+<!--                        </div>-->
 
+                        <!-- 右键菜单内容 -->
+                        <el-dropdown  @command="currentRow" :style="{ top: contextMenuTop, left: contextMenuLeft }" trigger="click">
+<!--  <span class="el-dropdown-link">-->
+<!--    下拉菜单<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
+<!--  </span>-->
+                          <span v-contextmenu:row="scope.row" @contextmenu.prevent="showContextMenu(scope.row)">
+                            {{ scope.row.name }}
+                          </span>
 
-        <!-- 3、个体风险分析返回数据 -->
-        <div class="content">
-          <el-table
-              :data="tableData"
-              style="width: 100%;padding: 0px 20px 0px 20px;"
-              :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
-              border  
-
-              
-              :row-style="{height:'28px'}"
-              :cell-style="{padding:'0px'}"
-              header-row-class-name="active_header"
-              header-cell-class-name="active_header"
-              cell-class-name="content_center">
-            
-              <el-table-column
-              prop="name"
-              label="公司名称"
-              width="100">
-            </el-table-column>
-            <el-table-column label="风险水平">
-              <el-table-column
-                prop="财务杠杆"
-                label="财务杠杆"
-                sortable
-                width="70">
-              </el-table-column>
-              <el-table-column
-                prop="经营杠杆"
-                label="经营杠杆"
-                sortable
-                width="70">
-              </el-table-column>
-              <el-table-column
-                prop="综合杠杆"
-                label="综合杠杆"
-                sortable
-                width="70">
-              </el-table-column>
-              <el-table-column
-                prop="流动比率"
-                label="流动比率"
-                sortable
-                width="70">
-              </el-table-column>
-            </el-table-column>
-              <el-table-column label="（一）流动风险">
-                <el-table-column
-                  prop="速动比率"
-                  label="速动比率"
-                  sortable
-                  width="70">
-                </el-table-column>
-                <el-table-column
-                  prop="应收账款周转天数(天)"
-                  label="应收账款周转天数（天）"
-                  width="100">
-                </el-table-column>
-                <el-table-column
-                  prop="流动风险综合指数"
-                  label="流动风险综合指数"
-                  width="120"
-                  sortable>
-                </el-table-column>
-              </el-table-column>
-
-              <el-table-column label="（二）市场风险">
-                <el-table-column
-                  prop="在险价值"
-                  label="在险价值"
-                  sortable
-                  width="120">
-                </el-table-column>
-              </el-table-column>
-
-                <el-table-column label="（三）经营风险">
-                  <el-table-column
-                    prop="资产收益率标准差"
-                    label="资产收益率标准差"
-                    sortable
-                    width="120">
+                          <el-dropdown-menu slot="dropdown">
+                            <el-dropdown-item disabled >查看风险传导</el-dropdown-item>
+                            <el-dropdown-item divided command="流动风险">流动风险</el-dropdown-item>
+                            <el-dropdown-item command="市场风险">市场风险</el-dropdown-item>
+                            <el-dropdown-item command="经营风险">经营风险</el-dropdown-item>
+                            <el-dropdown-item command="信用风险">信用风险</el-dropdown-item>
+                            <el-dropdown-item command="资产负债风险">资产负债风险</el-dropdown-item>
+                            <el-dropdown-item command="获现风险">获现风险</el-dropdown-item>
+                          </el-dropdown-menu>
+                        </el-dropdown>
+                      </template>
                   </el-table-column>
-              </el-table-column>
+                  <el-table-column label="风险水平">
+                    <el-table-column
+                      prop="财务杠杆"
+                      label="财务杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="经营杠杆"
+                      label="经营杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="综合杠杆"
+                      label="综合杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
 
-              <el-table-column label="（四）信用风险">
-                  <el-table-column
-                    prop="资产负债率"
-                    label="资产负债率"
-                    sortable
+                  </el-table-column>
+                    <el-table-column label="（一）流动风险">
+                      <el-table-column
+                          prop="流动比率"
+                          label="流动比率"
+                          sortable
+                          width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="速动比率"
+                        label="速动比率"
+                        sortable
+                        width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="应收账款周转天数(天)"
+                        label="应收账款周转天数（天）"
+                        width="100">
+                      </el-table-column>
+                      <el-table-column
+                        prop="流动风险综合指数"
+                        label="流动风险综合指数"
+                        width="120"
+                        sortable>
+                      </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（二）市场风险">
+                      <el-table-column
+                        prop="在险价值"
+                        label="在险价值"
+                        sortable
+                        width="120">
+                      </el-table-column>
+                    </el-table-column>
+
+                      <el-table-column label="（三）经营风险">
+                        <el-table-column
+                          prop="资产收益率标准差"
+                          label="资产收益率标准差"
+                          sortable
+                          width="120">
+                        </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（四）信用风险">
+                        <el-table-column
+                          prop="资产负债率"
+                          label="资产负债率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                        <el-table-column
+                          prop="投资盈利率"
+                          label="投资盈利率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+                      <el-table-column
+                          prop="信用风险综合指数"
+                          label="信用风险综合指数"
+                          sortable
+                          width="100">
+                      </el-table-column>
+
+                    </el-table-column>
+
+                  <el-table-column label="（五）资产负债风险">
+                    <el-table-column
+                        prop="资产负债率_"
+                        label="资产负债率_"
+                        sortable
+                        width="100">
+                    </el-table-column>
+
+                  </el-table-column>
+
+                  <el-table-column label="（六）获现风险">
+                    <el-table-column
+                        prop="销售现金比率"
+                        label="销售现金比率"
+                        sortable
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="每股营业现金流量"
+                        label="每股营业现金流量"
+                        sortable
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="全部资产现金回收率"
+                        label="全部资产现金回收率"
+                        sortable
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="获现风险综合指数"
+                        label="获现风险综合指数"
+                        sortable
+                        width="100">
+                    </el-table-column>
+
+                  </el-table-column>
+
+                  <el-table-column label="声誉风险">
+                    <el-table-column
+                        prop="市场占有率"
+                        label="市场占有率"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="固有资产增长率"
+                        label="固有资产增长率"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="资本利润率"
+                        label="资本利润率"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="流动比率"
+                        label="流动比率"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="声誉风险综合指数"
+                        label="声誉风险综合指数"
+                        width="100">
+                    </el-table-column>
+
+                  </el-table-column>
+                  <el-table-column label="政策风险">
+                    <el-table-column
+                        prop="政策风险综合指数"
+                        label="政策风险综合指数"
+                        width="100">
+                    </el-table-column>
+                  </el-table-column>
+                  <el-table-column label="法律风险">
+                    <el-table-column
+                        prop="法律风险影响程度"
+                        label="法律风险影响程度"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="法律风险发生可能性"
+                        label="法律风险发生可能性"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="法律风险损失率"
+                        label="法律风险损失率"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="法律风险综合指数"
+                        label="法律风险综合指数"
+                        width="100">
+                    </el-table-column>
+                  </el-table-column>
+                  <el-table-column label="操作风险">
+                    <el-table-column
+                        prop="监管资本"
+                        label="监管资本"
+                        width="100">
+                    </el-table-column>
+                  </el-table-column>
+                    <el-table-column
+                    prop="综合风险等级"
+                    label="综合风险等级"
                     width="100">
                   </el-table-column>
+                </el-table>
 
-                  <el-table-column
-                    prop="投资盈利率"
-                    label="投资盈利率"
-                    sortable
+
+<!--                <div v-if="isContextMenuVisible" class="context-menu" :style="{ top: contextMenuTop, left: contextMenuLeft }">-->
+<!--                  <div @click="handleMenuItemClick('Option 1')">选项 1</div>-->
+<!--                  <div @click="handleMenuItemClick('Option 2')">选项 2</div>-->
+<!--                  <div @click="handleMenuItemClick('Option 3')">选项 3</div>-->
+<!--                </div>-->
+              </div>
+            </el-card>
+
+          </el-tab-pane>
+
+        <!-- 【2】债市 -->
+        <el-tab-pane label="债市">
+          <el-card style='height: auto;' :body-style={padding:0}>
+            <!-- 1、上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">债市实体分析</span>
+              <!-- 2、产品搜索栏 -->
+              <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                  <el-form :inline="true"  class="demo-form-inline" :model="formInline" ref="formInline">
+<!--                    <el-form-item label="市场">-->
+<!--                      <el-select  v-model="formInline.market" size="mini">-->
+<!--                        <el-option label="股票" value="股票"></el-option>-->
+<!--                        <el-option label="基金" value="基金"></el-option>-->
+<!--                      </el-select>-->
+<!--                    </el-form-item>-->
+
+                    <el-form-item label="行业" >
+                      <el-select   v-model="formInline.industry" size="mini">
+                        <el-option-group
+                            v-for="group in options_industry"
+                            :key="group.label"
+                            :label="group.label">
+                        <el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                        </el-option-group>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="季度" >
+                    <quter-component v-model="formInline.quarter_year" placeholder="选择季度" />
+      <!--              <el-form-item label="开始时间">-->
+      <!--                <el-date-picker-->
+      <!--                    v-model="formInline.start_date"-->
+      <!--                    type="date"-->
+      <!--                    placeholder="年/月/日" -->
+      <!--                    size="mini">-->
+      <!--                </el-date-picker>-->
+      <!--              </el-form-item>-->
+
+      <!--              <el-form-item label="结束时间">-->
+      <!--              <el-date-picker-->
+      <!--                  v-model="formInline.end_date"-->
+      <!--                  type="date"-->
+      <!--                  placeholder="年/月/日" -->
+      <!--                  size="mini">-->
+      <!--              </el-date-picker>-->
+      <!--            </el-form-item>-->
+                    </el-form-item>
+                    <el-form-item>
+                      <el-button class="grayish_btn" @click="onSubmit('bond')" size="mini">查询</el-button>
+                    </el-form-item>
+                </el-form>
+              </div>
+              <!-- 3、个体风险分析返回数据 -->
+              <div class="content">
+                <el-table class='table'
+                    :data="tableDataBond"
+                    style="width: 100%;padding: 0px 20px 0px 20px;"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+
+
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center">
+
+                    <el-table-column
+                    prop="name"
+                    label="公司名称"
                     width="100">
                   </el-table-column>
+                  <el-table-column label="风险水平">
+                    <el-table-column
+                      prop="财务杠杆"
+                      label="财务杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="经营杠杆"
+                      label="经营杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="综合杠杆"
+                      label="综合杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
 
-              </el-table-column>
-            <el-table-column
-                prop="声誉风险综合指数"
-                label="声誉风险"
-                width="100">
-            </el-table-column>
-            <el-table-column
-                prop="政策风险综合指数"
-                label="政策风险"
-                width="100">
-            </el-table-column>
-            <el-table-column
-                prop="法律风险综合指数"
-                label="法律风险"
-                width="100">
-            </el-table-column>
-            <el-table-column
-                prop="操作风险综合指数"
-                label="操作风险"
-                width="100">
-            </el-table-column>
-              <el-table-column
-              prop="综合风险等级"
-              label="综合风险等级"
-              width="100">
-            </el-table-column>
+                  </el-table-column>
+
+                    <el-table-column label="（一）流动风险">
+                      <el-table-column
+                          prop="流动比率"
+                          label="流动比率"
+                          sortable
+                          width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="速动比率"
+                        label="速动比率"
+                        sortable
+                        width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="应收账款周转天数(天)"
+                        label="应收账款周转天数（天）"
+                        width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="流动风险综合指数"
+                        label="流动风险综合指数"
+                        width="120"
+                        sortable>
+                      </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（二）市场风险">
+                      <el-table-column
+                        prop="在险价值"
+                        label="在险价值"
+                        sortable
+                        width="120">
+                      </el-table-column>
+                    </el-table-column>
+
+                      <el-table-column label="（三）经营风险">
+                        <el-table-column
+                          prop="资产收益率标准差"
+                          label="资产收益率标准差"
+                          sortable
+                          width="120">
+                        </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（四）信用风险">
+                        <el-table-column
+                          prop="资产负债率"
+                          label="资产负债率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                        <el-table-column
+                          prop="资产报酬率（投资盈利率）"
+                          label="资产报酬率（投资盈利率）"
+                          sortable
+                          width="100">
+                        </el-table-column>
+                      <el-table-column
+                          prop="信用风险综合指数"
+                          label="信用风险综合指数"
+                          sortable
+                          width="100">
+                      </el-table-column>
+
+                    </el-table-column>
+                  <el-table-column
+                      prop="声誉风险综合指数"
+                      label="声誉风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="政策风险综合指数"
+                      label="政策风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="法律风险综合指数"
+                      label="法律风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="操作风险综合指数"
+                      label="操作风险"
+                      width="100">
+                  </el-table-column>
+                    <el-table-column
+                    prop="综合风险等级"
+                    label="综合风险等级"
+                    width="100">
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-card>
+
+        </el-tab-pane>
+
+          <!-- 【3】期货 -->
+          <el-tab-pane label="期货">
+            <el-card style='height: auto;' :body-style={padding:0}>
+            <!-- 1、上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">期货实体分析</span>
+              <!-- 2、产品搜索栏 -->
+              <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                  <el-form :inline="true"  class="demo-form-inline" :model="formInline" ref="formInline">
+<!--                    <el-form-item label="市场">-->
+<!--                      <el-select  v-model="formInline.market" size="mini">-->
+<!--                        <el-option label="股票" value="股票"></el-option>-->
+<!--                        <el-option label="基金" value="基金"></el-option>-->
+<!--                      </el-select>-->
+<!--                    </el-form-item>-->
+
+                    <el-form-item label="行业" >
+                      <el-select   v-model="formInline.industry" size="mini">
+                        <el-option-group
+                            v-for="group in options_industry"
+                            :key="group.label"
+                            :label="group.label">
+                        <el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                        </el-option-group>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="季度" >
+                    <quter-component v-model="formInline.quarter_year" placeholder="选择季度" />
+      <!--              <el-form-item label="开始时间">-->
+      <!--                <el-date-picker-->
+      <!--                    v-model="formInline.start_date"-->
+      <!--                    type="date"-->
+      <!--                    placeholder="年/月/日" -->
+      <!--                    size="mini">-->
+      <!--                </el-date-picker>-->
+      <!--              </el-form-item>-->
+
+      <!--              <el-form-item label="结束时间">-->
+      <!--              <el-date-picker-->
+      <!--                  v-model="formInline.end_date"-->
+      <!--                  type="date"-->
+      <!--                  placeholder="年/月/日" -->
+      <!--                  size="mini">-->
+      <!--              </el-date-picker>-->
+      <!--            </el-form-item>-->
+                   </el-form-item>
+                    <el-form-item>
+                      <el-button class="grayish_btn" @click="onSubmit('future')" size="mini">查询</el-button>
+                    </el-form-item>
+                </el-form>
+              </div>
+              <!-- 3、个体风险分析返回数据 -->
+              <div class="content">
+                <el-table class='table'
+                    :data="tableDataFuture"
+                    style="width: 100%;padding: 0px 20px 0px 20px;"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center">
+
+                    <el-table-column
+                    prop="name"
+                    label="公司名称"
+                    width="100">
+
+                  </el-table-column>
+                  <el-table-column label="风险水平">
+                    <el-table-column
+                      prop="财务杠杆"
+                      label="财务杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="经营杠杆"
+                      label="经营杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="综合杠杆"
+                      label="综合杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="流动比率"
+                      label="流动比率"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                  </el-table-column>
+                    <el-table-column label="（一）流动风险">
+                      <el-table-column
+                        prop="速动比率"
+                        label="速动比率"
+                        sortable
+                        width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="应收账款周转天数(天)"
+                        label="应收账款周转天数（天）"
+                        width="100">
+                      </el-table-column>
+                      <el-table-column
+                        prop="流动风险综合指数"
+                        label="流动风险综合指数"
+                        width="120"
+                        sortable>
+                      </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（二）市场风险">
+                      <el-table-column
+                        prop="在险价值"
+                        label="在险价值"
+                        sortable
+                        width="120">
+                      </el-table-column>
+                    </el-table-column>
+
+                      <el-table-column label="（三）经营风险">
+                        <el-table-column
+                          prop="资产收益率标准差"
+                          label="资产收益率标准差"
+                          sortable
+                          width="120">
+                        </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（四）信用风险">
+                        <el-table-column
+                          prop="资产负债率"
+                          label="资产负债率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                        <el-table-column
+                          prop="投资盈利率"
+                          label="投资盈利率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                    </el-table-column>
+                  <el-table-column
+                      prop="声誉风险综合指数"
+                      label="声誉风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="政策风险综合指数"
+                      label="政策风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="法律风险综合指数"
+                      label="法律风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="操作风险综合指数"
+                      label="操作风险"
+                      width="100">
+                  </el-table-column>
+                    <el-table-column
+                    prop="综合风险等级"
+                    label="综合风险等级"
+                    width="100">
+                  </el-table-column>
+                </el-table>
 
 
-          </el-table>
+              </div>
+            </el-card>
+          </el-tab-pane>
+        </el-tabs>
 
 
-        </div> 
+          <!-- 4、说明card -->
+          <el-card style='height: 950px; margin: 10px 0px 2px 0px;background-color: rgba(200, 200, 200, 0.812);'>
+            <span v-html="info" ></span>
+          </el-card>
 
-        <!-- 4、说明card -->
-        <el-card style='height: 500px; margin: 10px 20px 2px 20px;background-color: rgba(200, 200, 200, 0.812);'>
-          <span class="kala_text" >
-            指标说明：
-
-            一、风险水平
-
-            1.杠杆用来评价企业的风险，一定要结合收入的变动、业务的变动，光看杠杆大小是没有意义的，杠杆只是将这种变动放大，或者向上放大，或者向下放大。
-
-            2.具体指标有：
-
-            1）财务杠杆：由于债务融资产生的固定利息费用的存在，使得息税前利润的变动引起每股收益产生更大变动程度的现象。财务杠杆越大，负债带来的利息抵税作用也越大，同时财务风险也会提高。
-
-            2）经营杠杆：由于存在固定性经营成本，销售收入的较小变动会引起息税前利润较大的变动的现象。经营杠杆率越高，利润变动越剧烈，企业的经营风险越大。
-
-            3）综合杠杆：综合杠杆，是经营杠杆和财务杠杆结合在一起共同发挥的连锁作用，可以用于衡量销售量的变动对普通股每股收益变动的影响程度。
-
-            二、流动性风险
-
-            1.流动性风险是指由于资金筹措不力，现金流动不畅，发生停滞、断流等，不能偿还到期债务形成的风险。
-
-            2.具体指标有：
-
-            1）流动比率：用来衡量企业流动资产在短期债务到期以前，可以变为现金用于偿还负债的能力。流动比率越高，说明企业资产的变现能力越强，流动性风险越低。
-
-            2）速动比率：是衡量企业流动资产中可以立即变现用于偿还流动负债的能力。速动比率越高，流动性风险越低。
-
-            3）应收账款周转天数(天)：应收账款周转天数表示在一个会计年度内，应收账款从发生到收回周转一次的平均天数（平均收款期）。应收账款周转天数越短，流动性风险越低。
-
-            4）流动风险综合指数：即对上述3个指标进行指标合并，所获得的综合指标，流动风险综合指数越大，该公司遭受流动风险的可能性越小。
-
-            三、市场风险
-
-            1.市场风险是指未来市场价格(利率、汇率、股票价格和商品价格)的不确定性对企业实现其既定目标的不利影响。(对于一般上市公司市场风险 主要体现在股价的收益率上)
-
-            2.具体指标有：
-
-            1）风险价值(VaR)：在一定概率水平（置信度）下，某一金融资产或证券组合价值在未来特定时期内的最大可能损失。风险价值越大，该公司遭受市场风险的可能性越小。
-
-            四、经营风险
-
-            1.经营风险是由于生产经营变动或市场环境改变导致企业未来的经营性现金流量发生变化，从而影响企业的市场价值的可能性。
-
-            2.具体指标有：
-
-            1）资产收益率标准差：资产收益率是衡量银行盈利能力的一个指标，资产收益率的标准差则表示收益的波动性，可以用其衡量经营风险。资产收益率标准差越大，说明收益的波动性越大，即该公司的经营风险的可能性越大。
-
-            五、信用风险
-
-            1.信用风险是借款人因各种原因未能及时、足额偿还债务或银行贷款而违约的可能性。发生违约时，债权人或银行必将因为未能得到预期的收益而承担财务上的损失。
-
-            2.具体指标有：
-
-            1）资产负债率：反映在总资产中有多大比例是通过借债来筹资的。资产负债率越大，信用风险越大。
-
-            2）资产报酬率：资产报酬率越高，表明企业投入产出的水平越好，企业的资产运营越有效。资产报酬率越高，该公司遭受信用风险的可能性越小。
-
-            3）信用风险综合指数：即对上述2个指标进行指标合并，所获得的综合指标，信用风险综合指数越大，该公司遭受信用风险的可能性越小。
-
-            六、资产负债风险
-
-            1.资产负债风险是指当负债所取得的经营收益不足以抵偿负债的资金成本时所产生的财务风险。
-
-            2.具体指标有：
-
-            1）资产负债率：如果资产负债比率达到100%或超过100%，说明公司已经没有净资产或资不抵债。因此，资产负债率越大，该公司遭受资产负债风险的可能性越大。
-
-            七、获现风险
-
-            1.获现风险是企业利用各种资源获取现金出现问题的可能性。
-
-            2.具体指标有：
-
-            1）销售现金比率：反映每元销售得到的净现金流入量。销售现金比率越大，获现风险越小。
-
-            2）每股营业现金流量：反映每股经营所得到的净现金。每股营业现金流量越大，获现风险越小。
-
-            3）全部资产现金回收率：说明企业资产产生现金的能力。全部资产现金回收率越大，获现风险越小。
-
-            4）获现风险综合指数：即对上述3个指标进行指标合并，所获得的综合指标，获现风险综合指数越大，该公司遭受获现风险的可能性越小。
-          </span>
-        </el-card>
-      </el-card>
-      </div>
   </div>
 </template>
 
 <script>
 import quterComponent from "@/components/quterComponent";
 import http from '../utils/request'
+import VueContextMenu from 'vue-contextmenu'
+import Vue from "vue";
+Vue.use(VueContextMenu)
 export default {
+  name:'individual_risk',
   components:{
     quterComponent
   },
   data () {
     return {
-      options_industry: [{'value': '房地产业', 'label': '房地产业'}, {'value': '软件和信息技术服务业', 'label': '软件和信息技术服务业'}, {'value': '互联网和相关服务', 'label': '互联网和相关服务'}, {'value': '电信、广播电视和卫星传输服务', 'label': '电信、广播电视和卫星传输服务'}, {'value': '生态保护和环境治理业', 'label': '生态保护和环境治理业'}, {'value': '公共设施管理业', 'label': '公共设施管理业'}, {'value': '铁路、船舶、航空航天和其他运输设备制造业', 'label': '铁路、船舶、航空航天和其他运输设备制造业'}, {'value': '非金属矿物制品业', 'label': '非金属矿物制品业'}, {'value': '计算机、通信和其他电子设备制造业', 'label': '计算机、通信和其他电子设备制造业'}, {'value': '汽车制造业', 'label': '汽车制造业'}, {'value': '金属制品业', 'label': '金属制品业'}, {'value': '农副食品加工业', 'label': '农副食品加工业'}, {'value': '电气机械和器材制造业', 'label': '电气机械和器材制造业'}, {'value': '石油加工、炼焦和核燃料加工业', 'label': '石油加工、炼焦和核燃料加工业'}, {'value': '有色金属冶炼和压延加工业', 'label': '有色金属冶炼和压延加工业'}, {'value': '医药制造业', 'label': '医药制造业'}, {'value': '专用设备制造业', 'label': '专用设备制造业'}, {'value': '化学纤维制造业', 'label': '化学纤维制造业'}, {'value': '通用设备制造业', 'label': '通用设备制造业'}, {'value': '化学原料及化学制品制造业', 'label': '化学原料及化学制品制造业'}, {'value': '造纸及纸制品业', 'label': '造纸及纸制品业'}, {'value': '橡胶和塑料制品业', 'label': '橡胶和塑料制品业'}, {'value': '酒、饮料和精制茶制造业', 'label': '酒、饮料和精制茶制造业'}, {'value': '其他制造业', 'label': '其他制造业'}, {'value': '纺织业', 'label': '纺织业'}, {'value': '家具制造业', 'label': '家具制造业'}, {'value': '印刷和记录媒介复制业', 'label': '印刷和记录媒介复制业'}, {'value': '黑色金属冶炼和压延加工业', 'label': '黑色金属冶炼和压延加工业'}, {'value': '食品制造业', 'label': '食品制造业'}, {'value': '废弃资源综合利用业', 'label': '废弃资源综合利用业'}, {'value': '木材加工及木、竹、藤、棕、草制品业', 'label': '木材加工及木、竹、藤、棕、草制品业'}, {'value': '纺织服装、服饰业', 'label': '纺织服装、服饰业'}, {'value': '仪器仪表制造业', 'label': '仪器仪表制造业'}, {'value': '文教、工美、体育和娱乐用品制造业', 'label': '文教、工美、体育和娱乐用品制造业'}, {'value': '皮革、毛皮、羽毛及其制品和制鞋业', 'label': '皮革、毛皮、羽毛及其制品和制鞋业'}, {'value': '综合', 'label': '综合'}, {'value': '土木工程建筑业', 'label': '土木工程建筑业'}, {'value': '房屋建筑业', 'label': '房屋建筑业'}, {'value': '建筑装饰和其他建筑业', 'label': '建筑装饰和其他建筑业'}, {'value': '建筑安装业', 'label': '建筑安装业'}, {'value': '批发业', 'label': '批发业'}, {'value': '零售业', 'label': '零售业'}, {'value': '电力、热力生产和供应业', 'label': '电力、热力生产和供应业'}, {'value': '燃气生产和供应业', 'label': '燃气生产和供应业'}, {'value': '水的生产和供应业', 'label': '水的生产和供应业'}, {'value': '商务服务业', 'label': '商务服务业'}, {'value': '道路运输业', 'label': '道路运输业'}, {'value': '航空运输业', 'label': '航空运输业'}, {'value': '水上运输业', 'label': '水上运输业'}, {'value': '铁路运输业', 'label': '铁路运输业'}, {'value': '邮政业', 'label': '邮政业'}, {'value': '仓储业', 'label': '仓储业'}, {'value': '装卸搬运和运输代理业', 'label': '装卸搬运和运输代理业'}, {'value': '卫生', 'label': '卫生'}, {'value': '广播、电视、电影和影视录音制作业', 'label': '广播、电视、电影和影视录音制作业'}, {'value': '新闻和出版业', 'label': '新闻和出版业'}, {'value': '文化艺术业', 'label': '文化艺术业'}, {'value': '体育', 'label': '体育'}, {'value': '有色金属矿采选业', 'label': '有色金属矿采选业'}, {'value': '煤炭开采和洗选业', 'label': '煤炭开采和洗选业'}, {'value': '黑色金属矿采选业', 'label': '黑色金属矿采选业'}, {'value': '石油和天然气开采业', 'label': '石油和天然气开采业'}, {'value': '开采辅助活动', 'label': '开采辅助活动'}, {'value': '非金属矿采选业', 'label': '非金属矿采选业'}, {'value': '住宿业', 'label': '住宿业'}, {'value': '餐饮业', 'label': '餐饮业'}, {'value': '科技推广和应用服务业', 'label': '科技推广和应用服务业'}, {'value': '专业技术服务业', 'label': '专业技术服务业'}, {'value': '研究和试验发展', 'label': '研究和试验发展'}, {'value': '教育', 'label': '教育'}, {'value': '林业', 'label': '林业'}, {'value': '农、林、牧、渔服务业', 'label': '农、林、牧、渔服务业'}, {'value': '畜牧业', 'label': '畜牧业'}, {'value': '渔业', 'label': '渔业'}, {'value': '农业', 'label': '农业'}, {'value': '机动车、电子产品和日用产品修理业', 'label': '机动车、电子产品和日用产品修理业'}],
-// 表单-个体风险分析
-  formInline: {
-        market:'',
+      // 跳转数据
+      isContextMenuVisible: false,
+      contextMenuTop: 0,
+      contextMenuLeft: 0,
+      currentRowId: null,
+
+      options_industry: [{  label: '房地产业', options:[{'value': '房地产业', 'label': '房地产业'}]},
+        { label: '信息传输、软件和信息技术服务业', options:[{'value': '软件和信息技术服务业', 'label': '软件和信息技术服务业'}, {'value': '互联网和相关服务', 'label': '互联网和相关服务'}, {'value': '电信、广播电视和卫星传输服务', 'label': '电信、广播电视和卫星传输服务'}]},
+        {  label: '水利、环境和公共设施管理业', options:[{'value': '生态保护和环境治理业', 'label': '生态保护和环境治理业'}, {'value': '公共设施管理业', 'label': '公共设施管理业'}]},
+        {  label: '制造业', options:[{'value': '铁路、船舶、航空航天和其他运输设备制造业', 'label': '铁路、船舶、航空航天和其他运输设备制造业'}, {'value': '非金属矿物制品业', 'label': '非金属矿物制品业'}, {'value': '计算机、通信和其他电子设备制造业', 'label': '计算机、通信和其他电子设备制造业'}, {'value': '汽车制造业', 'label': '汽车制造业'}, {'value': '金属制品业', 'label': '金属制品业'}, {'value': '农副食品加工业', 'label': '农副食品加工业'}, {'value': '电气机械和器材制造业', 'label': '电气机械和器材制造业'}, {'value': '石油加工、炼焦和核燃料加工业', 'label': '石油加工、炼焦和核燃料加工业'}, {'value': '有色金属冶炼和压延加工业', 'label': '有色金属冶炼和压延加工业'}, {'value': '医药制造业', 'label': '医药制造业'}, {'value': '专用设备制造业', 'label': '专用设备制造业'}, {'value': '化学纤维制造业', 'label': '化学纤维制造业'}, {'value': '通用设备制造业', 'label': '通用设备制造业'}, {'value': '化学原料及化学制品制造业', 'label': '化学原料及化学制品制造业'}, {'value': '造纸及纸制品业', 'label': '造纸及纸制品业'}, {'value': '橡胶和塑料制品业', 'label': '橡胶和塑料制品业'}, {'value': '酒、饮料和精制茶制造业', 'label': '酒、饮料和精制茶制造业'}, {'value': '其他制造业', 'label': '其他制造业'}, {'value': '纺织业', 'label': '纺织业'}, {'value': '家具制造业', 'label': '家具制造业'}, {'value': '印刷和记录媒介复制业', 'label': '印刷和记录媒介复制业'}, {'value': '黑色金属冶炼和压延加工业', 'label': '黑色金属冶炼和压延加工业'}, {'value': '食品制造业', 'label': '食品制造业'}, {'value': '废弃资源综合利用业', 'label': '废弃资源综合利用业'}, {'value': '木材加工及木、竹、藤、棕、草制品业', 'label': '木材加工及木、竹、藤、棕、草制品业'}, {'value': '纺织服装、服饰业', 'label': '纺织服装、服饰业'}, {'value': '仪器仪表制造业', 'label': '仪器仪表制造业'}, {'value': '文教、工美、体育和娱乐用品制造业', 'label': '文教、工美、体育和娱乐用品制造业'}, {'value': '皮革、毛皮、羽毛及其制品和制鞋业', 'label': '皮革、毛皮、羽毛及其制品和制鞋业'}]},
+        {  label: '综合', options:[{'value': '综合', 'label': '综合'}]},
+        {  label: '建筑业', options:[{'value': '土木工程建筑业', 'label': '土木工程建筑业'}, {'value': '房屋建筑业', 'label': '房屋建筑业'}, {'value': '建筑装饰和其他建筑业', 'label': '建筑装饰和其他建筑业'}, {'value': '建筑安装业', 'label': '建筑安装业'}]}   ,
+        {  label: '批发和零售业', options:[ {'value': '批发业', 'label': '批发业'}, {'value': '零售业', 'label': '零售业'}]},
+        {  label: '电力、热力、燃气及水生产和供应业', options:[{'value': '电力、热力生产和供应业', 'label': '电力、热力生产和供应业'}, {'value': '燃气生产和供应业', 'label': '燃气生产和供应业'}, {'value': '水的生产和供应业', 'label': '水的生产和供应业'}]},
+        {  label: '租赁和商务服务业', options:[{'value': '商务服务业', 'label': '商务服务业'},{'value': '租赁业', 'label': '租赁业'}]},
+
+        {  label: '交通运输、仓储和邮政业', options:[{'value': '道路运输业', 'label': '道路运输业'}, {'value': '航空运输业', 'label': '航空运输业'}, {'value': '水上运输业', 'label': '水上运输业'}, {'value': '铁路运输业', 'label': '铁路运输业'}, {'value': '邮政业', 'label': '邮政业'}, {'value': '仓储业', 'label': '仓储业'}, {'value': '装卸搬运和运输代理业', 'label': '装卸搬运和运输代理业'}]},
+        {  label: '卫生和社会工作', options:[{'value': '卫生', 'label': '卫生'}]},
+        {  label: '文化、体育和娱乐业', options:[{'value': '广播、电视、电影和影视录音制作业', 'label': '广播、电视、电影和影视录音制作业'}, {'value': '新闻和出版业', 'label': '新闻和出版业'}, {'value': '文化艺术业', 'label': '文化艺术业'}, {'value': '体育', 'label': '体育'}]},
+        {  label: '采矿业', options:[{'value': '有色金属矿采选业', 'label': '有色金属矿采选业'}, {'value': '煤炭开采和洗选业', 'label': '煤炭开采和洗选业'}, {'value': '黑色金属矿采选业', 'label': '黑色金属矿采选业'}, {'value': '石油和天然气开采业', 'label': '石油和天然气开采业'}, {'value': '开采辅助活动', 'label': '开采辅助活动'}, {'value': '非金属矿采选业', 'label': '非金属矿采选业'}]},
+        {  label: '住宿和餐饮业', options:[{'value': '住宿业', 'label': '住宿业'}, {'value': '餐饮业', 'label': '餐饮业'}]},
+        {  label: '科学研究和技术服务业', options:[{'value': '科技推广和应用服务业', 'label': '科技推广和应用服务业'}, {'value': '专业技术服务业', 'label': '专业技术服务业'}, {'value': '研究和试验发展', 'label': '研究和试验发展'}]},
+        {  label: '教育', options:[ {'value': '教育', 'label': '教育'}]},
+        {  label: '农、林、牧、渔业', options:[ {'value': '林业', 'label': '林业'}, {'value': '农、林、牧、渔服务业', 'label': '农、林、牧、渔服务业'}, {'value': '畜牧业', 'label': '畜牧业'}, {'value': '渔业', 'label': '渔业'}, {'value': '农业', 'label': '农业'}]} ,
+        {  label: '居民服务、修理和其他服务业', options:[ {'value': '机动车、电子产品和日用产品修理业'}]}
+          ],
+       // 表单-个体风险分析
+      formInline: {
+
         industry:'',
         quarter_year:'',
-    },
-      //个体风险分析表格
+      },
+      // 个体风险分析表格
       tableData: [
-  {  
-      name:'秦农商行',
-      },
-      {  
-      name:'华夏商行',
-      },
+    // {
+    //   name:'秦农商行',
+    //   },
+    //   {
+    //   name:'华夏商行',
+    //   },
       ],
+      tableDataFuture:[],
+      tableDataBond:[],
+      // 解释说明
+      info:"指标说明：<br/>一、风险水平<br/>1.杠杆用来评价企业的风险，一定要结合收入的变动、业务的变动，光看杠杆大小是没有意义的，杠杆只是将这种变动放大，或者向上放大，或者向下放大。<br/>2.具体指标有：<br/>1）财务杠杆：由于债务融资产生的固定利息费用的存在，使得息税前利润的变动引起每股收益产生更大变动程度的现象。财务杠杆越大，负债带来的利息抵税作用也越大，同时财务风险也会提高。<br/>2）经营杠杆：由于存在固定性经营成本，销售收入的较小变动会引起息税前利润较大的变动的现象。经营杠杆率越高，利润变动越剧烈，企业的经营风险越大。<br/>3）综合杠杆：综合杠杆，是经营杠杆和财务杠杆结合在一起共同发挥的连锁作用，可以用于衡量销售量的变动对普通股每股收益变动的影响程度。<br/>二、流动性风险<br/>1.流动性风险是指由于资金筹措不力，现金流动不畅，发生停滞、断流等，不能偿还到期债务形成的风险。<br/>2.具体指标有：<br/>1）流动比率：用来衡量企业流动资产在短期债务到期以前，可以变为现金用于偿还负债的能力。流动比率越高，说明企业资产的变现能力越强，流动性风险越低。<br/>2）速动比率：是衡量企业流动资产中可以立即变现用于偿还流动负债的能力。速动比率越高，流动性风险越低。<br/>3）应收账款周转天数(天)：应收账款周转天数表示在一个会计年度内，应收账款从发生到收回周转一次的平均天数（平均收款期）。应收账款周转天数越短，流动性风险越低。<br/>4）流动风险综合指数：即对上述3个指标进行指标合并，所获得的综合指标，流动风险综合指数越大，该公司遭受流动风险的可能性越小。<br/>三、市场风险<br/>1.市场风险是指未来市场价格(利率、汇率、股票价格和商品价格)的不确定性对企业实现其既定目标的不利影响。(对于一般上市公司市场风险 主要体现在股价的收益率上)<br/>2.具体指标有：<br/>1）风险价值(VaR)：在一定概率水平（置信度）下，某一金融资产或证券组合价值在未来特定时期内的最大可能损失。风险价值越大，该公司遭受市场风险的可能性越小。<br/>四、经营风险<br/>1.经营风险是由于生产经营变动或市场环境改变导致企业未来的经营性现金流量发生变化，从而影响企业的市场价值的可能性。<br/>2.具体指标有：<br/>1）资产收益率标准差：资产收益率是衡量银行盈利能力的一个指标，资产收益率的标准差则表示收益的波动性，可以用其衡量经营风险。资产收益率标准差越大，说明收益的波动性越大，即该公司的经营风险的可能性越大。<br/>五、信用风险<br/>1.信用风险是借款人因各种原因未能及时、足额偿还债务或银行贷款而违约的可能性。发生违约时，债权人或银行必将因为未能得到预期的收益而承担财务上的损失。<br/>2.具体指标有：<br/>1）资产负债率：反映在总资产中有多大比例是通过借债来筹资的。资产负债率越大，信用风险越大。<br/>2）资产报酬率：资产报酬率越高，表明企业投入产出的水平越好，企业的资产运营越有效。资产报酬率越高，该公司遭受信用风险的可能性越小。<br/>3）信用风险综合指数：即对上述2个指标进行指标合并，所获得的综合指标，信用风险综合指数越大，该公司遭受信用风险的可能性越小。<br/>六、资产负债风险<br/>1.资产负债风险是指当负债所取得的经营收益不足以抵偿负债的资金成本时所产生的财务风险。<br/>2.具体指标有：<br/>1）资产负债率：如果资产负债比率达到100%或超过100%，说明公司已经没有净资产或资不抵债。因此，资产负债率越大，该公司遭受资产负债风险的可能性越大。<br/>七、获现风险<br/>1.获现风险是企业利用各种资源获取现金出现问题的可能性。<br/>2.具体指标有：<br/>1）销售现金比率：反映每元销售得到的净现金流入量。销售现金比率越大，获现风险越小。<br/>2）每股营业现金流量：反映每股经营所得到的净现金。每股营业现金流量越大，获现风险越小。<br/>3）全部资产现金回收率：说明企业资产产生现金的能力。全部资产现金回收率越大，获现风险越小。<br/>4）获现风险综合指数：即对上述3个指标进行指标合并，所获得的综合指标，获现风险综合指数越大，该公司遭受获现风险的可能性越小。"
+
+
     }
   },
   mounted(){
+
   },
   methods:{
+    currentRow(option){
+      this.$router.push({ name: 'diffus', params: { 'name':this.currentRowId ,'type':option ,'date':this.formInline.quarter_year} });
+      this.$store.commit('selectMenu',{name:'diffus',label:'风险传导'})
+    },
+    handleRowContextMenu(row, column, event){
+      // 保存当前行的 ID
+      this.currentRowId = row.name;
+      console.log(this.currentRowId)
+      // // 获取右键菜单的位置
+      //
+      // this.contextMenuTop = event.clientX+'px'
+      // this.contextMenuLeft = event.clientY+'px'
+      // console.log(this.contextMenuTop)
+      // event.preventDefault(); // 阻止默认的右键菜单弹出
+      // // 显示右键菜单
+      // this.isContextMenuVisible = true;
+      //
+      //
+      // // 点击其他地方隐藏右键菜单
+      // document.addEventListener("click", this.hideContextMenu);
+
+    },
+
+
+
       // part2的提交
-      onSubmit() {
+      onSubmit(market) {
     console.log("个体风险分析")
     http.get(
             "/risk/risk_individual/",
             {params:{
                 industry: this.formInline.industry,//行业
-                market: this.formInline.market,//省or市场
+                market: market,//省or市场
                 date:this.formInline.quarter_year,
     }}).then(response => {
         this.tableData= response.data.data
         console.log(response)
         console.log(response.data)
-
-      })
+      }).catch((error)=>{
+      this.$message.warning('暂无数据，请重新选择')
+    })
   },
   },
 }
 </script>
 
 <style lang='less' scoped>
+
+//.context-menu {
+//  position: absolute;
+//  background-color: #fff;
+//  border: 1px solid #ccc;
+//  padding: 5px;
+//}
+
  .form{//产品搜索栏
     
     display:flex;
@@ -325,7 +817,7 @@ export default {
     margin-top:10px; 
     // height: 40px;
     padding-left: 20px;
-  
+
    }
    .grayish_btn{//浅灰色按钮
     color: #fff;//文字颜色
@@ -333,22 +825,39 @@ export default {
   }
 
    // 调整表头间隔、设置表头下方边框颜色
-   /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
-        border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
-        padding: 8px 0 !important;//这个页面表头大，可以调整一下间距
-        min-width: 0 !important;
-      }
-      .el-table .el-table__cell {
-        padding: 12px 0; 
-        min-width: 0;
-      }
-      /deep/ .active_header{//表头
-        color: #110101;
-        text-align: center !important;
-        // height: 1px;
-      }
-      /deep/ .content_center{//表的内容
-        text-align: center !important;
-      }
+   .table{
+  // 和选项框隔开
+  // margin:10px;
+  font-size: 12px;
+  padding: 0px 5px 2px 5px;//返回表格添加间隙 上 右
+
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 1px 1px 1px;
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0;
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #110101;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+}
 
 </style>
diff --git a/src/views/事件分析.vue b/src/views/事件分析.vue
index 36a7df2..5fd0f95 100644
--- a/src/views/事件分析.vue
+++ b/src/views/事件分析.vue
@@ -1,27 +1,19 @@
 <!-- 11.6合并版 -->
 <template>
   <div>
-  
-    <div class="one">
-      <el-card style='height: 300px;' :body-style={padding:0}> 
-       <!-- height:400px -->
-       <!-- 1、上标 -->
-        <span class="superscript" style="width: 20px; height: 40px;">事件分析</span>
-        <!-- 2、产品搜索栏 -->
-
-        <div class="form">
+    <div class="form">
                                                         <!-- inline="true"表单域在一行 -->
           <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
             <el-form-item label="公司名称">
-<!--              <el-input  v-model="formInline1.company" placeholder="公司名称：" size="mini"></el-input>-->
+              <el-input  v-model="formInline1.company" placeholder="全称或简称" size="mini"></el-input>
 <!--              搜索联想-->
-              <el-autocomplete
-                  class="inline-input"
-                  v-model="formInline1.company"
-                  :fetch-suggestions="querySearch"
-                  placeholder="公司名称"
-                  size="mini"
-              ></el-autocomplete>
+<!--              <el-autocomplete-->
+<!--                  class="inline-input"-->
+<!--                  v-model="formInline1.company"-->
+<!--                  :fetch-suggestions="querySearch"-->
+<!--                  placeholder="公司名称"-->
+<!--                  size="mini"-->
+<!--              ></el-autocomplete>-->
             </el-form-item>
 
             <el-form-item label="事件类型">
@@ -37,33 +29,36 @@
               <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+              <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
             </el-form-item>
           </el-form>
-        </div>
-  
-        
+    </div>
 
-        <!-- 3、返回数据（图表） -->
+    <div class="one">
+      <el-card class="card" style='height: 1000px;' :body-style={padding:0}> 
+       <!-- height:400px -->
+       <!-- 1、上标 -->
+        <span class="superscript" style="width: 20px; height: 40px;">事件分析</span>
+        <!-- 2、返回数据（图表） -->
         <div  class="content">
-          <el-table class='table' :data="tableData" :fit='true' :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
-              border  
-              height="300"
-              
+          <el-empty description="" v-if="noNews"></el-empty>
+          <el-table class='table' :data="tableData" :fit='true' :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+              border
+              height="900"
+                    style="width: 100%"
+              v-if="!noNews"
               :row-style="{height:'28px'}"
               :cell-style="{padding:'0px'}"
               header-row-class-name="active_header"
               header-cell-class-name="active_header"
               cell-class-name="content_center">
-              <!-- header-row-class-name 表头行 加classname -->
-              <!-- cell-class-name 单元格加名字 -->
-            <!-- border有边框 -->
-                <!-- stripe
-                height="90%"
-                :data="tableData"
-                style="width: 80%;  margin-top:10px; margin-bottom:10px;" -->
-                <el-table-column v-for='(val,key) in tableLabel' :prop="key" :label="val" show-overflow-tooltip /><!--插槽里面没有东西就可以用单标签  -->
-                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+
+                <el-table-column v-for="(val, key) in tableLabel" :prop="key"  :label="val"
+                                 :width="widthDict(key)"
+                                 v-show="tableData.length!==0" />
+
+                <!-- <el-table-column v-for='(val,key) in tableLabel' :prop="key" :label="val" :width=calculateColumnWidth(val) />插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- :min-width="calculateColumnWidth(key)"可以省略展示较多的文字内容 -->
 
                 <el-table-column
                     prop="scale"
@@ -84,24 +79,31 @@
             @open="open()"
             width="90%">
             <!-- 详情页part1 -->
-            <el-card :body-style={padding:0}>
+            <el-card class="card" :body-style={padding:0}>
                <!-- 1-上标 -->
               <span class="superscript" style="width: 20px; height: 40px;">事件详情</span>
                 <!-- 1-表 -->
-              <el-table class='table' :data="detailData_table1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+              <el-table class='detail_table1' :data="detailData_table1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
                 border
-                height="215"   
+                height="300px"
+                :default-expand-all="true"     
                 :row-style="{height:'28px'}"
                 :cell-style="{padding:'0px'}"
                 header-row-class-name="active_header"
                 header-cell-class-name="active_header"
                 cell-class-name="content_center">
                 
-                <el-table-column v-for='(val,key) in detailLabel_table' :prop="key" :label="val" show-overflow-tooltip /><!--插槽里面没有东西就可以用单标签  -->
+                <el-table-column v-for='(val,key) in detailLabel_table' :prop="key" :label="val" :min-width="calculateColumnWidth(key)" /><!--插槽里面没有东西就可以用单标签  -->
               </el-table>
+<!--              没显示正文-->
+              <div style="height: 100% ;margin: 20px;">
+                <h4 style="margin-bottom: 5px;">事件正文：</h4>
+                <span style="display:block;text-indent:2em;line-height: 25px; ">{{this.detail_content}}</span> <!-- 首行缩进 -->
+              </div>
             </el-card >
+
             <!-- 详情页part2 -->
-            <el-card :body-style={padding:0}>
+            <el-card class="card" :body-style={padding:0}>
                <!-- 2-上标 -->
               <span class="superscript" style="width: 20px; height: 40px;">事件热度分析</span>
                 <!-- 2-表单 -->
@@ -121,7 +123,7 @@
                     </el-form-item>
 
                     <el-form-item>
-                      <el-button type="primary" @click="detail_onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+                      <el-button class="grayish_btn" @click="detail_onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
                     </el-form-item>
                   </el-form>
               </div>
@@ -131,15 +133,15 @@
 
                 <div ref="echarts_3" style="height:300px;width:1000px; border: 1px solid #e0e0e0;margin:20px"></div>
               </div>
-              <span>
+              <!-- <span>
                 公司1xx事件一天时间内，在中国证券报的7时刻达到热度峰值，当前的热度状态为下降，预测未来一小时内的热度趋势为下降
-              </span>
+              </span> -->
 
              
             </el-card >
 
               <!-- 详情页part3 -->
-              <el-card :body-style={padding:0}>
+              <el-card class="card" :body-style={padding:0}>
                <!-- 3-上标 -->
               <span class="superscript" style="width: 20px; height: 40px;">其他关联事件</span>
                 <!-- 3-表单 -->
@@ -152,10 +154,10 @@
                       </el-select>
                     </el-form-item>
 
-                    <el-form-item label="事件相关：">
-                      <el-checkbox v-model="formInline3.related_event">本公司相关其他事件</el-checkbox>
-                      <!-- <el-radio v-model="radio" label="2">备选项</el-radio> -->
-                    </el-form-item>
+<!--                    <el-form-item label="事件相关：">-->
+<!--                      <el-checkbox v-model="formInline3.related_event">本公司相关其他事件</el-checkbox>-->
+<!--                      &lt;!&ndash; <el-radio v-model="radio" label="2">备选项</el-radio> &ndash;&gt;-->
+<!--                    </el-form-item>-->
 
                     <el-form-item label="选择时间：">
                       <el-select v-model="formInline3.detail_time" placeholder="选择时间：" size="mini">
@@ -164,27 +166,27 @@
                     </el-form-item>
 
                     <el-form-item>
-                      <el-button type="primary" @click="detail_onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
+                      <el-button class="grayish_btn" @click="detail_onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
                     </el-form-item>
                   </el-form>
               </div>
               
               <!-- 3-表 -->
-              <el-table class='table' :data="detailData_table2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+              <el-table class='detail_table2' :data="detailData_table2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
                 border
-                height="215"   
+                height="600"   
                 :row-style="{height:'28px'}"
                 :cell-style="{padding:'0px'}"
                 header-row-class-name="active_header"
                 header-cell-class-name="active_header"
                 cell-class-name="content_center">
                 
-                <el-table-column v-for='(val,key) in detailLabel_table' :prop="key" :label="val" show-overflow-tooltip /><!--插槽里面没有东西就可以用单标签  -->
+                <el-table-column v-for='(val,key) in detailLabel_table' :prop="key" :label="val" :min-width="calculateColumnWidth(key)" /><!--插槽里面没有东西就可以用单标签  -->
               </el-table>
             </el-card >
 
               <!-- 详情页part4 -->
-              <el-card :body-style={padding:0}>
+              <el-card class="card" :body-style={padding:0}>
                <!-- 4-上标 -->
               <span class="superscript" style="width: 20px; height: 40px;">总体情感分析</span>
                 <!-- 2-表单 -->
@@ -204,15 +206,14 @@
                     </el-form-item>
 
                     <el-form-item>
-                      <el-button type="primary" @click="detail_onSubmit3" icon="el-icon-search" size="mini">查询</el-button>
+                      <el-button class="grayish_btn" @click="detail_onSubmit3" icon="el-icon-search" size="mini">查询</el-button>
                     </el-form-item>
                   </el-form>
               </div>
               <!-- 2-图 -->
               <div class="flex-charts">
-                <div ref="echarts_4" style="height:300px;width:1000px; border: 1px solid #e0e0e0;margin:20px"></div>
+                <div ref="echarts_4" style="height:300px;width:2000px; border: 1px solid #e0e0e0;margin:20px"></div>
 
-                <div ref="echarts_5" style="height:300px;width:1000px; border: 1px solid #e0e0e0;margin:20px"></div>
               </div>
 
 
@@ -224,19 +225,6 @@
         </el-dialog>
       </div>  <!-- 详情页结束 -->
     </div> <!-- 上一个板块结束 -->
-
-    <!-- 关系图/知识图谱：笛卡尔坐标系上的 Graph -->
-    <div class="two">
-      <el-card :body-style={padding:0} style='height: 510px;'>
-         <!-- 1、上标 -->
-         <span class="superscript" style="width: 20px; height: 40px;">事件图谱</span>
-         <div>
-          <div ref="echarts_1" style="height: 500px"></div>
-         </div>
-        <!-- 2、产品搜索栏 -->
-      </el-card>
-    </div>
-
   </div>
 
 
@@ -251,7 +239,9 @@ import qs from 'qs'
 import * as echarts from "echarts"
 // import pagination from '@/components/pagination.vue'
 import http from '../utils/request'
+import {Loading} from "element-ui";
 export default {
+  name:"event_analysis",
   components:{
 
   },
@@ -281,24 +271,53 @@ export default {
         formInline4: {
           detail_company:'',
           detail_time:'',
-        
         },
 
 
 // 【选择框】
-      options: [{
-        value: '增持事件',
-        label: '增持事件'
+      options: [
+        {
+          value: '',
+          label: '全部'
+        },
+          {
+        value: '股权增持',
+        label: '股权增持'
       }, {
-        value: '减持事件',
-        label: '减持事件'
+        value: '股东减持',
+        label: '股东减持'
       }, {
         value: '股权质押',
         label: '股权质押'
       }, {
         value: '其他',
         label: '其他'
-      }
+      },
+    {
+      value: '重大财产损失',
+          label: '重大财产损失'
+    },
+        {
+          value: '重大安全事故',
+          label: '重大安全事故'
+        },
+        {
+          value: '股权冻结',
+          label: '股权冻结'
+        },
+        {
+          value: '高层死亡',
+          label: '高层死亡'
+        },
+        {
+          value: '破产清算',
+          label: '破产清算'
+        },
+        {
+          value: '重大对外赔付',
+          label: '重大对外赔付'
+        },
+
     ],//issue_type只有  增持事件 减持事件 股权质押  
     
       option_detail_company: [{
@@ -381,117 +400,35 @@ export default {
   
       tableData: [
         { order: 1,
-          type: '其他',
+          type: '',
           objects: [
-            "中国银行股份有限公司",
-            "中国工商银行股份有限公司",
-            "中国人民银行",
-            "招商银行股份有限公司",
-            "中国农业银行股份有限公司",
-            "中国邮政储蓄银行股份有限公司"
           ],
-          title: '利率真要降了！买房人不眠：开始焦虑排不上队，“恨不得明天就是9月25号”',
-          abstract:'8月31日晚间，开源证券银行首席分析师刘呈祥在接受时代财经采访时表示，存量房贷利率下降会使得银行利息收入减少，进而对银行净息差和盈利能力形成负面影响，但预计对银行盈利能力的影响有限“在当下银行‘优质资产荒’的背景下，按揭贷款仍是竞争高地，适当降低利率以留住优质资产总比客户流失要好”，刘呈祥向时代财经分析称，“对于银行来说，协调好存量和增量房贷利率之间的利差，可有效缓解居民按揭提前还贷问题调整方式上，既可以变更合同约定的住房贷款利率加点幅度，也可以由银行新发放贷款置换存量贷款',
-          keyword:'利率买房',
-          publish_time:'发布时间',
-          event_heat:'事件热度',
-          risk_grade:'风险等级',}
+          title: '',
+          abstract:'',
+          keyword:'',
+          publish_time:'',
+          event_heat:'',
+          risk_grade:'',}
       ],
+      noNews:true,
+
 
-// 【知识图谱】
-      old_data:[
-           {事件标题:"XX股东XX时间增持XX股票事件",
-            情感倾向:"中性",
-            事件热度:"45",
-            时间:"2022/1/4",},
-             { 事件标题: "XX股东XX时间增持XX股票事件",
-            情感倾向:"积极",
-            事件热度:"30",
-            时间:"2022/1/4",},
-             { 事件标题: "XX股东XX时间增持XX股票事件",
-            情感倾向:"消极",
-            事件热度:"45",
-            时间:"2022/1/4",},
-             { 事件标题: "XX股东XX时间增持XX股票事件",
-            情感倾向:"消极",
-            事件热度:"30",
-            时间:"2022/1/4",},
-             { 事件标题: "XX股东XX时间增持XX股票事件",
-            情感倾向:"中性",
-            事件热度:"30",
-            时间:"2022/1/4",},
-             { 事件标题: "XX股东XX时间增持XX股票事件",
-            情感倾向:"积极",
-            事件热度:"30",
-            时间:"2022/3/8",},
-             { 事件标题: "XX股东XX时间增持XX股票事件",
-            情感倾向:"中性",
-            事件热度:"45",
-            时间:"2022/3/10",},
-             { 事件标题: "XX股东XX时间增持XX股票事件",
-            情感倾向:"消极",
-            事件热度:"45",
-            时间:"2022/3/10",},
-             { 事件标题: 8,
-            情感倾向:"中性",
-            事件热度:"30",
-            时间:"2022/3/10",},
-             { 事件标题: 9,
-            情感倾向:"消极",
-            事件热度:"30",
-            时间:"2022/3/14",},
-             { 事件标题: 10,
-            情感倾向:"中性",
-            事件热度:"45",
-            时间:"2022/3/14",},
-             { 事件标题:11,
-            情感倾向:"积极",
-            事件热度:"45",
-            时间:"2022/3/18",},
-             { 事件标题: 12,
-            情感倾向:"中性",
-            事件热度:"45",
-            时间:"2022/3/18",},
-             { 事件标题: 13,
-            情感倾向:"积极",
-            事件热度:"45",
-            时间:"2022/3/18",},
-             { 事件标题: 14,
-            情感倾向:"中性",
-            事件热度:"45",
-            时间:"2022/3/18",},
-             { 事件标题: 15,
-            情感倾向:"消极",
-            事件热度:"45",
-            时间:"2022/3/30",},
-             { 事件标题: 16,
-            情感倾向:"中性",
-            事件热度:"45",
-            时间:"2022/3/26",},
-             { 事件标题: 17,
-            情感倾向:"消极",
-            事件热度:"30",
-            时间:"2022/3/26",},
-             { 事件标题: 18,
-            情感倾向:"中性",
-            事件热度:"45",
-            时间:"2022/3/26",},],
 
 // 【详情页】
     detailsdialog: false,// 详情页是否打开的判断标签
-    // 表格(待改)
+    // 表格
       detailLabel_table: {
           objects: '涉及对象',
           title: '事件标题',
           abstract:'事件摘要',
           keyword:'事件关键词',
-          content:'事件正文',
+          // content:'事件正文',
           site_name:'发布渠道',
-          sentiment:'情感倾向',
+          // sentiment:'情感倾向',
           url:'报导链接',
           publish_time:'发布时间',
           potiential_risks:'潜在风险',
-          risk_grade:'风险等级',
+          // risk_grade:'风险等级',
 
       },
 
@@ -528,209 +465,69 @@ export default {
   }
 }, 
     mounted(){
-          
-
-          //关系图
-          //基于准备好的dom，初始化echarts实例
-          // var ROOT_PATH = 'https://echarts.apache.org/examples';
-          console.log(this.old_data.情感倾向)
-          const echarts1 = echarts.init(this.$refs.echarts_1)
-          var legends = ['消极', '中性', '积极'];
-          var colors=[ "#D9001B","#009DD9","#90F204"]
-          const markLineList=[] //垂直线
-          const timeList=[]//存不重复的时间
-          const nor_time=[]//存所有的时间
-          const nodeid=[]
-          const new_data=[]
-
-
-
-          var count=0
-          for(var {时间: time} of this.old_data){
-              nor_time.push(time)
-          // 返回值等于-1 说明数组timeList中不存在time,则存入
-              if(timeList.indexOf(time)==-1 ){
-                timeList.push(time)
-                nodeid.push(count)
-                markLineList.push({xAxis: count})
-                count=count+1
-              }
-              
-          }
-
-          timeList.sort(function (a, b) {
-            return a - b; //a - b < 0: 代表后一个比前一个大，就是升序
-          })
-
-          const x_y=[]
-          // console.log(timeList.length)
-          for (var i = 0; i < timeList.length; i++) {
-
-            var x=i
-            var y=1//初始为1让坐标轴暴露更明显
-            for (var item of nor_time){
-              if(item===timeList[i] ){
-                y+=1
-                x_y.push([x,y])
-            }
-          }
-
+    // if ( JSON.stringify(sessionStorage.getItem('eventData')) !== "{}")
+    //   this.tableData=JSON.parse(sessionStorage.getItem('eventData'))
+    //
+    //   let target=JSON.parse(sessionStorage.getItem('target'))
+    //   if (target.length!==0) {
+    //     // console.log(1)
+    //     console.log(target)
+    //     this.formInline1.company = target[0]
+    //     this.formInline1.event_type = target[1]
+    //     this.formInline1.start_date = target[2]
+    //     this.formInline1.end_date = target[3]
+    //   }
 
           
-          // console.log(x_y)
-          }
-
-          for (var i = 0; i < this.old_data.length; i++) {
-              var index=legends.indexOf(this.old_data[i].情感倾向)
-              
-              new_data.push({
-                  id:i,
-                  name:this.old_data[i].事件标题,
-
-                  label: { 
-                    normal: {
-                        show: true,
-                        position: "bottom",
-                        textStyle: {
-                          fontSize: 13
-                        },},
-
-                    data:legends[index],
-                    color: "rgb(0, 0, 0)",
-
-                  },
-                  // color: colors[index],
-                  symbolSize:this.old_data[i].事件热度,
-                  // symbolSize:20,
-                  value: x_y[i],
-                  itemStyle: {
-                      borderColor: '#fff',
-                      borderWidth: 2,
-                      shadowBlur: 2,
-                      shadowColor: '#999999',
-                      color: colors[index],
-                      
-                  }
-        
-          })}
-
-
-          console.log(new_data)
-          const option = {
-            // 右上角存图
-              toolbox: {
-                feature: {
-                  saveAsImage: {}
-                }
-              },
-              // title: {
-              //     text: '笛卡尔坐标系上的 Graph'
-              // },
-              xAxis:[ {
-                  // type : 'category',
-                  // boundaryGap : false,
-                  data : timeList
-
-                  
-              }
-              
-              ],
-              yAxis: {
-                
-                  show:false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
-                  // type : 'category',//注释后，数轴0开始，不然点会遮住坐标轴
-                  // boundaryGap : false,//位于点还是位于区域
-                  // data: ['a','b','c','d']
-              },               
-              
-              legend: {
-                data: ['消极', '中性', '积极'],  //图例的数据
-                top: "15%",   //图例的位置
-                icon:"circle",  //图例的形状
-                x: 'right',        //图例在右侧
-                orient: 'vertical',  //图例纵向排布   horizontal为横向排布
-                textStyle: {         //图例字体的颜色
-                    color: "#ffffff"
-                }},
-
-
-              // legend: {
-              //       normal: {
-              //         data: ['消极', '中性', '积极'],
-              //         show: true,}
-              //     },
-
-
-              series: [
-                {
-                  
-
-                  type: 'graph',
-                  // layout: 'none',
-                  coordinateSystem: 'cartesian2d',        
-                  
-
-                  // 垂直线
-                  markLine: {
-                      symbol: ['none', 'none'],
-                      label: { show: false },
-                      data: markLineList,
-                      lineStyle: {//标注线样式
-                        
-                          type: 'dashed',//虚线
-                          color: '#999999',//标注线颜色
-
-                    },
-                  },
-                  
-
-
-                  // 边两段的类型和大小
-                  edgeSymbol: ['circle', 'circle'],
-                  edgeSymbolSize: [4,4],
-                  // 
-                  data:new_data,
-
-                  //显示节点备注
-                  itemStyle : { 
-                    normal: {label : {show: true}},
-                    textStyle: {
-                    color: '#000'
-                  }
-      
-                    },
-                  
-                  
-                //  边
-                  links: [
-                      {source: 0, target: 5},
-                      {source: 5, target: 6},
-                      {source: 1, target: 7},
-                      {source: 2, target: 8},
-                      {source: 3, target: 13},
-                      {source: 8, target: 9},
-                      ],
-                  lineStyle: {//关系线样式
-
-                      type: 'solid',//实线
-                      color: "rgb(0, 0, 0,80%)",//标注线颜色
-                      width: "2",
-                  },
-                 
-                
-                }]
-          }
-          echarts1.setOption(option)
- 
-         
     },
 
     
 
   methods:{
+    // 调整表格列宽
+    calculateColumnWidth(prop) {
+      console.log(prop)
+      const text = String(this.tableData[0][prop]); // 使用第一行的数据作为示例
+      const calculatedWidth = text.length;
+      console.log(calculatedWidth)
+      // console.log('console.log(calculatedWidth):',calculatedWidth)
+      if(calculatedWidth>10 && calculatedWidth<=50){
+        const baseWidth= 20 + calculatedWidth * 0.9
+        return `${baseWidth}px`;
+      }
+      if(calculatedWidth<=10){
+        const baseWidth= 20
+        return `${baseWidth}px`;
+      }
+      else{
+        const baseWidth= 20 + calculatedWidth * 0.5
+        return `${baseWidth}px`;
+      }
+    },
+
+    widthDict(key){
+      let dic={'title':200,
+              'type':80,
+        'objects': 150,
+
+        'abstract':800,
+        'keyword':100,
+        // content:'事件正文',
+        // site_name:'发布渠道',
+        // sentiment:'情感倾向',
+        // url:'报导链接',
+        publish_time:'发布时间',
+        potiential_risks:'潜在风险',
+
+
+      }
+return `${dic[key]}px`;
+
+    },
+  
     //新闻联想搜索
     querySearch(queryString, cb) {
-      console.log(queryString)
+      // console.log(queryString)
       // console.log(cb)
       http.get(
           "/search/search_news/?name=?"+queryString,
@@ -749,7 +546,10 @@ export default {
       })},
     // 1、表
     onSubmit1(){//事件分析
-        console.log('事件分析表格')
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
         http.get(
                 "/event2/event_analyse/",
                 {params:{
@@ -757,28 +557,52 @@ export default {
                     event_type:this.formInline1.event_type,
                     start:this.formInline1.start_date,
                     end:this.formInline1.end_date,
+                    need:0
         }}).then(response => {
-            this.tableData = response.data.data
+          if(response.data.data.length!==0)
+          { this.tableData = response.data.data
+              this.noNews=false}
+          else {
+            this.tableData= [
+              { order: 1,
+                type: '',
+                objects: [
 
-          })
+                ],
+                title: '',
+                abstract:'',
+                keyword:'',
+                publish_time:'',
+                event_heat:'',
+                risk_grade:'',}
+            ]
+          this.noNews=true}
+          // sessionStorage.removeItem('eventData')
+          // sessionStorage.setItem('eventData',JSON.stringify(this.tableData))
+          // sessionStorage.removeItem('target')
+          // sessionStorage.setItem('target',JSON.stringify([this.formInline1.company,this.formInline1.event_type,this.formInline1.start_date,this.formInline1.end_date]))
+          // console.log(this.tableData)
+          //关系图
+          //基于准备好的dom，初始化echarts实例
+          // var ROOT_PATH = 'https://echarts.apache.org/examples';
+         
+      loadingInstance.close()
+          }).finally(()=>loadingInstance.close())
        },
-      // 2、图谱
-    onSubmit2(){//事件图谱 待完成
-        console.log('事件图谱')
-    },
+
 
 // 3、查看详情-card1（表）表格点击查看详情
     detail(row){
       let tmp=[]
       this.option_detail_company.length=0
-      console.log(row.order)//返回银行id
+      // console.log(row.order)//返回银行id
       this.targetId=row.order
       for (let i in this.tableData)
         if (this.targetId===this.tableData[i].order)
           tmp=this.tableData[i].objects
       for (let i in tmp)
       this.option_detail_company.push({value:tmp[i],label:tmp[i]})
-      console.log(this.option_detail_company)
+      // console.log(this.option_detail_company)
       //这个地方需要连一个新接口
       //提供弹窗的数据
       this.detailsdialog = true//打开弹窗
@@ -789,10 +613,77 @@ export default {
 
         }}).then(response => {
             this.detailData_table1 = Array(response.data.data[this.targetId])
-            this.detail_content=response.data.data.content
-            // console.log(response)
+            this.detail_content=response.data.data[this.targetId].content[0]
+            console.log(response.data.data)
             // console.log(response.data)
+        http.get(
+            "/event2/event_clout_analyse/",//修改接口名称
+            {params:{
+                company: this.formInline1.company,
+                // delta:this.formInline2.detail_time,
+                event_id:this.targetId
+              }}).then(response => {
+          this.clout = response.data.data
+          // console.log(this.clout)
+          // 详情页的，面积图
+          const echarts2 = echarts.init(this.$refs.echarts_2)
+          const option_2={
+            // 右上角存图
+            toolbox: {
+              feature: {
+                saveAsImage: {}
+              }
+            },
+            title: {
+              text: '事件热度分析'
+            },
+            tooltip: {
+              trigger: 'axis',
+              axisPointer: {
+                type: 'cross',
+                label: {
+                  backgroundColor: '#6a7985'
+                }
+              }
+            },
+            // legend: {
+            //   data: ['渠道1', '渠道2', '渠道3']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: [
+              {
+                type: 'category',
+                boundaryGap: false,
+                data: this.clout.date,
+                name: '日'
+              }
+            ],
+            yAxis: [
+              {
+                type: 'value'
+              }
+            ],
+            series: [
+              {
+                name: '渠道1',
+                type: 'line',
+                stack: 'Total',
+                areaStyle: {},
+                emphasis: {
+                  focus: 'series'
+                },
+                data: this.clout.value
+              }
 
+            ]
+          }
+          echarts2.setOption(option_2)
+        })
           })
 
       
@@ -800,67 +691,157 @@ export default {
 
 // 4、5-查看详情-card2（面积图、环形图）（缺）
     detail_onSubmit1(){//详情页表单查询-事件热度分析(待修改)
-        console.log('点击查询，返回两个(1个)接口-(4/5)')
-        // 4、查看详情-card2（面积图）（缺）
-        http.get(
-                "/event2/event_clout_analyse/",//修改接口名称
-                {params:{
-                    company: this.formInline2.detail_company,//修改参数名称
-                    // delta:this.formInline2.detail_time,
-                    event_id:this.targetId
-        }}).then(response => {
-            this.clout = response.data.data
-            console.log(this.clout)
           // })
+      if (this.sentiment.length!==0)
+        this.sentiment.length=0
         //5、查看详情-card2（环形图）
         http.get(
                 "/event2/sentiment_analyse/",
                 {params:{//修改接口
                     delta: this.formInline2.detail_time,//选择时间：间隔时间
                     other_name:this.formInline2.detail_company,//关联公司名
+                    detail:0
         }}).then(response => {
-            for(let i in  response.data.data.value)//待修改
-              this.sentiment.push({name:i,value:response.data.data.value[i]})
-            console.log(this.sentiment)
+          if (JSON.stringify(response.data.data)==='{}')
+            alert('暂无数据')
+          else
+            // console.log(Array(response.data.data))
+            for(let i in response.data.data)
+            { if (i==='FAVOR')
+              this.sentiment.push({name:'赞成',value:response.data.data[i]})
+              if (i==='NONE')
+            this.sentiment.push({name:'中立',value:response.data.data[i]})
+              if (i==='AGAINST')
+            this.sentiment.push({name:'反对',value:response.data.data[i]})}
+            // console.log(this.sentiment)
             this.initEcharts1()
           })
-       }
-       )},
+       },
+
 
 
  
 // 6、查看详情-card3（表）
        detail_onSubmit2(){//详情页表单查询-其他关联事件
-        console.log('其他关联事件-表格')
+        // console.log('其他关联事件-表格')
         http.get(
-                "/event/other/",
+                "/event2/other_events/",
                 {params:{
-                    delta_time: this.formInline.detail_company,
-                    id:this.formInline.detail_time,
-                    name:this.formInline.related_event,
-
+                    delta: this.formInline3.detail_time,
+                    event_id:this.targetId,
+                    other_name:this.formInline3.detail_company,
         }}).then(response => {
-            this.tableData = response.data
-            console.log(response)
-            console.log(response.data)
-
+            // console.log(response.data)
+          if (response.data.data.length===0)
+            alert('暂无数据')
+          else
+            this.detailData_table2=response.data.data
           })
        },
 // 7、8 查看详情-card4（曲线图、环形图）
        detail_onSubmit3(){//详情页表单查询-总体情感分析(待修改)
         console.log('总体情感分析-曲线图')
-        // http.get(
-        //         "/",
-        //         {params:{
-        //             com_name: this.formInline.detail_company,
-        //             issue_type:this.formInline.detail_time,
+        http.get(
+            "/event2/sentiment_analyse/",
+                {params:{
+                    other_name: this.formInline4.detail_company,
+                    delta:this.formInline4.detail_time,
+                    detail:1
+        }}).then(response => {
+          if (response.data.data.time.length === 0)
+            alert('暂无数据')
+          else {
+            let time = response.data.data.time
+            let favor = response.data.data.favor
+            let none = response.data.data.none
+            let against = response.data.data.against
+            const echarts4 = echarts.init(this.$refs.echarts_4)
+            const option_4 =
 
-        // }}).then(response => {
-        //     this.tableData = response.data
-        //     console.log(response)
-        //     console.log(response.data)
+                {
+                  title: {
+                    text: '总体情感趋势',
+                    x: 'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
 
-        //   })
+                  },
+                  // tooltip: {
+                  //   trigger: 'axis'
+                  // },
+                  legend: {
+                    data: [
+                      {name: '积极', itemStyle: {opacity: 0}},
+                      {name: '中性', itemStyle: {opacity: 0}},
+                      {name: '消极', itemStyle: {opacity: 0}}
+                    ],
+
+                    x: 'right',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    y: "top",
+                    padding: 40,
+                  },
+                  grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true//用来防止数值过大而超出视图
+                  },
+                  toolbox: {
+                    feature: {
+                      saveAsImage: {}
+                    }
+                  },
+                  xAxis: {
+                    data: time,
+                    axisLabel: {//横坐标倾斜
+                      interval: 0,
+                      rotate: 40
+                    }
+                  },
+                  yAxis: {
+                    type: 'value',
+
+
+                  },
+                  series: [
+                    {
+                      name: '积极',
+                      type: 'line',
+                      data: favor,
+                      showSymbol: false,//每个点不用圆圈突出显示
+                      smooth: true,//平滑折线图
+                      // 折线样式
+                      lineStyle: {
+                        color: '#6ac96e'//红色
+                      },
+                    },
+                    {
+                      name: '中性',
+                      type: 'line',
+                      data: none,
+                      showSymbol: false,//每个点不用圆圈突出显示
+                      smooth: true,//平滑折线图
+                      // 折线样式
+                      lineStyle: {
+                        color: '#ffe96c'//蓝色'
+                      },
+                    },
+                    {
+                      name: '消极',
+                      type: 'line',
+                      data: against,
+                      showSymbol: false,//每个点不用圆圈突出显示
+                      smooth: true,//平滑折线图
+                      // 折线样式
+                      lineStyle: {
+                        color: '#f6572e'//蓝色'
+                      },
+                    },
+
+                  ]
+                }
+            echarts4.setOption(option_4)
+          }
+        }
+        )
         console.log('总体情感分析-环形图')
         // http.get(
         //         "/",
@@ -881,112 +862,6 @@ export default {
 
 
        initEcharts1() {
-       // 详情页的，面积图
-          const echarts2 = echarts.init(this.$refs.echarts_2)
-          const option_2={
-            // 右上角存图
-            toolbox: {
-              feature: {
-                saveAsImage: {}
-              }
-            },
-              title: {
-                text: '事件热度分析'
-              },
-              tooltip: {
-                trigger: 'axis',
-                axisPointer: {
-                  type: 'cross',
-                  label: {
-                    backgroundColor: '#6a7985'
-                  }
-                }
-              },
-              legend: {
-                data: ['渠道1', '渠道2', '渠道3']
-              },
-              toolbox: {
-                feature: {
-                  saveAsImage: {}
-                }
-              },
-              grid: {
-                left: '3%',
-                right: '4%',
-                bottom: '3%',
-                containLabel: true
-              },
-              xAxis: [
-                {
-                  type: 'category',
-                  boundaryGap: false,
-                  data: ['0', '1', '2', '3', '4', '5', '6'],
-                  name: '天'
-                }
-              ],
-              yAxis: [
-                {
-                  type: 'value'
-                }
-              ],
-              series: [
-                {
-                  name: '渠道1',
-                  type: 'line',
-                  stack: 'Total',
-                  areaStyle: {},
-                  emphasis: {
-                    focus: 'series'
-                  },
-                  data: [120, 132, 101, 134, 90, 230, 210]
-                },
-                {
-                  name: '渠道2',
-                  type: 'line',
-                  stack: 'Total',
-                  areaStyle: {},
-                  emphasis: {
-                    focus: 'series'
-                  },
-                  data: [220, 182, 191, 234, 290, 330, 310]
-                },
-                {
-                  name: '渠道3',
-                  type: 'line',
-                  stack: 'Total',
-                  areaStyle: {},
-                  emphasis: {
-                    focus: 'series'
-                  },
-                  data: [150, 232, 201, 154, 190, 330, 410]
-                },
-                {
-                  name: 'Direct',
-                  type: 'line',
-                  stack: 'Total',
-                  areaStyle: {},
-                  emphasis: {
-                    focus: 'series'
-                  },
-                  data: [320, 332, 301, 334, 390, 330, 320]
-                },
-                {
-                  name: 'Search Engine',
-                  type: 'line',
-                  stack: 'Total',
-                  label: {
-                    show: true,
-                    position: 'top'
-                  },
-                  areaStyle: {},
-                  emphasis: {
-                    focus: 'series'
-                  },
-                  data: [820, 932, 901, 934, 1290, 1330, 1200]
-                }
-              ]
-            }
-          echarts2.setOption(option_2)
 
           // 详情页的环形图
           const echarts3 = echarts.init(this.$refs.echarts_3)
@@ -1037,135 +912,12 @@ export default {
 
       },
       
-      initEcharts2() {
-       // 详情页的线形图
-          const echarts4 = echarts.init(this.$refs.echarts_4)
-          const option_4=
 
-          {
-      title: {
-        text: '2021-03-17总体情感趋势',
-        x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
-      
-      },
-      // tooltip: {
-      //   trigger: 'axis'
-      // },
-      legend: {
-          data:[
-            {name:'积极',itemStyle:{ opacity:0 }},
-            {name:'消极',itemStyle:{ opacity:0 }}
-            ],
-
-        x:'right',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
-        y:"top",
-        padding:40,
-      },
-      grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '3%',
-        containLabel: true//用来防止数值过大而超出视图
-      },
-      toolbox: {
-        feature: {
-          saveAsImage: {}
-        }
-      },
-      xAxis: {
-        data: [1,2,3,4,5,6,7,8],
-        axisLabel: {//横坐标倾斜
-          interval:0,
-          rotate:40}
-      },
-      yAxis: {
-        type: 'value',
-        
-
-      },
-      series: [
-        {
-          name: '积极',
-          type: 'line',
-          data: [120, 132, 101, 134, 90, 230, 210],
-          showSymbol: false,//每个点不用圆圈突出显示
-          smooth: true,//平滑折线图
-          // 折线样式
-          lineStyle: {
-            color: '#C24141'//红色
-          },
-        },
-        {
-          name: '消极',
-          type: 'line',
-          data: [220, 182, 191, 234, 290, 330, 310],
-          showSymbol: false,//每个点不用圆圈突出显示
-          smooth: true,//平滑折线图
-          // 折线样式
-          lineStyle: {
-            color: '#0e539a'//蓝色'
-          },
-        },
-        
-      ]
-    }
-          echarts4.setOption(option_4)
-
-          // 详情页的环形图
-          const echarts5 = echarts.init(this.$refs.echarts_5)
-          const option_5={
-            // 右上角存图
-            toolbox: {
-              feature: {
-                saveAsImage: {}
-              }
-            },
-            tooltip: {
-              // trigger: 'item'
-            },
-            legend: {
-              top: '5%',
-              left: 'center'
-            },
-            series: [
-              {
-                // name: 'Access From',
-                type: 'pie',
-                radius: ['40%', '70%'],
-                avoidLabelOverlap: false,
-                itemStyle: {
-                  borderRadius: 10,
-                  borderColor: '#fff',
-                  borderWidth: 2
-                },
-                label: {
-                  show: false,
-                  position: 'center'
-                },
-                emphasis: {
-                  label: {
-                    show: true,
-                    fontSize: 40,
-                    fontWeight: 'bold'
-                  }
-                },
-                labelLine: {
-                  show: false
-                },
-                data: this.circularData2
-              }
-            ]
-          }
-          echarts5.setOption(option_5)
-
-      },
-
-// 弹窗显示echarts
-       open(){
+      open(){
         this.$nextTick(() => {
         //  执行echarts方法
-        //   this.initEcharts1()
-          this.initEcharts2()
+          this.initEcharts1()
+          // this.initEcharts2()
         })
       },
 
@@ -1176,6 +928,28 @@ export default {
 
 <style lang="less" scoped>
 // 调整表头间隔、设置表头下方边框颜色
+.table{
+margin-top: 15px;
+margin-right: 0px;
+margin-left: 5px;
+padding: 0px;
+
+}
+.detail_table1{
+  margin-top: 15px;
+  margin-left: 10px;
+
+}
+.detail_table2{
+  margin-top: 0px;
+  margin-left: 10px;
+
+
+  
+}
+/deep/ .el-table {
+  width: 98.5% !important;
+}
 /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
       border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
       padding: 0px 0 !important;
@@ -1187,13 +961,13 @@ export default {
     }
     /deep/ .active_header{//表头
       color: #333333;
-      font-size: 9px;
+      font-size: 13px;
       text-align: center !important;
       // height: 1px;
     }
     /deep/ .content_center{//表的内容
       text-align: center !important;
-      font-size: 10px;
+      font-size: 13px;
     }
 
 
@@ -1203,11 +977,13 @@ export default {
     display:flex;
     justify-content:space-between;//左右贴边
     margin-top:5px; 
+    margin-bottom: 0px;
     // height: 40px;
     padding-left: 20px;
 
   }
   .content{
+    margin-top: 20px;
     padding: 0px 20px 2px 20px;//返回表格添加间隙 上 右
     font-size: 12px;
 
@@ -1217,16 +993,13 @@ export default {
   .text{
     color:rgba(2, 167, 240, 0.729411764705882);
   }
-
+.card{
+  margin-bottom: 10px;
+}
   }
-.two{
-  margin-top:10px; 
-}
-// 详情页
-.flex-charts{//并列图
-    // margin-top:20px; 
-    display:flex;
-    justify-content:space-between;
-    // padding:20px;
-}
+  .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+
 </style>
diff --git a/src/views/事件图谱.vue b/src/views/事件图谱.vue
index 8d35b6c..84fd819 100644
--- a/src/views/事件图谱.vue
+++ b/src/views/事件图谱.vue
@@ -1,25 +1,932 @@
 <!-- 事件分析-事件图谱 -->
+<!-- 11.6合并版 -->
 <template>
   <div>
-    事件分析-事件图谱
+    <!-- 关系图/知识图谱：笛卡尔坐标系上的 Graph -->
+    <div class="two">
+      
+      <div class="form">
+                                                        <!-- inline="true"表单域在一行 -->
+          <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+            <el-form-item label="公司名称">
+              <el-input  v-model="formInline1.company" placeholder="公司名称：" size="mini"></el-input>
+<!--              搜索联想-->
+<!--              <el-autocomplete-->
+<!--                  class="inline-input"-->
+<!--                  v-model="formInline1.company"-->
+<!--                  :fetch-suggestions="querySearch"-->
+<!--                  placeholder="公司名称"-->
+<!--                  size="mini"-->
+<!--              ></el-autocomplete>-->
+            </el-form-item>
+
+            <el-form-item label="事件类型">
+              <el-select   v-model="formInline1.event_type" placeholder="事件类型：" size="mini">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="开始时间">
+              <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="结束时间">
+              <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+            </el-form-item>
+<!--            <el-form-item>-->
+<!--              <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>-->
+<!--            </el-form-item>-->
+          </el-form>
+        </div>
+      <el-card :body-style={padding:0} style='height: 510px;'>
+         <!-- 1、上标 -->
+         <span class="superscript" style="width: 20px; height: 40px;">事件图谱</span>
+         <div>
+          <div ref="echarts_1" style="height: 500px"></div>
+         </div>
+        <!-- 2、产品搜索栏 -->
+      </el-card>
+    </div>
+    <el-dialog  :visible.sync="dialogVisible" width="100%" >
+      <!-- 详细信息 -->
+      <el-card style=" height:100%;margin-bottom:10px ; " :body-style={padding:0} >
+        <div style="display:flex;">
+          <el-divider direction="vertical" class="sublabel"></el-divider>
+          <span class='title'>事件详情</span>
+        </div>
+    <el-table :data="detailData"
+              style="width: 100%"
+              :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+              border
+              :row-style="{height:'28px'}"
+              :cell-style="{padding:'0px'}"
+              header-row-class-name="active_header"
+              header-cell-class-name="active_header"
+              cell-class-name="content_center"
+    >
+      <el-table-column
+          width="500"
+          prop="事件名称"
+          label="事件名称">
+      </el-table-column>
+      <el-table-column
+          width="300"
+          prop="法人代表"
+          label="法人代表">
+      </el-table-column>
+      <el-table-column
+          width="200"
+          prop="事件日期"
+          label="事件日期">
+      </el-table-column>
+      <el-table-column
+          width="50"
+          prop="分歧度"
+          label="分歧度">
+      </el-table-column>
+      <el-table-column
+          width="80"
+          prop="等级"
+          label="风险等级">
+      </el-table-column>
+    </el-table>
+
+      </el-card>
+    </el-dialog>
+
   </div>
+
+
+
+
+  
 </template>
 
-<script>
+<script >
+import qs from 'qs'
+// import { getData } from "../api";
+import * as echarts from "echarts"
+import http from '../utils/request'
+import {Loading} from "element-ui";
 export default {
+  name:'event_graph',
   components:{
+
   },
-  data () {
+  data() {
     return {
-    }
-  },
-  mounted(){
-  },
+      dialogVisible:false,
+      detailData:[],
+      tableData:[],
+// 【接收数据】
+      sentiment:[],
+      clout:[],
+      targetId:'',
+      formInline1: {
+          company: '',
+          event_type: '',
+          start_date:'',
+          end_date:'',
+        },
+        
+
+
+// 【选择框】
+      options:[
+        {
+          value: '',
+          label: '全部'
+        },
+          {
+        value: '股权增持',
+        label: '股权增持'
+      }, {
+        value: '股东减持',
+        label: '股东减持'
+      }, {
+        value: '股权质押',
+        label: '股权质押'
+      }, {
+        value: '其他',
+        label: '其他'
+      },
+        {
+          value: '重大财产损失',
+          label: '重大财产损失'
+        },
+        {
+          value: '重大安全事故',
+          label: '重大安全事故'
+        },
+        {
+          value: '股权冻结',
+          label: '股权冻结'
+        },
+        {
+          value: '高层死亡',
+          label: '高层死亡'
+        },
+        {
+          value: '破产清算',
+          label: '破产清算'
+        },
+        {
+          value: '重大对外赔付',
+          label: '重大对外赔付'
+        },
+
+      ]
+      ,
+    
+      option_detail_company: [{
+        value: '公司1',
+        label: '公司1'
+      }, {
+        value: '公司2',
+        label: '公司2'
+      }],
+      option_detail_time: [{
+        value: '一天内',
+        label: '一天内'
+      }, {
+        value: '近三天',
+        label: '近三天'
+      }
+      , {
+        value: '一周内',
+        label: '一周内'
+      }
+      , {
+        value: '一个月内',
+        label: '一个月内'
+      }
+      , {
+        value: '一年内',
+        label: '一年内'
+      }
+    ],
+      option_prediction: [
+      {
+          value: '一小时内',
+          label: '一小时内'
+        }, {
+          value: '三小时内',
+          label: '三小时内'
+        }
+        , {
+          value: '六小时内',
+          label: '六小时内'
+        }
+        , 
+        {
+          value: '一天内',
+          label: '一天内'
+        }, {
+          value: '近三天',
+          label: '近三天'
+        }
+        , {
+          value: '一周内',
+          label: '一周内'
+        }
+        , {
+          value: '一个月内',
+          label: '一个月内'
+        }
+        , {
+          value: '一年内',
+          label: '一年内'
+        }
+      ],
+
+
+
+
+
+// 【知识图谱】
+      old_data:[
+           {事件标题:"XX股东XX时间增持XX股票事件",
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/1/4",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"积极",
+            事件热度:"30",
+            时间:"2022/1/4",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"消极",
+            事件热度:"45",
+            时间:"2022/1/4",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"消极",
+            事件热度:"30",
+            时间:"2022/1/4",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"中性",
+            事件热度:"30",
+            时间:"2022/1/4",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"积极",
+            事件热度:"30",
+            时间:"2022/3/8",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/3/10",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"消极",
+            事件热度:"45",
+            时间:"2022/3/10",},
+             { 事件标题: 8,
+            情感倾向:"中性",
+            事件热度:"30",
+            时间:"2022/3/10",},
+             { 事件标题: 9,
+            情感倾向:"消极",
+            事件热度:"30",
+            时间:"2022/3/14",},
+             { 事件标题: 10,
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/3/14",},
+             { 事件标题:11,
+            情感倾向:"积极",
+            事件热度:"45",
+            时间:"2022/3/18",},
+             { 事件标题: 12,
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/3/18",},
+             { 事件标题: 13,
+            情感倾向:"积极",
+            事件热度:"45",
+            时间:"2022/3/18",},
+             { 事件标题: 14,
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/3/18",},
+             { 事件标题: 15,
+            情感倾向:"消极",
+            事件热度:"45",
+            时间:"2022/3/30",},
+             { 事件标题: 16,
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/3/26",},
+             { 事件标题: 17,
+            情感倾向:"消极",
+            事件热度:"30",
+            时间:"2022/3/26",},
+             { 事件标题: 18,
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/3/26",},],
+
+
+
+      // 图数据
+      // 查看详情-card2-事件热度分析
+      circularData1: [
+                  { value: 735, name: '积极' },
+                  { value: 735, name: '消极' }
+                  // { value: 580, name: 'Email' },
+                  // { value: 484, name: 'Union Ads' },
+                  // { value: 300, name: 'Video Ads' }
+        ],
+      circularData2: [
+                { value: 4445, name: '积极' },
+                { value: 735, name: '消极' }
+                // { value: 580, name: 'Email' },
+                // { value: 484, name: 'Union Ads' },
+                // { value: 300, name: 'Video Ads' }
+      ],
+
+
+  }
+},
+
+    mounted(){
+          //关系图
+          //基于准备好的dom，初始化echarts实例
+          // var ROOT_PATH = 'https://echarts.apache.org/examples';
+          // console.log(this.old_data.情感倾向)
+          const echarts1 = echarts.init(this.$refs.echarts_1)
+          var legends = ['消极', '中性', '积极'];
+          var colors=[ "#D9001B","#009DD9","#90F204"]
+          const markLineList=[] //垂直线
+          const timeList=[]//存不重复的时间
+          const nor_time=[]//存所有的时间
+          const nodeid=[]
+          const new_data=[]
+
+
+
+          var count=0
+          for(let {时间: time} of this.old_data){
+              nor_time.push(time)
+          // 返回值等于-1 说明数组timeList中不存在time,则存入
+              if(timeList.indexOf(time)==-1 ){
+                timeList.push(time)
+                nodeid.push(count)
+                markLineList.push({xAxis: count})
+                count=count+1
+              }
+
+          }
+
+          timeList.sort(function (a, b) {
+            return a - b; //a - b < 0: 代表后一个比前一个大，就是升序
+          })
+
+          const x_y=[]
+          // console.log(timeList.length)
+          for (var i = 0; i < timeList.length; i++) {
+
+            var x=i
+            var y=1//初始为1让坐标轴暴露更明显
+            for (var item of nor_time){
+              if(item===timeList[i] ){
+                y+=1
+                x_y.push([x,y])
+            }
+          }
+
+
+
+          // console.log(x_y)
+          }
+
+          for (var i = 0; i < this.old_data.length; i++) {
+              var index=legends.indexOf(this.old_data[i].情感倾向)
+
+              new_data.push({
+                  id:i,
+                  name:this.old_data[i].事件标题,
+          // label注释掉，tooltip才会正常显示
+          //         label: {
+          //
+          //               show: true,
+          //               position: "bottom",
+          //                 fontSize: 13,
+          //             width:2,
+          //             overflow:'break',
+          //           formatter:'{b}:',
+          //           // data:legends[index],
+          //           // color: "rgb(0, 0, 0)",
+          //         },
+                  // color: colors[index],
+                  symbolSize:this.old_data[i].事件热度,
+                  // symbolSize:20,
+                  value: x_y[i],
+                  itemStyle: {
+                      borderColor: '#fff',
+                      borderWidth: 2,
+                      shadowBlur: 2,
+                      shadowColor: '#999999',
+                      color: colors[index],
+                  },
+                tooltip:{show:true,
+                  trigger:'axis',
+                  triggeron:'mousemove',
+                  formatter:'event'
+                },
+
+          })}
+
+
+          // console.log(new_data)
+          const option = {
+            // 右上角存图
+              toolbox: {
+                feature: {
+                  saveAsImage: {}
+                }
+              },
+              // title: {
+              //     text: '笛卡尔坐标系上的 Graph'
+              // },
+              xAxis:[ {
+                  // type : 'category',
+                  // boundaryGap : false,
+                  data : timeList
+              }
+              ],
+              yAxis: {
+                  show:false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+                  // type : 'category',//注释后，数轴0开始，不然点会遮住坐标轴
+                  // boundaryGap : false,//位于点还是位于区域
+                  // data: ['a','b','c','d']
+              },
+              legend: {
+                data: ['消极', '中性', '积极'],  //图例的数据
+                top: "15%",   //图例的位置
+                icon:"circle",  //图例的形状
+                x: 'right',        //图例在右侧
+                orient: 'vertical',  //图例纵向排布   horizontal为横向排布
+                textStyle: {         //图例字体的颜色
+                    color: "#ffffff"
+                }},
+              series: [
+                {
+                  type: 'graph',
+                  // layout: 'none',
+                  coordinateSystem: 'cartesian2d',
+
+                  // 垂直线
+                  markLine: {
+                      symbol: ['none', 'none'],
+                      label: { show: false },
+                      data: markLineList,
+                      lineStyle: {//标注线样式
+                          type: 'dashed',//虚线
+                          color: '#999999',//标注线颜色
+                    },
+                  },
+                  // label: {
+                  //
+                  //   show: true,
+                  //   position: "bottom",
+                  //   fontSize: 13,
+                  //   width:5,
+                  //   overflow:'truncate',
+                  //   formatter:'{b}:',
+                  //   // data:legends[index],
+                  //   // color: "rgb(0, 0, 0)",
+                  // },
+                  // 边两段的类型和大小
+                  edgeSymbol: ['circle', 'circle'],
+                  edgeSymbolSize: [4,4],
+                  //
+                  data:new_data,
+                  //显示节点备注
+                  // itemStyle : {
+                  //   normal: {label : {show: true}},
+                  //   textStyle: {
+                  //   color: '#000'
+                  // }
+                  //   },
+                //  边
+                  links: [
+                      {source: 0, target: 5},
+                      {source: 5, target: 6},
+                      {source: 1, target: 7},
+                      {source: 2, target: 8},
+                      {source: 3, target: 13},
+                      {source: 8, target: 9},
+                      ],
+                  lineStyle: {//关系线样式
+                      type: 'solid',//实线
+                      color: "rgb(0, 0, 0,80%)",//标注线颜色
+                      width: "2",
+                  },
+                }]
+          }
+          echarts1.setOption(option)
+      console.log(echarts1.getOption())
+          echarts1.on('click',function (params){
+            // console.log(params.name)
+      })
+      // this.tableData=JSON.parse(sessionStorage.getItem('eventData'))
+      if (this.tableData.length!==0)
+        this.changeChart()
+      // let target=JSON.parse(sessionStorage.getItem('target'))
+      // this.formInline1.company=target[0]
+      // this.formInline1.event_type=target[1]
+      // this.formInline1.start_date=target[2]
+      // this.formInline1.end_date=target[3]
+    },
+
+    
+
   methods:{
-  },
+
+    test(){
+      console.log('test')
+    },
+    // 调整表格列宽
+    calculateColumnWidth(prop) {
+      const text = String(this.tableData[0][prop]); // 使用第一行的数据作为示例
+      const calculatedWidth = text.length;
+      console.log('console.log(calculatedWidth):',calculatedWidth)
+      if(calculatedWidth>10 && calculatedWidth<=50){
+        const baseWidth= 20 + calculatedWidth * 0.3
+        return `${baseWidth}px`;
+      }
+      if(calculatedWidth>50){
+        const baseWidth= 20 + calculatedWidth * 0.5
+        return `${baseWidth}px`;
+      }
+      else{
+        return "20px";
+      }
+    },
+  
+    //新闻联想搜索
+    querySearch(queryString, cb) {
+      // console.log(queryString)
+      // console.log(cb)
+      http.get(
+          "/search/search_news/?name=?"+queryString,
+
+          // paramsSerializer: params => {
+          //   return qs.stringify(params, { indices: false })
+      ).then(response => {
+        // console.log(response.data)
+        // console.log(cb)
+        let result=response.data
+        let re=[]
+        for (let i of result){
+          re.push({"value":i})
+        }
+        cb(re)
+      })},
+    // 1、表
+    onSubmit1(){//事件分析
+       this.tableData.length=0
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
+        http.get(
+                "/event2/event_analyse/",
+                {params:{
+                    name: this.formInline1.company,
+                    event_type:this.formInline1.event_type,
+                    start:this.formInline1.start_date,
+                    end:this.formInline1.end_date,
+                    need:1
+        }}).then(response => {
+            this.tableData = response.data.data.data
+          let links= response.data.data.edges
+          let intLink=[]
+          // for (let i in links){
+          //   intLink.push({source:parseInt(links[i]['source']),target:parseInt(links[i]['target'])})
+          // }
+
+
+          for (let i in links){
+            intLink.push({source:this.tableData.find(function(obj) {
+              return obj.order === parseInt(links[i]['source'])}).title,
+            target:this.tableData.find(function(obj) {
+              return obj.order === parseInt(links[i]['target'])}).title
+
+            })
+
+          }
+          console.log(intLink)
+            this.changeChart(intLink)
+          })
+      loadingInstance.close()
+       },
+    changeChart(links){
+      // console.log(this.tableData)
+      //关系图
+      //基于准备好的dom，初始化echarts实例
+      // var ROOT_PATH = 'https://echarts.apache.org/examples';
+      const echarts1 = echarts.init(this.$refs.echarts_1)
+      const markLineList=[] //垂直线
+      const timeList=[]//存不重复的时间
+      const nor_time=[]//存所有的时间
+      const nodeid=[]
+      const new_data=[]
+      var count=0
+      for(let {publish_time: time} of this.tableData){
+        // console.log(time)
+        nor_time.push(time)
+        // 返回值等于-1 说明数组timeList中不存在time,则存入
+        if(timeList.indexOf(time)===-1 ){
+          timeList.push(time)
+          nodeid.push(count)
+          markLineList.push({xAxis: count})
+          count=count+1
+        }
+
+      }
+      // console.log(timeList)
+      timeList.sort(function (a, b) {
+        if( a.split(' ')[0]<b.split(' ')[0]  || a.split(' ')[0]===b.split(' ')[0] && a.split(' ')[1]<b.split(' ')[1])
+          return -1; //a - b < 0: 代表后一个比前一个大，就是升序
+        else if ( a.split(' ')[0]>b.split(' ')[0] || a.split(' ')[0]===b.split(' ')[0] && a.split(' ')[1]>b.split(' ')[1])
+          return 1
+        else return 0
+      })
+      // console.log(timeList)
+      let tmp=[]
+      // 仅显示部分新闻
+      if (this.tableData.length>20) {
+        var p = 20 / this.tableData.length
+        this.$notify.info({
+          title: '提示',
+          message: '事件图谱仅显示部分数据'
+        });
+        for (let i = 0; i < this.tableData.length; i++) {
+          // let index=legends.indexOf(this.old_data[i].情感倾向)
+          let y = Math.floor(Math.random() * 10 ) + 1 //随机散列开
+          if (Math.random() < p) {
+            let x = timeList.indexOf(this.tableData[i].publish_time)
+            while (tmp.find(value => value === [x, y]))
+              y=Math.floor(Math.random() * 10 ) + 1 //随机散列开
+            tmp.push([x, y])
+            // console.log(x, y)
+            new_data.push({
+              id: parseInt(this.tableData[i].order),
+              name: this.tableData[i].title, //根据name连边
+              // name: this.tableData[i].title,
+              // label: {
+              //   normal: {
+              //     show: true,
+              //     position: "bottom",
+              //     textStyle: {
+              //       fontSize: 8
+              //     },},
+              //
+              //   // data:legends[index],
+              //   color: "rgb(0, 0, 0)",
+              // },
+              // color: colors[index],
+              symbolSize: this.tableData[i].clout * 30,
+              // symbolSize:20,
+              value: [x, y],
+              itemStyle: {
+                borderColor: '#fff',
+                borderWidth: 2,
+                shadowBlur: 2,
+                shadowColor: '#999999',
+                color: 'green',
+
+              },
+              tooltip: {
+                show: true,
+                trigger: 'axis',
+                triggeron: 'mousemove',
+                formatter: 'event'
+              },
+
+            })
+          }
+        }
+      }
+      else {
+        for (let i = 0; i < this.tableData.length; i++) {
+          // let index=legends.indexOf(this.old_data[i].情感倾向)
+          let y = Math.floor(Math.random() * 10) + 1
+          let x = timeList.indexOf(this.tableData[i].publish_time)
+          while (tmp.find(value => value === [x, y]))
+            y=Math.floor(Math.random() * 10) + 1
+          tmp.push([x, y])
+          console.log(x, y)
+          new_data.push({
+            id: parseInt(this.tableData[i].order),
+            name: this.tableData[i].title, //根据name连边
+            // label: {
+            //   normal: {
+            //     show: true,
+            //     position: "bottom",
+            //     textStyle: {
+            //       fontSize: 8
+            //     },},
+            //
+            //   // data:legends[index],
+            //   color: "rgb(0, 0, 0)",
+            // },
+            // color: colors[index],
+            symbolSize: this.tableData[i].clout * 30,
+            // symbolSize:20,
+            value: [x, y],
+            itemStyle: {
+              borderColor: '#fff',
+              borderWidth: 2,
+              shadowBlur: 2,
+              shadowColor: '#999999',
+              color: 'green',
+
+            },
+            tooltip: {
+              show: true,
+              trigger: 'axis',
+              triggeron: 'mousemove',
+              formatter: 'event'
+            },
+          })
+        }
+      }
+      const option = {
+        // 右上角存图
+        toolbox: {
+          feature: {
+            saveAsImage: {}
+          }
+        },
+        // title: {
+        //     text: '笛卡尔坐标系上的 Graph'
+        // },
+        xAxis:[ {
+          // type : 'category',
+          // boundaryGap : false,
+          data : timeList
+        }
+        ],
+        yAxis: {
+          show:false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+          // type : 'category',//注释后，数轴0开始，不然点会遮住坐标轴
+          // boundaryGap : false,//位于点还是位于区域
+          // data: ['a','b','c','d']
+        },
+        legend: {
+          data: ['消极', '中性', '积极'],  //图例的数据
+          top: "15%",   //图例的位置
+          icon:"circle",  //图例的形状
+          x: 'right',        //图例在右侧
+          orient: 'vertical',  //图例纵向排布   horizontal为横向排布
+          textStyle: {         //图例字体的颜色
+            color: "#ffffff"
+          }},
+        // legend: {
+        //       normal: {
+        //         data: ['消极', '中性', '积极'],
+        //         show: true,}
+        //     },
+        series: [
+          {
+            type: 'graph',
+            // layout: 'none',
+            coordinateSystem: 'cartesian2d',
+
+            // 垂直线
+            markLine: {
+              symbol: ['none', 'none'],
+              label: { show: false },
+              data: markLineList,
+              lineStyle: {//标注线样式
+
+                type: 'dashed',//虚线
+                color: '#999999',//标注线颜色
+
+              },
+            },
+
+            // 边两段的类型和大小
+            edgeSymbol: ['circle', 'circle'],
+            edgeSymbolSize: [4,4],
+            //
+            data:new_data,
+
+            //显示节点备注
+            // itemStyle : {
+            //   normal: {label : {show: true}},
+            //   textStyle: {
+            //     color: '#000'
+            //   }
+            // },
+            //  边
+            links: links,
+
+                // [
+            //   {source: 0, target: 5},
+            //   {source: 5, target: 6},
+            //   {source: 1, target: 7},
+            //   {source: 2, target: 8},
+            //   {source: 3, target: 13},
+            //   {source: 8, target: 9},
+            // ],
+            lineStyle: {//关系线样式
+              type: 'solid',//实线
+              color: "rgb(0, 0, 0,80%)",//标注线颜色
+              width: "2",
+            }
+          }]
+      }
+      echarts1.setOption(option)
+      console.log(echarts1.getOption())
+      // 点击事件弹窗
+      echarts1.on('click',(parms)=>{
+        console.log(parms)
+        http.get('/event2/event_graph/',
+            {params:{
+              id:parms.data.id
+              }}
+        ).then((res)=>{
+          console.log(res.data)
+          this.detailData.length=0
+          this.detailData.push(res.data)
+          this.dialogVisible=true
+        })
+      })
+    },
+
+
+       open(){
+        this.$nextTick(() => {
+        //  执行echarts方法
+        //   this.initEcharts1()
+          this.initEcharts2()
+        })
+      },
+
+  }
 }
+
 </script>
 
-<style lang='less' scoped>
+<style lang="less" scoped>
+// 调整表头间隔、设置表头下方边框颜色
+/deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+      border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
+      padding: 0px 0 !important;
+      min-width: 0 !important;
+    }
+    .el-table .el-table__cell {
+      padding: 12px 0; 
+      min-width: 0;
+    }
+    /deep/ .active_header{//表头
+      color: #333333;
+      font-size: 13px;
+      text-align: center !important;
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      font-size: 13px;
+    }
 
+
+.one{
+  .form{//产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:5px; 
+    // height: 40px;
+    padding-left: 20px;
+
+  }
+  .content{
+    padding: 0px 20px 2px 20px;//返回表格添加间隙 上 右
+    font-size: 12px;
+
+
+    
+    }
+  .text{
+    color:rgba(2, 167, 240, 0.729411764705882);
+  }
+
+  }
+.two{
+  margin-top:10px; 
+}
+// 详情页
+.flex-charts{//并列图
+    // margin-top:20px; 
+    display:flex;
+    justify-content:space-between;
+    // padding:20px;
+}
+.grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
 </style>
diff --git a/src/views/健康指数.vue b/src/views/健康指数.vue
index 015bc34..4a89ad2 100644
--- a/src/views/健康指数.vue
+++ b/src/views/健康指数.vue
@@ -36,7 +36,7 @@
 
               <!-- 第一栏"健康指数"的表格 -->
             <div class="table">
-              <el-table :data="tableData_1" 
+              <el-table :data="tableData_1" :header-cell-style="{background: 'rgba(242, 242, 242)'}"
                       border  
                       height="250" 
                       :row-style="{height:'28px'}"
@@ -159,7 +159,7 @@
         <!-- 2、对比 -->
             <el-tab-pane label="对比">
                 <!-- 2-1-雷达图对比 -->
-                <el-card style=" height:770px; border: 1px solid #7f7f7f;" :body-style={padding:0} >         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+                <el-card style=" height:850px; border: 1px solid #7f7f7f;" :body-style={padding:0} >         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
                     <div class="card_label" style=" height: 24px;width: 100%;text-align: left; padding-left:10px">雷达图对比</div>
 
                     <!-- 搜索框 -->
@@ -180,7 +180,7 @@
                               :fetch-suggestions="querySearch"
                               placeholder="公司名称"
                           ></el-autocomplete>
-                          <el-form-item label="时间 " style=" margin-right: 40px;">
+                          <el-form-item label="时间 " style=" margin-right: 40px;margin-left: 40px;">
                           <quter-component label="开始时间" v-model="formInline2.quarter_year" placeholder="选择季度" />
                           </el-form-item>
                         </el-form-item>
@@ -193,17 +193,17 @@
                 
                     <!-- 雷达图 -->
                     <div class='radar' >
-                      <div class="quarter_change">
-                        <i class="el-icon-arrow-left"  border style="font-size: 50px;color:#7f7f7f"></i>
-                        <div>上一季度</div>
-                      </div>
+<!--                      <div class="quarter_change">-->
+<!--                        <i class="el-icon-arrow-left"  border style="font-size: 50px;color:#7f7f7f"></i>-->
+<!--                        <div>上一季度</div>-->
+<!--                      </div>-->
                     
                       <div ref="echarts_1" style="height:500px;width:500px"></div>
                     </div>
 
                     <!-- "对比"表格 -->
                     <div class="table"  style="padding:20px">
-                      <el-table :data="tableData_2_1" 
+                      <el-table :data="tableData_2_1" :header-cell-style="{background: 'rgba(242, 242, 242)'}"
                               border  
                               :row-style="{height:'28px'}"
                               :cell-style="{padding:'3px'}"
@@ -289,7 +289,7 @@
                         </el-card>
                         <!-- "对比-交叉对比-行业"表格 -->
                         <div class="table"  style="  padding: 20px 10px 2px 0px;"><!--返回表格添加间隙 上 右 -->
-                          <el-table :data="tableData_2_2" 
+                          <el-table :data="tableData_2_2" :header-cell-style="{background: 'rgba(242, 242, 242)'}"
                                   border  
                                   :row-style="{height:'28px'}"
                                   :cell-style="{padding:'3px'}"
@@ -335,7 +335,7 @@
                         
                         <!-- "对比-交叉对比-地域"表格 -->
                         <div class="table"  style="  padding: 20px 10px 2px 0px;"><!--返回表格添加间隙 上 右 -->
-                          <el-table :data="tableData_2_3" 
+                          <el-table :data="tableData_2_3" :header-cell-style="{background: 'rgba(242, 242, 242)'}"
                                   border  
                                   :row-style="{height:'28px'}"
                                   :cell-style="{padding:'3px'}"
@@ -359,7 +359,7 @@
             <el-tab-pane label="我的管理">
             <!-- 第三栏"我的管理"的表格 -->
             <div class="table">
-              <el-table :data="tableData_3" 
+              <el-table :data="tableData_3" :header-cell-style="{background: 'rgba(242, 242, 242)'}"
 
 
                       border  
@@ -398,6 +398,7 @@ import quterComponent from "@/components/quterComponent";
 import * as echarts from "echarts"
 import http from '../utils/request'
 export default {
+  name:'health',
   components:{
     quterComponent
 },
@@ -513,9 +514,9 @@ tableLabel_long: {
 // [table-data]
       // 第1栏"健康指数"表格
       tableData_1: [
-        { name: '中国银行',
-          index: 1,
-          level: "中等",},
+        // { name: '中国银行',
+        //   index: 1,
+        //   level: "中等",},
       ],
       // 第2栏"对比"表格
       tableData_2_1: [
@@ -621,7 +622,7 @@ tableLabel_long: {
     },
     
     onSubmit6(){
-      if (this.tableData_2_1){
+      if (this.tableData_2_1 || this.formInline2.radarData1 ||this.formInline2.radarData2){
         this.formInline2.radarData1.length=0
         this.formInline2.radarData2.length=0
         this.tableData_2_1.length=0
@@ -661,6 +662,8 @@ tableLabel_long: {
         this.formInline2.tableData2.name=this.formInline2.company2
         for (let i in response.data.data)
           if (i !=='健康指数' && i !=='等级' && typeof response.data.data[i]==='number') this.formInline2.radarData2.push(response.data.data[i])
+        console.log(this.formInline2.radarData2)
+        console.log(this.formInline2.radarData1)
         const echarts1 = echarts.init(this.$refs.echarts_1)
 
         this.tableData_2_1.push( this.formInline2.tableData2)
@@ -897,7 +900,7 @@ tableLabel_long: {
               }
             },
             title: {
-              text: '2011年第一季度',
+              text: this.formInline1.quarter_year.slice(0,4)+'年第'+this.formInline1.quarter_year.slice(6,)+'季度',
               x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
               y:"bottom",
               padding:[ 0,10,10,10],
@@ -986,7 +989,7 @@ tableLabel_long: {
     }
     /deep/ .active_header{//表头
       color: #333333;
-      font-size: 9px;
+      font-size: 13px;
       text-align: center !important;
       border-color:#333333;
 
@@ -994,7 +997,7 @@ tableLabel_long: {
     }
     /deep/ .content_center{//表的内容
       text-align: center !important;
-      font-size: 10px;
+      font-size: 13px;
       border-color:#333333;
     }
   }
@@ -1019,5 +1022,9 @@ tableLabel_long: {
     display:flex;
     justify-content:center;
   }
+  .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
 </style>
   
\ No newline at end of file
diff --git a/src/views/压力测试.vue b/src/views/压力测试.vue
index c5468b1..e7ab398 100644
--- a/src/views/压力测试.vue
+++ b/src/views/压力测试.vue
@@ -35,6 +35,7 @@
   <script>
   import * as echarts from "echarts"
   export default {
+    name:'pressure',
     data() {
       return {
 
@@ -77,7 +78,12 @@
             // end_date:'',
         },
           }          
-  }, 
+  },
+    computed:{
+      isLogin(){
+        return this.$store.state.isLogin
+      }
+    },
     mounted(){
           
   },
diff --git a/src/views/市场主体分析.vue b/src/views/市场主体分析.vue
index 6732df2..f1af8ba 100644
--- a/src/views/市场主体分析.vue
+++ b/src/views/市场主体分析.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+
     <graph-view-v4></graph-view-v4>
 <!--      <div class="form">-->
 <!--                                                        &lt;!&ndash; inline="true"表单域在一行 &ndash;&gt;-->
@@ -56,6 +57,7 @@
 import graphViewV4 from "@/views/graphViewV4";
 import http from '../utils/request'
   export default {
+    name:'market_entities',
     //引入组件
   components: {
     graphViewV4
diff --git a/src/views/异常检测.vue b/src/views/异常检测.vue
index 0a71026..65b3aa3 100644
--- a/src/views/异常检测.vue
+++ b/src/views/异常检测.vue
@@ -5,7 +5,7 @@
     <el-tabs type="border-card">
     <!-- 【1】股市 -->
     <el-tab-pane label="股市">
-      <el-card style='height: 800px;margin-bottom: 10px;' :body-style={padding:0}> 
+      <el-card style='height: 1050px;margin-bottom: 10px;' :body-style={padding:0}>
       <!-- height:400px -->
       <!-- 1、上标 -->
       <span class="superscript" style="width: 20px; height: 40px;">股票异常检测</span>
@@ -15,12 +15,12 @@
                                                           <!-- inline="true"表单域在一行 -->
           <el-form :inline="true"  class="demo-form-inline" :model="formInline1" ref="formInline2">
   
-              <el-form-item label="行业" prop="行业">
-              <el-select  size="mini" v-model="formInline1.industry">
-                  <el-option label="行业1" value="行业1"></el-option>
-                  <el-option label="行业2" value="行业2"></el-option>
-              </el-select>
-              </el-form-item>
+<!--              <el-form-item label="行业" prop="行业">-->
+<!--              <el-select  size="mini" v-model="formInline1.industry">-->
+<!--                  <el-option label="行业1" value="行业1"></el-option>-->
+<!--                  <el-option label="行业2" value="行业2"></el-option>-->
+<!--              </el-select>-->
+<!--              </el-form-item>-->
               <el-form-item label="开始时间" prop="开始时间">
               <el-date-picker
                   v-model="formInline1.start_date"
@@ -46,35 +46,63 @@
           </el-form>
       </div>
       <!-- 添加半圆饼图 -->
-      <half-doughnut/>
+      <half-doughnut :key='1' :myHalfData="myHalfData1"></half-doughnut>
+      <!-- <half-doughnut/ :prop=""> -->
       <!-- 表格 -->
       <div class="table">
-              <el-table :data="tableData1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+              <el-table :data="tableData1.slice((currentPage-1)*pageSize,currentPage*pageSize)" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
                     border  
-                    height="250" 
+                    height="500"
                     :row-style="{height:'30px'}"
                     :cell-style="{padding:'5px'}"
                     header-row-class-name="active_header"
                     header-cell-class-name="active_header"
                     cell-class-name="content_center"
-                    style="width: 100px,">          <!-- style="width: 40%"               height="215"  -->
-                  <el-table-column v-for='(val,key) in tableLabel1' :prop="key" :label="val" /><!--插槽里面没有东西就可以用单标签  -->
+                    style="width: 100px">          <!-- style="width: 40%"               height="215"  -->
+                <template v-for="(val,key) in tableLabel1">
+<!--                  You should not mix 'v-for' with 'v-if'-->
+<!--                  条件渲染-->
+                <el-table-column  :prop="key"  :key='key'
+                                 :label='typeof val === "object" ? val.label : val'
+                                 :filters=filterText
+                                 :filter-method="filterTag"
+                                 v-if=' val.special'
+                />
+                  <el-table-column  :prop="key"  :key='key'
+                                    :label='typeof val === "object" ? val.label : val'
+
+                                    v-if=' !val.special'
+                  />
+                </template>
+                <!--插槽里面没有东西就可以用单标签  -->
                   <el-table-column
                           prop="scale"
                           label="操作">
                           <template slot-scope="scope">
-                            <span class="text"  v-on:click="detail(scope.row)">查看详情</span>
+<!--                            <span class="text"  v-on:click="detail(scope.row,this.formInline1.start_date)">查看详情</span>-->
+                            <span class="text"  v-on:click="testDeatil(scope.row)">查看详情</span>
                           </template>
                       </el-table-column>
               </el-table>
             </div>
-  
+
+<!--        分页-->
+        <div class="block" style="margin-top:15px;">
+          <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                         :current-page="currentPage"
+
+                         :page-size="10"
+                         layout="total, prev, pager, next, jumper"
+                         :total="tableData1.length">
+          </el-pagination>
+
+        </div>
   
       </el-card>
     </el-tab-pane>
     <!-- 【2】债市 -->
     <el-tab-pane label="债市">
-      <el-card style='height: 800px;margin-bottom: 10px;' :body-style={padding:0}> 
+      <el-card style='height: 1050px;margin-bottom: 10px;' :body-style={padding:0}>
       <!-- height:400px -->
       <!-- 1、上标 -->
       <span class="superscript" style="width: 20px; height: 40px;">债市异常检测</span>
@@ -83,12 +111,12 @@
       <div class="form">
                                                           <!-- inline="true"表单域在一行 -->
           <el-form :inline="true"  class="demo-form-inline" :model="formInline2" ref="formInline2">
-              <el-form-item label="行业" prop="行业">
-              <el-select  size="mini" v-model="formInline2.industry">
-                  <el-option label="行业1" value="行业1"></el-option>
-                  <el-option label="行业2" value="行业2"></el-option>
-              </el-select>
-              </el-form-item>
+<!--              <el-form-item label="行业" prop="行业">-->
+<!--              <el-select  size="mini" v-model="formInline2.industry">-->
+<!--                  <el-option label="行业1" value="行业1"></el-option>-->
+<!--                  <el-option label="行业2" value="行业2"></el-option>-->
+<!--              </el-select>-->
+<!--              </el-form-item>-->
               <el-form-item label="开始时间" prop="开始时间">
               <el-date-picker
                   v-model="formInline2.start_date"
@@ -114,28 +142,49 @@
           </el-form>
       </div>
       <!-- 添加半圆饼图 -->
-      <half-doughnut/>
+      <half-doughnut :key='2' :myHalfData="myHalfData3"></half-doughnut>
       <!-- 表格 -->
       <div class="table">
-              <el-table :data="tableData2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+              <el-table :data="tableData2.slice((currentPage-1)*pageSize,currentPage*pageSize)" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
                     border  
-                    height="250" 
+                    height="500"
                     :row-style="{height:'30px'}"
                     :cell-style="{padding:'5px'}"
                     header-row-class-name="active_header"
                     header-cell-class-name="active_header"
                     cell-class-name="content_center"
-                    style="width: 100px,">          <!-- style="width: 40%"               height="215"  -->
-                  <el-table-column v-for='(val,key) in tableLabel2' :prop="key" :label="val" /><!--插槽里面没有东西就可以用单标签  -->
+                    style="width: 100px">          <!-- style="width: 40%"               height="215"  -->
+                <template v-for="(val,key) in tableLabel2">
+                  <!--                  You should not mix 'v-for' with 'v-if'-->
+                  <!--                  条件渲染-->
+                  <el-table-column  :prop="key"  :key='key'
+                                    :label='typeof val === "object" ? val.label : val'
+                                    :filters=filterText
+                                    :filter-method="filterTag"
+                                    v-if=' val.special'
+                  />
+                  <el-table-column  :prop="key"  :key='key'
+                                    :label='typeof val === "object" ? val.label : val'
+
+                                    v-if=' !val.special'
+                  />
+                </template>
                   <el-table-column
                           prop="scale"
                           label="操作">
                           <template slot-scope="scope">
-                            <span class="text"  v-on:click="detail(scope.row)">查看详情</span>
+                            <span class="text"  v-on:click="detail(scope.row,formInline2.start_date)">查看详情</span>
                           </template>
                       </el-table-column>
               </el-table>
             </div>
+        <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                       :current-page="currentPage"
+
+                       :page-size="10"
+                       layout="total, prev, pager, next, jumper"
+                       :total="tableData2.length">
+        </el-pagination>
       
       
   
@@ -144,7 +193,7 @@
     </el-tab-pane>
     <!-- 【3】期货 -->
     <el-tab-pane label="期货">
-      <el-card style='height: 800px;margin-bottom: 10px;' :body-style={padding:0}> 
+      <el-card style='height: 1050px;margin-bottom: 10px;' :body-style={padding:0}>
       <!-- height:400px -->
       <!-- 1、上标 -->
       <span class="superscript" style="width: 20px; height: 40px;">合约交易异常</span>
@@ -153,12 +202,13 @@
       <div class="form">
                                                           <!-- inline="true"表单域在一行 -->
           <el-form :inline="true"  class="demo-form-inline" :model="formInline3" ref="formInline3">
-              <el-form-item label="商品种类" prop="商品种类">
-              <el-select  size="mini" v-model="formInline3.industry">
-                  <el-option label="商品1" value="商品1"></el-option>
-                  <el-option label="商品2" value="商品2"></el-option>
-              </el-select>
-              </el-form-item>
+<!--              <el-form-item label="商品种类" prop="商品种类">-->
+
+<!--                  <el-select   v-model="formInline3.industry" placeholder="选择商品" size="mini">-->
+<!--                    <el-option v-for="item in futureOption" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+<!--                  </el-select>-->
+
+<!--              </el-form-item>-->
               <el-form-item label="开始时间" prop="开始时间">
               <el-date-picker
                   v-model="formInline3.start_date"
@@ -184,48 +234,223 @@
           </el-form>
       </div>
       <!-- 添加半圆饼图 -->
-      <half-doughnut/>
+      <half-doughnut :key='3' :myHalfData="myHalfData2"></half-doughnut>
       <!-- 表格 -->
       <div class="table">
-              <el-table :data="tableData3" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+              <el-table :data="tableData3.slice((currentPage-1)*pageSize,currentPage*pageSize)" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
                     border  
-                    height="250" 
+                    height="500"
                     :row-style="{height:'30px'}"
                     :cell-style="{padding:'5px'}"
                     header-row-class-name="active_header"
                     header-cell-class-name="active_header"
                     cell-class-name="content_center"
-                    style="width: 100px,">          <!-- style="width: 40%"               height="215"  -->
-                  <el-table-column v-for='(val,key) in tableLabel3' :prop="key" :label="val" /><!--插槽里面没有东西就可以用单标签  -->
+                    style="width: 100px">          <!-- style="width: 40%"               height="215"  -->
+                <template v-for="(val,key) in tableLabel3 ">
+                  <!--                  You should not mix 'v-for' with 'v-if'-->
+                  <!--                  条件渲染-->
+                  <el-table-column  :prop="key"  :key='key'
+                                    :label='typeof val === "object" ? val.label : val'
+                                    :filters=filterText
+                                    :filter-method="filterTag"
+                                    v-if=' val.special'
+                  />
+                  <el-table-column  :prop="key"  :key='key'
+                                    :label='typeof val === "object" ? val.label : val'
+
+                                    v-if=' !val.special'
+                  />
+                </template>
+                <!--插槽里面没有东西就可以用单标签  -->
                   <el-table-column
                           prop="scale"
                           label="操作">
                           <template slot-scope="scope">
-                            <span class="text"  v-on:click="detail(scope.row)">查看详情</span>
+                            <span class="text"  v-on:click="detail(scope.row,formInline3.start_date)">查看详情</span>
                           </template>
                       </el-table-column>
               </el-table>
             </div>
-      
-      
-  
-  
-      </el-card>
 
+        <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                       :current-page="currentPage"
+
+                       :page-size="10"
+                       layout="total, prev, pager, next, jumper"
+                       :total="tableData3.length">
+        </el-pagination>
+
+      </el-card>
     </el-tab-pane>
   </el-tabs>
+    <!-- #1弹窗：股价波动异常、高频交易 -->
+    <el-dialog  :visible.sync="detailsdialog1" width="100%" @open="open()" >
+            <!-- 详细信息 -->
+            <el-card style=" height:100%;margin-bottom:10px ; " :body-style={padding:0} >
+              <div style="display:flex;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title'>异常统计</span>
+              </div>
+
+                <Histogram :x-data="xData" :y-data="yData" :legend="legend" :title="titleText"/>
+<!--              <span style="display:block;text-indent:2em;line-height: 25px;margin: 10px;">-->
+<!--                股票1在2021-01-01至2021-02-01时间段内，在2021-1-8内达到股价峰值，为26元/每股，比该公司该段时间内平均股价（9元/每股），上涨15元，涨幅188.8%。在股价过高的情况下可能会导致风险增加、股票泡沫、不良收购等多种导致经济不稳定的风险因素的增加，在2021-01-09达到交易量峰值，为231支，比该公司该段时间内平均交易量（121股），上涨110股，涨幅为90.9%。在交易量过高的情况下可能会在一定程度上可能对市场稳定性、公平竞争和投资者信心造成负面影响。-->
+
+<!--              </span>-->
+
+            </el-card>
+          </el-dialog>
+      <!-- #2弹窗：资产泡沫 -->
+      <el-dialog  :visible.sync="detailsdialog2" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:100%;margin-bottom:10px ; " :body-style={padding:0} >
+          <div style="display:flex;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title'>异常统计</span>
+              </div>
+              <div style="height:100px;margin-left: 20px;">图谱</div>
+              <el-table class='detail_table'
+                    :data="tableData_detail_1_2"
+                    style="width: 100%"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center"
+                    height="215" >
+                    <el-table-column v-for='(val,key) in tableLabel_detail_1_2' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_2)">
+
+                    </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+
+
+                </el-table>
+                <DifferentialChart/>
+<!--              <span style="display:block;text-indent:2em;line-height: 25px;margin: 10px;">-->
+<!--                股票1在2021-01-01至2021-02-01时间段内，在2021-1-8内达到股价峰值，为26元/每股，比该公司该段时间内平均股价（9元/每股），上涨15元，涨幅188.8%。在股价过高的情况下可能会导致风险增加、股票泡沫、不良收购等多种导致经济不稳定的风险因素的增加，在2021-01-09达到交易量峰值，为231支，比该公司该段时间内平均交易量（121股），上涨110股，涨幅为90.9%。在交易量过高的情况下可能会在一定程度上可能对市场稳定性、公平竞争和投资者信心造成负面影响。-->
+
+<!--              </span>-->
+
+        </el-card>
+      </el-dialog>
+
+      <!-- #3弹窗：事件风险波及、风险事件时长、事件热度异常 -->
+      <el-dialog  :visible.sync="detailsdialog3" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:100%;margin-bottom:10px ; " :body-style={padding:0} >
+          <div style="display:flex;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title'>异常统计</span>
+              </div>
+              <div style="height:100px;margin-left: 20px;">图谱</div>
+              <el-table class='detail_table'
+                    :data="tableData_detail_1_3"
+                    style="width: 100%"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+
+
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center"
+                    height="215" >
+                    <el-table-column v-for='(val,key) in tableLabel_detail_1_3' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_3)">
+
+                    </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                </el-table>
+
+                <AreaChart :key='1' :myAreaChart="myAreaChart1"></AreaChart>
+
+
+<!--              <span style="display:block;text-indent:2em;line-height: 25px;margin: 10px;">-->
+<!--                股票1在2021-01-01至2021-02-01时间段内，在2021-1-8内达到股价峰值，为26元/每股，比该公司该段时间内平均股价（9元/每股），上涨15元，涨幅188.8%。在股价过高的情况下可能会导致风险增加、股票泡沫、不良收购等多种导致经济不稳定的风险因素的增加，在2021-01-09达到交易量峰值，为231支，比该公司该段时间内平均交易量（121股），上涨110股，涨幅为90.9%。在交易量过高的情况下可能会在一定程度上可能对市场稳定性、公平竞争和投资者信心造成负面影响。-->
+
+<!--              </span>-->
+
+        </el-card>
+      </el-dialog>
   </div>
 </template>
 
 <script>
 import HalfDoughnut from "../components/echarts/HalfDoughnut.vue";
-  
+import DifferentialChart from "@/components/echarts/DifferentialChart.vue";
+import Histogram from "@/components/echarts/Histogram.vue";
+import AreaChart from "@/components/echarts/AreaChart.vue";
+import http from "@/utils/request";
+import {Loading} from "element-ui";
+
+
 export default {
+  name:'abnormal_detection',
+
   components:{
-    HalfDoughnut
+    HalfDoughnut,
+    DifferentialChart,
+    Histogram,
+    AreaChart,
+
   },
   data () {
       return {
+        currentPage: 1, // 当前页码
+        total: 20, // 总条数
+        pageSize: 10, // 每页的数据条数
+        filterText:[],
+        titleText:'',
+        legend:'',
+        xData:[],
+        yData:[],
+        //记录当前所选的市场
+        selectedIndustry:'',
+// 期货
+        futureOption:[{'value': 'NIZL.SHF', 'label': '沪镍'}, {'value': 'RRZL.DCE', 'label': '粳米'}, {'value': 'LHZL.DCE', 'label': '生猪'}, {'value': 'CSZL.DCE', 'label': '玉米淀粉'}, {'value': 'RBZL.SHF', 'label': '螺纹钢'}, {'value': 'APZL.CZC', 'label': '苹果'}, {'value': 'CFZL.CZC', 'label': '棉花'}, {'value': 'BZL.DCE', 'label': '豆二'}, {'value': 'URZL.CZC', 'label': '尿素'}, {'value': 'AUZL.SHF', 'label': '沪金'}, {'value': 'BCZL.SHF', 'label': '国际铜'}, {'value': 'PBZL.SHF', 'label': '沪铅'}, {'value': 'AZL.DCE', 'label': '豆一'}, {'value': 'SPZL.SHF', 'label': '纸浆'}, {'value': 'LZL.DCE', 'label': '塑料'}, {'value': 'SFZL.CZC', 'label': '硅铁'}, {'value': 'BUZL.SHF', 'label': '沥青'}, {'value': 'TAZL.CZC', 'label': 'PTA'}, {'value': 'HCZL.SHF', 'label': '热卷'}, {'value': 'SRZL.CZC', 'label': '白糖'}, {'value': 'CJZL.CZC', 'label': '红枣'}, {'value': 'SAZL.CZC', 'label': '纯碱'}, {'value': 'WRZL.SHF', 'label': '线材'}, {'value': 'CZL.DCE', 'label': '玉米'}, {'value': 'ZNZL.SHF', 'label': '沪锌'}, {'value': 'EBZL.DCE', 'label': '苯乙烯'}, {'value': 'RSZL.CZC', 'label': '菜籽'}, {'value': 'FBZL.DCE', 'label': '纤维板'}, {'value': 'MAZL.CZC', 'label': '甲醇'}, {'value': 'PPZL.DCE', 'label': '聚丙烯'}, {'value': 'IZL.DCE', 'label': '铁矿石'}, {'value': 'PZL.DCE', 'label': '棕榈油'}, {'value': 'FGZL.CZC', 'label': '玻璃'}, {'value': 'RUZL.SHF', 'label': '橡胶'}, {'value': 'AGZL.SHF', 'label': '沪银'}, {'value': 'SNZL.SHF', 'label': '沪锡'}, {'value': 'FUZL.SHF', 'label': '燃油'}, {'value': 'PGZL.DCE', 'label': 'LPG'}, {'value': 'PFZL.CZC', 'label': '短纤'}, {'value': 'SCZL.SHF', 'label': '原油'}, {'value': 'EGZL.DCE', 'label': '乙二醇'}, {'value': 'JMZL.DCE', 'label': '焦煤'}, {'value': 'MZL.DCE', 'label': '豆粕'}, {'value': 'NRZL.SHF', 'label': '20号胶'}, {'value': 'VZL.DCE', 'label': 'PVC'}, {'value': 'YZL.DCE', 'label': '豆油'}, {'value': 'JDZL.DCE', 'label': '鸡蛋'}, {'value': 'AOZL.SHF', 'label': '氧化铝'}, {'value': 'SSZL.SHF', 'label': '不锈钢'}, {'value': 'RMZL.CZC', 'label': '菜粕'}, {'value': 'CYZL.CZC', 'label': '棉纱'}, {'value': 'LUZL.SHF', 'label': '低硫燃油'}, {'value': 'OIZL.CZC', 'label': '菜油'}, {'value': 'JZL.DCE', 'label': '焦炭'}, {'value': 'ALZL.SHF', 'label': '沪铝'}, {'value': 'CUZL.SHF', 'label': '沪铜'}, {'value': 'SMZL.CZC', 'label': '锰硅'}, {'value': 'PKZL.CZC', 'label': '花生'}],
+        // 判断是否弹窗打开
+  // 判断是否弹窗打开
+      detailsdialog1:false,
+      detailsdialog2:false,
+      detailsdialog3:false,
+      // detailsdialog4:false,
+
+  // 【图表数据】
+  //半圆图
+      myHalfData1: [
+            // { value: 300, name: "股价波动异常" },
+            // { value: 350, name: "高频交易" },
+            // { value: 200, name: "资产泡沫" },
+            // { value: 120, name: "事件风险波及" },
+            // { value: 110, name: "风险事件时长" },
+            // { value: 280, name: "事件热度异常" },
+            // {
+            //   // make an record to fill the bottom 50%
+            //   value: 300+350+200+120+110+280,
+            //   itemStyle: {
+            //     color: "none",
+            //   },
+            // },
+          ],
+        myHalfData3:[],
+        myHalfData2:[
+            // { value: 300, name: "股价波动异常" },
+            // { value: 350, name: "高频交易" },
+            // { value: 200, name: "资产泡沫" },
+            // {
+            //   // make an record to fill the bottom 50%
+            //   value: 300+350+200,
+            //   itemStyle: {
+            //     // stop the chart from rendering this piece
+            //     color: "none",
+            //   },
+            // },
+          ],
+  // 面积图
+      myAreaChart1:[],
+
+
+
   // 【整合接收数据】
       formInline1: {
           industry:'',
@@ -243,7 +468,7 @@ export default {
           end_date:'',
       },
   // 【表格】
-  tableData1: [
+      tableData1: [
           { 
               异常关联类型: '股价波动异常',
               涉及股票: '股票1',
@@ -289,41 +514,564 @@ export default {
             
           ],
       tableLabel1: {
-          编号: '编号',
-          异常关联类型: '异常关联类型',
-          涉及股票: '涉及股票',
+          编码: '编号',
+        异常关联类型: {label:'异常关联类型' ,
+          special:true
+        },
+          名称: '涉及股票',
           监测时间: '监测时间',
           股票价格: '股票价格',
           交易数量: '交易数量',
           风险等级: '风险等级',
+
       },
       tableLabel2: {
-          编号: '编号',
-          异常关联类型: '异常关联类型',
-          涉及主体: '涉及主体',
+        编码: '编号',
+        异常关联类型: {label:'异常关联类型' ,
+          special:true
+        },
+        名称: '涉及主体',
           监测时间: '监测时间',
-          股票价格: '股票价格',
+          股票价格: '债券价格',
           交易数量: '交易数量',
           风险等级: '风险等级',
+
+
       },
       tableLabel3: {
-          编号: '编号',
-          异常关联类型: '异常关联类型',
+        编码: '编号',
+          异常关联类型: {label:'异常关联类型' ,
+            special:true
+  },
           涉及商品: '涉及商品',
           合约名称: '合约名称',
           监测时间: '监测时间',
           股票价格: '股票价格',
           交易数量: '交易数量',
           风险等级: '风险等级',
+
       },
+      tableLabel_detail_1_1:
+      {
+        编号: '编号',
+        异常主体:'异常主体',
+        关联对象:'关联对象',
+        异常关联类型:'异常关联类型',
+        关联相似度:'关联相似度',
+        涉及事件详情:'涉及事件详情',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'风险等级',
+      },
+      tableData_detail_1_1:[
+      {
+        编号: '',
+        异常主体:'股票1',
+        关联对象:'股票2',
+        异常关联类型:'高频交易',
+        关联相似度:'关联相似度',
+        涉及事件详情:'事件分析',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'',
+      },
+
+      ],
+      tableLabel_detail_1_2:
+      {
+        编号: '编号',
+        异常主体:'异常主体',
+        关联对象:'关联对象',
+        异常关联类型:'异常关联类型',
+        关联相似度:'关联相似度',
+        涉及事件详情:'涉及事件详情',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'风险等级',
+      },
+      tableData_detail_1_2:[
+      {
+        编号: '',
+        异常主体:'股票1',
+        关联对象:'股票2',
+        异常关联类型:'高频交易',
+        关联相似度:'关联相似度',
+        涉及事件详情:'事件分析',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'',
+      },
+
+      ],
+      tableLabel_detail_1_3:
+      {
+        编号: '编号',
+        异常主体:'异常主体',
+        关联对象:'关联对象',
+        异常关联类型:'异常关联类型',
+        关联相似度:'关联相似度',
+        涉及事件详情:'涉及事件详情',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'风险等级',
+      },
+      tableData_detail_1_3:[
+      {
+        编号: '',
+        异常主体:'股票1',
+        关联对象:'股票2',
+        异常关联类型:'高频交易',
+        关联相似度:'关联相似度',
+        涉及事件详情:'事件分析',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'',
+      },
+
+      ],
   }
     },
     mounted(){
     },
     methods:{
-      onSubmit1(){},
-      onSubmit2(){},
-      detail(row){}
+
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+        this.currentPage = 1;
+        this.pageSize = val;
+      },
+      //当前页改变时触发 跳转其他页
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+        this.currentPage = val;
+      },
+
+
+
+      filterTag(value, row) {
+        return row.异常关联类型 === value;
+      },
+
+      onSubmit1(){
+        // console.log(this.formInline1.start_date,this.formInline1.end_date)
+        console.log()
+        if (String(this.formInline1.start_date)===String(this.formInline1.end_date)){
+          this.$message({
+            showClose: true,
+            message: '请重新选择时间',
+            type: 'warning'
+          });
+
+        }
+        else {
+          let options={
+            text:'请稍等'
+          }
+          let loadingInstance = Loading.service(options);
+          this.selectedIndustry = 'stock'
+          if (this.myHalfData1.length !== 0)
+            this.myHalfData1.length = 0
+          this.currentPage=1
+          http.get('/anomaly/all_anomaly/', {
+            params: {
+              sc: 'stock',
+              indus: this.formInline1.industry,
+              sdate: this.formInline1.start_date,
+              edate: this.formInline1.end_date
+            }
+          }).then((res) => {
+            // console.log(res.data.date)
+            // this.$notify.info({
+            //   title: '提示',
+            //   message: '仅显示部分结果'
+            // });
+            let total = 0
+            for (let i in res.data.date) {
+              if (res.data.date[i]!==0){
+                total += Number(res.data.date[i])
+
+                this.myHalfData1.push({value: Number(res.data.date[i]), name: i})
+              }
+            }
+            if (total!==0){
+              this.myHalfData1.push({
+                value: total,
+                itemStyle: {
+                  color: "none",
+                }
+              })
+
+            }
+
+
+          })
+          http.get('/anomaly/item_anomaly/', {
+            params: {
+              sc: 'stock',
+              indus: this.formInline1.industry,
+              sdate: this.formInline1.start_date,
+              edate: this.formInline1.end_date
+            }
+          }).then((res) => {
+            this.filterText=[]
+            this.tableData1 = res.data.data
+            const unique =  Array.from(new Set(this.tableData1.map(item => item.异常关联类型)));
+            console.log(unique)
+            for (let i in unique)
+            {
+             let  tmp={ text: unique[i], value: unique[i] }
+            if ( !this.filterText.some(item => JSON.stringify(item) === JSON.stringify(tmp)))
+              this.filterText.push(tmp)
+            }
+            console.log(this.filterText)
+
+          })
+          loadingInstance.close()
+        }
+
+      },
+      onSubmit2(){
+        if (String(this.formInline2.start_date)===String(this.formInline2.end_date)){
+          this.$message({
+            showClose: true,
+            message: '请重新选择时间',
+            type: 'warning'
+          });
+        }
+        else {
+          let options={
+            text:'请稍等'
+          }
+          this.currentPage=1
+          let loadingInstance = Loading.service(options);
+          this.selectedIndustry = 'bond'
+          if (this.myHalfData3.length !== 0)
+            this.myHalfData3.length = 0
+          http.get('/anomaly/all_anomaly/', {
+            params: {
+              sc: 'bond',
+              indus: this.formInline2.industry,
+              sdate: this.formInline2.start_date,
+              edate: this.formInline2.end_date
+            }
+          }).then((res) => {
+            // this.$notify.info({
+            //   title: '提示',
+            //   message: '仅显示部分结果'
+            // });
+            console.log(res.data.date)
+            let total = 0
+            for (let i in res.data.date) {
+              if (res.data.date[i]!==0){
+                total += Number(res.data.date[i])
+                this.myHalfData3.push({value: Number(res.data.date[i]), name: i})
+              }
+            }
+
+            if (total!==0){
+              this.myHalfData3.push({
+                value: total,
+                itemStyle: {
+                  color: "none",
+                }
+              })
+
+            }
+
+            http.get('/anomaly/item_anomaly/', {
+              params: {
+                sc: 'bond',
+                indus: this.formInline2.industry,
+                sdate: this.formInline2.start_date,
+                edate: this.formInline2.end_date
+              }
+            }).then((res) => {
+              this.filterText=[]
+              this.tableData2 = res.data.data
+              const unique =  Array.from(new Set(this.tableData2.map(item => item.异常关联类型)));
+              console.log(unique)
+              for (let i in unique)
+              {
+                let  tmp={ text: unique[i], value: unique[i] }
+                if ( !this.filterText.some(item => JSON.stringify(item) === JSON.stringify(tmp)))
+                  this.filterText.push(tmp)
+              }
+            })
+          })
+          loadingInstance.close()
+        }
+      },
+      onSubmit3(){
+        if (String(this.formInline3.start_date)===String(this.formInline3.end_date)){
+          this.$message({
+            showClose: true,
+            message: '请重新选择时间',
+            type: 'warning'
+          });
+        }
+        else {
+          this.currentPage=1
+          let options={
+            text:'请稍等'
+          }
+          let loadingInstance = Loading.service(options);
+          this.selectedIndustry = 'future'
+          if (this.myHalfData2.length !== 0)
+            this.myHalfData2.length = 0
+          http.get('/anomaly/all_anomaly/', {
+            params: {
+              sc: 'future',
+              indus: this.formInline3.industry,
+              sdate: this.formInline3.start_date,
+              edate: this.formInline3.end_date
+            }
+          }).then((res) => {
+            // this.$notify.info({
+            //   title: '提示',
+            //   message: '仅显示部分结果'
+            // });
+            console.log(res.data.date)
+            let total = 0
+            for (let i in res.data.date) {
+              if (res.data.date[i]!==0){
+                total += Number(res.data.date[i])
+                this.myHalfData2.push({value: Number(res.data.date[i]), name: i})
+              }
+            }
+            if (total!==0){
+
+              this.myHalfData2.push({
+                value: total,
+                itemStyle: {
+                  color: "none",
+                }
+              })
+            }
+
+            http.get('/anomaly/item_anomaly/', {
+              params: {
+                sc: 'future',
+                indus: this.formInline3.industry,
+                sdate: this.formInline3.start_date,
+                edate: this.formInline3.end_date
+              }
+            }).then((res) => {
+              this.filterText=[]
+              this.tableData3 = res.data.data
+              const unique =  Array.from(new Set(this.tableData3.map(item => item.异常关联类型)));
+              console.log(unique)
+              for (let i in unique)
+              {
+                let  tmp={ text: unique[i], value: unique[i] }
+                if ( !this.filterText.some(item => JSON.stringify(item) === JSON.stringify(tmp)))
+                  this.filterText.push(tmp)
+              }
+            })
+          })
+          loadingInstance.close()
+        }
+      },
+      // 调整表格列宽
+      calculateColumnWidth(prop,data) {
+          const text = String(data[0][prop]); // 使用第一行的数据作为示例
+          const calculatedWidth = text.length;
+          // console.log('console.log(calculatedWidth):',calculatedWidth)
+          if(calculatedWidth>10 && calculatedWidth<=50){
+            const baseWidth= 20 + calculatedWidth * 0.5
+            return `${baseWidth}px`;
+          }
+          if(calculatedWidth<=10){
+            const baseWidth= 15
+            return `${baseWidth}px`;
+          }
+          else{
+            const baseWidth= 20 + calculatedWidth * 0.5
+            return `${baseWidth}px`;
+          }
+    },
+      //股
+      testDeatil(row){
+        let that=this
+        if(row.异常关联类型==='价格波动异常'||row.异常关联类型==='高频交易异常' ||row.异常关联类型==='资产泡沫异常') {
+          this.detailsdialog1 = true//打开弹窗
+          http.get('/anomaly/sc_anomaly/', {
+            params: {
+              date: this.formInline1.start_date,
+              sc: that.selectedIndustry,
+              id: row.名称,
+              type: row.异常关联类型
+            }
+          }).then((res) => {
+            let name=res.data.name!==''?res.data.name:row.名称
+            let y = []
+            let x = []
+            if (row.异常关联类型 === '价格波动异常')
+              for (let i in res.data.data) {
+
+                y.push(res.data.data[i].价格波动异常值)
+                x.push(res.data.data[i].监测时间)
+                this.legend = '价格波动'
+                this.titleText = name+'价格波动情况'
+              }
+            if (row.异常关联类型 === '高频交易异常')
+              for (let i in res.data.data) {
+                y.push(res.data.data[i].高频交易值)
+                x.push(res.data.data[i].监测时间)
+                this.legend = '交易量波动'
+                this.titleText = name+'交易量变化情况'
+              }
+            if (row.异常关联类型 === '资产泡沫异常')
+              for (let i in res.data.data) {
+                y.push(res.data.data[i].资产泡沫值)
+                x.push(res.data.data[i].监测时间)
+                this.legend = '资产泡沫值'
+                this.titleText = name+'资产泡沫'
+              }
+
+            this.xData = x.reverse()
+            this.yData = y.reverse()
+            // this.lineData['yData']=y
+            // console.log(this.lineData)
+          })
+          http.get('/anomaly/anomaly_event/', {
+            params: {
+              time: this.formInline1.start_date,
+              market: that.selectedIndustry,
+              subject: row.名称,
+              type: row.异常关联类型
+            }
+          }).then((res) => {
+            console.log(res.data)
+          })
+        }
+
+
+
+        if (row.异常关联类型==='资产泡沫') {
+          this.detailsdialog2 = true//打开弹窗
+        }
+        if (row.异常关联类型==='事件风险波及'||row.异常关联类型==='风险事件时长'||row.异常关联类型==='事件热度异常') {
+          this.detailsdialog3 = true//打开弹窗
+        }
+        // console.log(row)
+        // http.get('/anomaly/anomaly_relevant_analyse/', {
+        //   params: {
+        //     subject: row.名称,
+        //     time: row.监测时间,
+        //     market: this.selectedIndustry,
+        //     type: row.异常关联类型
+        //   }
+        // }).then((res) => {
+        //   console.log(res.data)
+        // })
+      },
+      detail(row,date) {
+
+        let that = this
+        if (this.selectedIndustry !== 'future') {
+          if (row.异常关联类型 === '价格波动异常' || row.异常关联类型 === '高频交易异常' || row.异常关联类型 === '资产泡沫异常') {
+            this.detailsdialog1 = true//打开弹窗
+            http.get('/anomaly/sc_anomaly/', {
+              params: {
+                date: date,
+                sc: that.selectedIndustry,
+                id: row.名称,
+                type: row.异常关联类型
+              }
+            }).then((res) => {
+              let name=res.data.name!==''?res.data.name:row.名称
+              console.log(name)
+              let y = []
+              let x = []
+              if (row.异常关联类型 === '价格波动异常')
+                for (let i in res.data.data) {
+                  y.push(res.data.data[i].价格波动异常值)
+                  x.push(res.data.data[i].监测时间)
+                  this.legend = '价格波动'
+                  this.titleText = name+'价格波动情况'
+                }
+              if (row.异常关联类型 === '高频交易异常')
+                for (let i in res.data.data) {
+                  y.push(res.data.data[i].高频交易值)
+                  x.push(res.data.data[i].监测时间)
+                  this.legend = '交易量波动'
+                  this.titleText = name+'交易量变化情况'
+                }
+              if (row.异常关联类型 === '资产泡沫异常')
+                for (let i in res.data.data) {
+                  y.push(res.data.data[i].资产泡沫值)
+                  x.push(res.data.data[i].监测时间)
+                  this.legend = '资产泡沫值'
+                  this.titleText = name+'资产泡沫'
+                }
+              this.xData = x.reverse()
+              this.yData = y.reverse()
+              // this.lineData['yData']=y
+              // console.log(this.lineData)
+            })
+          }
+          if (row.异常关联类型 === '资产泡沫') {
+            this.detailsdialog2 = true//打开弹窗
+
+          }
+          if (row.异常关联类型 === '事件风险波及' || row.异常关联类型 === '风险事件时长' || row.异常关联类型 === '事件热度异常') {
+            this.detailsdialog3 = true//打开弹窗
+
+          }
+        } else {
+          if (row.异常关联类型 === '价格波动异常' || row.异常关联类型 === '高频交易异常') {
+            this.detailsdialog1 = true//打开弹窗
+            http.get('/anomaly/sc_anomaly/', {
+              params: {
+                sc: 'future',
+                date: date,
+                id: row.合约名称,
+                type: row.异常关联类型
+              }
+            }).then((res) => {
+              let y = []
+              let x = []
+              if (row.异常关联类型 === '价格波动异常')
+                for (let i in res.data.data) {
+                  y.push(res.data.data[i].价格波动异常值)
+                  x.push(res.data.data[i].监测时间)
+                }
+              this.legend = '价格波动率'
+              if (row.异常关联类型 === '高频交易异常')
+                for (let i in res.data.data) {
+                  y.push(res.data.data[i].高频交易值)
+                  x.push(res.data.data[i].监测时间)
+                }
+              this.legend = '交易量波动'
+              this.xData = x.reverse()
+              this.yData = y.reverse()
+            })
+          }
+          if (row.异常关联类型 === '资产泡沫') {
+            this.detailsdialog2 = true//打开弹窗
+
+          }
+          if (row.异常关联类型 === '事件风险波及' || row.异常关联类型 === '风险事件时长' || row.异常关联类型 === '事件热度异常') {
+            this.detailsdialog3 = true//打开弹窗
+
+          }
+        }
+        //关联实体
+        // http.get('/anomaly/anomaly_relevant_analyse/', {
+        //   params: {
+        //     subject: row.合约名称,
+        //     monitoring_time: row.监测时间,
+        //     market: this.selectedIndustry,
+        //     type: row.异常关联类型
+        //   }
+        // }).then((res) => {
+        //   console.log(res.data)
+        // })
+      },
+
+    // 打开弹窗图像
+      open(){
+              // this.$nextTick(() => {
+              // //  执行echarts方法
+              //   this.initEcharts()
+              // })
+      },
+
+
     },
   }
 </script>
@@ -349,28 +1097,66 @@ export default {
     // color: #606266;
 
     // 调整表头间隔、设置表头下方边框颜色
-    /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
-      border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
-      padding: 0px 0; 
-      min-width: 0;
-    }
-    .el-table .el-table__cell {
-      padding: 12px 0; 
-      min-width: 0;
-    } 
-    /deep/ .active_header{//表头
-      color: #333333;
-      font-size: 15px;
-      text-align: center !important;
-      // height: 1px;
-    }
-    /deep/ .content_center{//表的内容
-      text-align: center !important;
-      // font-size: 10px;
-    }
     .text{
       color:rgba(2, 167, 240, 0.729411764705882);
     }
 
-}    
+}
+.detail_table{
+  margin-top: 15px;
+  margin-left: 10px;
+  margin-right: 0px;
+/deep/ .el-table {
+  width: 98.5% !important;
+}
+}
+ // 右侧空只能这样调整，左侧必须用margin
+ /deep/ .el-table {
+    width: 97.5% !important;
+    // margin-right: 10px;
+  }
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 1px 1px 1px;
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0;
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #333333;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+.sublabel{ // 小标签标识
+    // font-size: 13px;
+    // padding:2px;
+    margin-top:10px;
+    background-color: rgba(2, 167, 240, 0.5);
+    width: 5px;
+    height: 35px;
+}
+.title{
+    padding-left: 4px;
+    margin-top:15px;
+    font-weight: bold;//字体加粗
+    display:flex;
+    justify-content:flex-start
+}
+
+
 </style>
diff --git a/src/views/系统性风险分析.vue b/src/views/系统性风险分析.vue
index 39e01f1..6f0afae 100644
--- a/src/views/系统性风险分析.vue
+++ b/src/views/系统性风险分析.vue
@@ -1,229 +1,203 @@
 <!-- 系统风险分析，原市场分析拆分、新增、11.6合并-->
 <template>
     <div>
-      <!-- 图谱，之前的在risk -->
       <div class="one">
-          <el-card style='height: 550px;margin-bottom: 10px;' :body-style={padding:0}> 
-         <!-- height:400px -->
-         <!-- 1、上标 -->
-          <span class="superscript" style="width: 20px; height: 40px;">系统风险分析</span>
-          <!-- 2、产品搜索栏 -->
-  
-          <div class="form">
-                                                           <!-- inline="true"表单域在一行 -->
-              <el-form :inline="true"  class="demo-form-inline" :model="formInline1" ref="formInline1">
-                <el-form-item label="市场" prop="市场">
-                  <el-select size="mini" v-model="formInline1.market">
-                    <el-option label="股票" value="股票"></el-option>
-                    <el-option label="基金" value="基金"></el-option>
-                  </el-select>
-                </el-form-item>
-  
-                <el-form-item label="行业" prop="行业">
-                  <el-select  size="mini" v-model="formInline1.industry">
-                    <el-option label="行业1" value="行业1"></el-option>
-                    <el-option label="行业2" value="行业2"></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="开始时间" prop="开始时间">
-                  <el-date-picker
-                      v-model="formInline1.start_date"
-                      type="date"
-                      placeholder="年/月/日" 
-                      size="mini">
-                  </el-date-picker>
-                </el-form-item>
-  
-                <el-form-item label="结束时间" prop="结束时间">
-                <el-date-picker
-                    v-model="formInline1.end_date"
-                    type="date"
-                    placeholder="年/月/日" 
-                    size="mini">
-                </el-date-picker>
-              </el-form-item>
-                <el-form-item>
-                  <el-button class="grayish_btn" @click="onSubmit2" size="mini">查询</el-button>
-                </el-form-item>
-  
-            </el-form>
-          </div>
-          
-          <el-row :gutter="20">
-          <el-col :span="18">
-    
-              图谱待定
-  
-          </el-col>
-  
-          <el-col :span="6">
-          <div style="margin-right: 10px;">
-              <!-- 表 -->
-              <el-table class='table' :data="tableData1" 
-                  :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)',marginright:'20px'}" 
-                  header-row-class-name="active_header"
-                  header-cell-class-name="active_header"
-                  cell-class-name="content_center"
-                
-                  :row-style="{height:'28px',marginright:'20px'}"
-                  :cell-style="{padding:'0px',marginright:'20px'}"
-                  style="margin-right:20px;">
-                <!-- border -->
-                  <el-table-column
-                      prop="value_label"
-                      label="行情风险评估"
-                      width='200px'>
-                  </el-table-column>
-                  <el-table-column
-                      prop="value"
-                      label="评估值"
-                      width='100px'
-                      >
-                  </el-table-column>
-  
-             </el-table>
-          </div>
-  
-  
-          </el-col>
-      </el-row>
-          
-          
-  
-  
-        </el-card>
-      
-        </div>
+        <!-- 卡片化的标签页 -->
+
+
+            <el-card style='height: 440px;margin-bottom:10px;' :body-style={padding:0}>
+            <!-- height:400px -->
+            <!-- 1、上标 -->
+            <span class="superscript" style="width: 20px; height: 40px;">资本市场系统性风险指数监测
+</span>
+
+            <!-- 添加折线图 -->
+
+              <component :is="compName" :zoom="datazoom" @datazoom="changeComp" ></component>
+<!--            <system-risk-component/>-->
+
+            </el-card>
+
+            <el-card style="height: 550px;margin-top: 10px" :body-style={padding:0}>
+              <span class="superscript" style="width: 20px; height: 20px;">维度时序</span>
+              <dimension-component :zoom="datazoom"/>
+
+
+            </el-card>
+            <el-card style='height: 600px;margin-top: 10px;' :body-style={padding:0}>
+              <!-- height:400px -->
+              <!-- 1、上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">系统性影响指标分析</span>
+
+              <!-- 3、tab -->
+              <el-tabs type="border-card" style='margin: 20px 20px 0 20px;' @tab-click="handleClick">
+
+                <!-- 收益率传染 -->
+                <el-tab-pane label="个体风险状态" :lazy='true'>
+                <market-risk-component :zoom="datazoom" :title="'个体风险状态'"/>
+                </el-tab-pane>
+
+<!--                延迟渲染  lazy true-->
+                <!-- 波动传染 -->
+                <el-tab-pane label="风险关联与溢出" :lazy='true'>
+                  <market-risk-component :zoom="datazoom" :title="'风险关联与溢出'"/>
+                </el-tab-pane>
+
+                <el-tab-pane label="市场系统结构" :lazy='true'>
+                  <market-risk-component :zoom="datazoom" :title="'市场系统结构'"/>
+                </el-tab-pane>
+
+                <el-tab-pane label="市场波动和趋势" :lazy='true'>
+                  <market-risk-component :zoom="datazoom" :title="'市场波动和趋势'"/>
+                </el-tab-pane>
+              </el-tabs>
+<!--              <div class="warning-component">-->
+<!--                <div class="warning-dates">-->
+<!--                  <div class="date-item">前日：<span>{{ prevDayIndex }}</span></div>-->
+<!--                  <div class="date-item">昨日：<span>{{ yesterdayIndex }}</span></div>-->
+<!--                  <div class="date-item">今日：<span>{{ todayIndex }}</span></div>-->
+<!--                  <div class="date-item">明日：<span>{{ tomorrowIndex }}</span></div>-->
+<!--                </div>-->
+<!--              </div>-->
+            </el-card>
+
+        <el-card style="height: 450px;margin-top: 10px" :body-style={padding:0}>
+          <span class="superscript" style="width: 20px; height: 20px;">宏观经济指标</span>
+          <system-risk-future/>
+
+
+        </el-card>
+
+            <!--            <market-risk-component/>-->
+<!--            <MarketRisk/>-->
+
+
+      </div>
+
 
-        <MarketRisk/>
     </div>
   </template>
   
   <script>
-  import MarketRisk from "/src/views/MarketRisk.vue";
-
-  export default {
+import systemRiskComponent from '@/components/systemRiskComponent';
+import marketRiskComponent from "@/components/riskIndexComponent";
+import dimensionComponent from "@/components/dimensionComponent";
+import systemRiskFuture from "@/components/systemRiskFuture";
+export default {
+    name:'systematic_risk',
     components:{
-      MarketRisk,
-    },
+      systemRiskFuture,
+      dimensionComponent,
+      systemRiskComponent,
+      marketRiskComponent
+},
     data () {
       return {
-  // 【整合接收数据】
-          formInline1: {
-          market:'',
-          industry:'',
-          start_date:'',
-          end_date:'',
-      },
-      formInline2: {
-          market:'',
-          industry:'',
-          start_date:'',
-          end_date:'',
-      },
-  // 【表格】
-      tableData1: [
-  {
-      value_label:'采矿业',
-      value:0.25
-  },
-  {
-      value_label:'文化、体育和娱乐业',
-      value:0.18
-  },
-  {
-      value_label:'制造业',
-      value:0.17
-  },
-  {
-      value_label:'租赁和商务服务业',
-      value:0.17
-  },
-  {
-      value_label:'交通运输、仓储和邮政业',
-      value:0.14
-  },
-  {
-      value_label:'软件和信息技术服务业',
-      value:0.14
-  },
-  {
-      value_label:'环境和公共设施管理业',
-      value:0.14
-  },
-  {
-      value_label:'综合评估',
-      value:"良好"
-  },
-  ],
-      tableData2: [
-          { 
-              异常关联类型: '股价波动异常',
-              涉及股票: '股票1',
-              },
-          { 
-              异常关联类型: '高频交易',
-              涉及股票: '股票1',
-          },
-          { 
-              异常关联类型: '资产泡沫',
-              涉及股票: '股票1',
-          },
-            
-          ],
-      tableLabel: {
-          编号: '编号',
-          异常关联类型: '异常关联类型',
-          涉及股票: '涉及股票',
-          监测时间: '监测时间',
-          股票价格: '股票价格',
-          交易数量: '交易数量',
-          风险等级: '风险等级',
-      },
+        datazoom:[],
+        compName:'systemRiskComponent',
+        prevDayIndex:'',
+        yesterdayIndex:'',
+        todayIndex:'',
+        tomorrowIndex:'',
+  state:'个体风险状态'
   }
     },
     mounted(){
+
     },
     methods:{
-      onSubmit1(){},
-      onSubmit2(){},
-      detail(row){}
+      changeComp(mesg){
+        this.datazoom=mesg
+        console.log(mesg)
+      },
+      // handleClick(tab, event) {
+      //   this.state=tab.label
+      // }
+      changeState(){
+        let lis=['个体风险状态','风险关联与溢出','市场系统结构','市场波动和趋势']
+        this.state=lis.indexOf(this.state)+1>3? '个体风险状态':lis[lis.indexOf(this.state)+1]
+      }
     },
   }
   </script>
   
   <style lang="less" scoped>
-  .form{//产品搜索栏
-    
-    display:flex;
-    justify-content:space-between;//左右贴边
-    margin-top:10px; 
-    // height: 40px;
-    padding-left: 20px;
-  
-   }
-   .grayish_btn{//浅灰色按钮
-    color: #fff;//文字颜色
-    background-color: #aaaaaa;//背景颜色
+  .button {
+    border-radius: 7px;
+    width: 160px;
+    height: 30px;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    gap: 12px;
+    cursor: pointer;
+    border: 3px solid rgb(94, 255, 209);
+    background-color: rgb(94, 255, 209);
+    box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.137);
   }
-   // 调整表头间隔、设置表头下方边框颜色
-   /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
-        border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
-        padding: 8px 0 !important;//这个页面表头大，可以调整一下间距
-        min-width: 0 !important;
-      }
-      .el-table .el-table__cell {
-        padding: 12px 0; 
-        min-width: 0;
-      }
-      /deep/ .active_header{//表头
-        color: #110101;
-        text-align: center !important;
-        // height: 1px;
-      }
-      /deep/ .content_center{//表的内容
-        text-align: center !important;
-      }
-    
+
+  .text {
+
+    width: 70%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    //background-color: rgb(255, 255, 255);
+    color: black;
+  }
+
+  .arrow path {
+    fill: rgb(19, 19, 19);
+  }
+
+  .button:hover .arrow {
+    animation: slide-in-left 0.6s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+  }
+
+  @keyframes slide-in-left {
+    0% {
+      transform: translateX(-8px);
+      opacity: 0;
+    }
+
+    100% {
+      transform: translateX(0px);
+      opacity: 1;
+    }
+  }
+
+  .button:active {
+    transform: scale(0.97);
+  }
+  .warning-component {
+    background-color: #ffffff;
+    border: 1px solid #ddd;
+    border-radius: 8px;
+    padding: 10px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    max-width: 100%;
+    text-align: center;
+
+    margin: auto;
+  }
+
+  .warning-dates {
+    display: flex;
+    justify-content: space-between;
+    //margin-bottom: 10px;
+  }
+
+  .date-item {
+    margin: 0 10px;
+    font-weight: bold;
+  }
+
+  .warning-recent {
+    color: #ff4d4f;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
+
   </style>
   
\ No newline at end of file
diff --git a/src/views/系统性风险分析old.vue b/src/views/系统性风险分析old.vue
new file mode 100644
index 0000000..905f516
--- /dev/null
+++ b/src/views/系统性风险分析old.vue
@@ -0,0 +1,303 @@
+<!-- 系统风险分析，原市场分析拆分、新增、11.6合并-->
+<template>
+    <div>
+      <!-- 图谱，之前的在risk -->
+      <div class="one">
+        <!-- 卡片化的标签页 -->
+        <el-tabs type="border-card">
+          <!-- 【1】股市 -->
+          <el-tab-pane label="股市">
+            <el-card style='height: 420px;margin-bottom:10px;' :body-style={padding:0}>
+            <!-- height:400px -->
+            <!-- 1、上标 -->
+            <span class="superscript" style="width: 20px; height: 40px;">股票市场系统性风险分析</span>
+            <!-- 2、产品搜索栏 -->
+
+            <div class="form">
+                                                                <!-- inline="true"表单域在一行 -->
+                <el-form :inline="true"  class="demo-form-inline" :model="formInline1" ref="formInline1">
+
+                    <el-form-item label="开始时间" prop="开始时间">
+                      <el-date-picker
+                          v-model="formInline1.start_date"
+                          type="date"
+                          placeholder="年/月/日"
+                          size="mini"
+                          >
+                      </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="结束时间" prop="结束时间">
+                    <el-date-picker
+                        v-model="formInline1.end_date"
+                        type="date"
+                        placeholder="年/月/日"
+                        size="mini"
+                        >
+                    </el-date-picker>
+                </el-form-item>
+                    <el-form-item>
+                    <el-button class="grayish_btn" @click="onSubmit1" size="mini" >查询</el-button>
+                    </el-form-item>
+
+
+                </el-form>
+            </div>
+            <!-- 添加折线图 -->
+            <DynamicLine/>
+            <!-- <half-doughnut :key='1' :myHalfData="myHalfData1"></half-doughnut> -->
+            </el-card>
+            <MarketRisk/>
+          </el-tab-pane>
+
+        <!-- 【2】债市 -->
+        <el-tab-pane label="债市">
+          <el-card style='height: 420px;margin-bottom: 10px;' :body-style={padding:0}>
+            <!-- height:400px -->
+            <!-- 1、上标 -->
+            <span class="superscript" style="width: 20px; height: 40px;">债市异常检测</span>
+            <!-- 2、产品搜索栏 -->
+
+            <div class="form">
+                                                                <!-- inline="true"表单域在一行 -->
+                <el-form :inline="true"  class="demo-form-inline" :model="formInline2" ref="formInline2">
+                    <el-form-item label="开始时间" prop="开始时间">
+                    <el-date-picker
+                        v-model="formInline2.start_date"
+                        type="date"
+                        placeholder="年/月/日"
+                        size="mini">
+                    </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="结束时间" prop="结束时间">
+                    <el-date-picker
+                        v-model="formInline2.end_date"
+                        type="date"
+                        placeholder="年/月/日"
+                        size="mini">
+                    </el-date-picker>
+                </el-form-item>
+                    <el-form-item>
+                    <el-button class="grayish_btn" @click="onSubmit2" size="mini">查询</el-button>
+                    </el-form-item>
+
+
+                </el-form>
+            </div>
+            <!-- 添加折线图 -->
+          <DynamicLine/>
+            <!-- <half-doughnut :key='1' :myHalfData="myHalfData1"></half-doughnut> -->
+          </el-card>
+          <MarketRisk/>
+        </el-tab-pane>
+
+          <!-- 【3】期货 -->
+          <el-tab-pane label="期货">
+            <el-card style='height: 800px;margin-bottom: 10px;' :body-style={padding:0}>
+            <!-- height:400px -->
+            <!-- 1、上标 -->
+            <span class="superscript" style="width: 20px; height: 40px;">期货市场分析</span>
+              <!-- 添加关系图谱 -->
+              <el-row :gutter="20">
+                <el-col :span="18">
+                  <div style="margin:20px">
+                    <!-- 图谱待定 -->
+                    <QiPao></QiPao>
+                  </div>
+                </el-col>
+                <el-col :span="6">
+                  <div style="margin-right: 10px;">
+                      <!-- 表 -->
+                      <el-table class='table' :data="tableData1"
+
+                          :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)',marginright:'20px'}"
+                          header-row-class-name="active_header"
+                          header-cell-class-name="active_header"
+                          cell-class-name="content_center"
+
+                          :row-style="{height:'28px',marginright:'20px'}"
+                          :cell-style="{padding:'0px',marginright:'20px'}"
+                          style="margin-right:20px;">
+                        <!-- border -->
+                          <el-table-column
+                              prop="value_label"
+                              label="行情风险评估"
+                              width='200px'>
+                          </el-table-column>
+                          <el-table-column
+                              prop="value"
+                              label="评估值"
+                              width='100px'
+                              >
+                          </el-table-column>
+
+                      </el-table>
+                  </div>
+                </el-col>
+              </el-row>
+            </el-card>
+            <MarketRisk/>
+          </el-tab-pane>
+        </el-tabs>
+
+      </div>
+
+
+    </div>
+  </template>
+  
+  <script>
+import MarketRisk from "/Desktop/研究生/项目/金融项目/code/finacial11.7/finacial/src_old/views/MarketRisk.vue";
+import DynamicLine from "@/components/echarts/DynamicLine.vue";
+import QiPao from "@/components/QiPao";
+  export default {
+    name:'systemRisk',
+    components:{
+    MarketRisk,
+    DynamicLine,
+      QiPao,
+
+},
+    data () {
+      return {
+  // 【整合接收数据】
+          formInline1: {
+          market:'',
+          industry:'',
+          start_date:'',
+          end_date:'',
+      },
+      formInline2: {
+          market:'',
+          industry:'',
+          start_date:'',
+          end_date:'',
+      },
+  // 【表格】
+      tableData1: [
+  {
+      value_label:'沪银主连',
+      value:0.25
+  },
+  {
+      value_label:'沪铝主连',
+      value:0.18
+  },
+  {
+      value_label:'氧化铝主连',
+      value:0.17
+  },
+  {
+      value_label:'苹果主连',
+      value:0.17
+  },
+  {
+      value_label:'沪金主连',
+      value:0.14
+  },
+  {
+      value_label:'国际铜主连',
+      value:0.14
+  },
+  {
+      value_label:'合成橡胶主连',
+      value:0.14
+  },
+  {
+      value_label:'综合评估',
+      value:"良好"
+  },
+  ],
+      tableData2: [
+          { 
+              异常关联类型: '股价波动异常',
+              涉及股票: '股票1',
+              },
+          { 
+              异常关联类型: '高频交易',
+              涉及股票: '股票1',
+          },
+          { 
+              异常关联类型: '资产泡沫',
+              涉及股票: '股票1',
+          },
+            
+          ],
+      tableLabel: {
+          编号: '编号',
+          异常关联类型: '异常关联类型',
+          涉及股票: '涉及股票',
+          监测时间: '监测时间',
+          股票价格: '股票价格',
+          交易数量: '交易数量',
+          风险等级: '风险等级',
+      },
+  }
+    },
+    mounted(){
+
+    },
+    methods:{
+
+      onSubmit1(){},
+      onSubmit2(){},
+      detail(row){}
+    },
+  }
+  </script>
+  
+  <style lang="less" scoped>
+  /deep/ .form{//产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:10px; 
+    // height: 40px;
+    margin-left: 20px;
+    margin-bottom: 0px !important;
+    padding-bottom: 0px !important;
+
+  
+   }
+   .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+   // 调整表头间隔、设置表头下方边框颜色
+   .table{
+  // 和选项框隔开
+  // margin:10px;
+  // font-size: 12px;
+  padding: 0px 5px 2px 5px;//返回表格添加间隙 上 右
+
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 1px 1px 1px; 
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0; 
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #333333;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+}
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/行情分析.vue b/src/views/行情分析.vue
index 2fd4381..b9747b9 100644
--- a/src/views/行情分析.vue
+++ b/src/views/行情分析.vue
@@ -67,7 +67,7 @@
                   </div>
               </el-card>
               <div class="table"  style="  padding: 20px 10px 2px 0px;"><!--板块表格 -->
-                          <el-table :data="tableData_sector" 
+                          <el-table :data="tableData_sector" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
                                   border  
                                   :row-style="{height:'28px'}"
                                   :cell-style="{padding:'3px'}"
@@ -117,7 +117,7 @@
                       </div>
                       </el-card>
                       <div class="table"  style="  padding: 20px 10px 2px 0px;">   <!-- 股票表格 -->
-                                  <el-table :data="tableData_stock" 
+                                  <el-table :data="tableData_stock" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
                                           border  
                                           :row-style="{height:'28px'}"
                                           :cell-style="{padding:'3px'}"
@@ -170,7 +170,7 @@
                       </div>
                     </el-card>
                       <div class="table"  style="  padding: 20px 10px 2px 0px;"><!--基金表格 -->
-                                  <el-table :data="tableData_fund" 
+                                  <el-table :data="tableData_fund" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
                                           border  
                                           :row-style="{height:'28px'}"
                                           :cell-style="{padding:'3px'}"
@@ -208,7 +208,7 @@
             </el-tabs>
               
           <div class="table"  style="  padding: 20px 10px 2px 0px;"><!-- 我的管理的表格 -->
-                                  <el-table :data="tableData_management" 
+                                  <el-table :data="tableData_management" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
                                           border  
                                           :row-style="{height:'28px'}"
                                           :cell-style="{padding:'3px'}"
@@ -267,12 +267,13 @@
 import * as echarts from "echarts"
 import http from '../utils/request'
 export default {
+  name:'quotation',
     //引入组件
   components: {
 
   },
-    data() {
-      return {
+  data() {
+    return {
   
 // 【详情页】
     // 详情页是否打开的判断标签
@@ -482,7 +483,7 @@ export default {
       onSubmit2(){//板块
         console.log("板块查询")
         http.get(
-                "/price/bkall",
+                "/price/bkall/",
                 {params:{
                     com_name: this.formInline2.sector,
                     // start_date:this.formInline.start_date,
@@ -499,7 +500,7 @@ export default {
         console.log("股票查询")
         console.log(this.formInline3_1)
         http.get(
-                "/price/stock",
+                "/price/stock/",
                 {params:{
                     com_name: this.formInline3_1.stock,
                     start_date:this.formInline3_1.start_date,
@@ -517,7 +518,7 @@ export default {
         console.log("基金查询")
         console.log(this.formInline3_2)
         http.get(
-                "/price/fund",
+                "/price/fund/",
                 {params:{
                     com_name: this.formInline3_2.fund,
                     start_date:this.formInline3_2.start_date,
@@ -984,4 +985,8 @@ export default {
     justify-content:space-between;
     // padding:20px;
 }
+.grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
 </style>
diff --git a/src/views/预警服务.vue b/src/views/预警服务.vue
index 75ee2a3..edfffb4 100644
--- a/src/views/预警服务.vue
+++ b/src/views/预警服务.vue
@@ -1,25 +1,1327 @@
 <!-- 预警服务主页面 -->
 <template>
   <div>
+    <div class="one">
+      <el-card style='height: 360px;' :body-style={padding:0}> 
+       <!-- height:400px -->
+       <!-- 1、上标 -->
+        <span class="superscript" style="width: 20px; height: 40px;">整体风险概括</span>
+        <!-- 2、卡片x3 -->
+        <div class="tirCard">
+          <!-- 股票市场 -->
+          <div class="my-element" style="width: 380px; height: 250px;">
+            <h4 style="padding-left: 50px;">股票市场</h4>
+            <div class="tirCircle">
+              <div class="circle_low">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">{{ stockLow }}</div>
+              </div>
+              <div class="circle_mid">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">{{ stockMid }}</div>
+              </div>
+              <div class="circle_high">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">{{ stockHigh }}</div>
+              </div>
+            </div>
+            <div class="tirText"> 
+              <span>低风险</span>
+              <span>中风险</span>
+              <span>高风险</span>
+            </div>
 
+            <div>
+              <h5 style="display: flex;justify-content:center">综合风险水平       95</h5>
+            </div>
+
+
+          </div>
+
+          <!-- 债券市场 -->
+          <div class="my-element" style="width: 380px; height: 250px;">
+            <h4 style="padding-left: 50px;">债券市场</h4>
+            <div class="tirCircle">
+              <div class="circle_low">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">1862</div>
+              </div>
+              <div class="circle_mid">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">441</div>          
+              </div>
+              <div class="circle_high">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">87</div>
+              </div>
+            </div>
+            <div class="tirText"> 
+              <span>低风险</span>
+              <span>中风险</span>
+              <span>高风险</span>
+            </div>
+            <div>
+              <h5 style="display: flex;justify-content:center">综合风险水平       95</h5>
+            </div>
+          </div>
+          <!-- 期货市场 -->
+          <div class="my-element" style="width: 380px; height: 250px;">
+            <h4 style="padding-left: 50px;">期货市场</h4>
+            <div class="tirCircle">
+              <div class="circle_low">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">1862</div>
+              </div>
+              <div class="circle_mid">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">441</div>          
+              </div>
+              <div class="circle_high">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">87</div>
+              </div>
+            </div>
+            <div class="tirText"> 
+              <span>低风险</span>
+              <span>中风险</span>
+              <span>高风险</span>
+            </div>
+            <div>
+              <h5 style="display: flex;justify-content:center">综合风险水平       95</h5>
+            </div>
+          </div>
+
+        </div>
+        <!-- 3、总结语句 -->
+<!--        <span style="margin: 10px;padding-left:20px;padding-right:20px;display: inline-block;">-->
+<!--          &#8194 &#8194中国资本市场主要由股票市场、债券市场和期货市场组成，-->
+<!--          其中股票市场份额占比为 50%，-->
+<!--          债券市场份额占比为 30%、-->
+<!--          期货市场份额占比为20%，-->
+<!--          整体市场风险水平评估为 89，属于 低风险</span>-->
+
+          <!--  &#32; == 普通的英文半角空格
+                &#160; == &nbsp; == &#xA0; == no-break space （普通的英文半角空格但不换行）
+                &#12288; == 中文全角空格 （一个中文宽度）
+                &#8194; == &ensp; == en空格 （半个中文宽度）
+                &#8195; == &emsp; == em空格 （一个中文宽度）
+                &#8197; == 四分之一em空格 （四分之一中文宽度） -->
+      </el-card>
+    </div>
+
+  <div class="two">
+      <el-card style='height: 800px;margin-top:5px' :body-style={padding:0} > 
+       <!-- height:400px -->
+       <!-- 1、上标 -->
+        <span class="superscript" style="width: 20px; height: 40px;">预警服务</span>
+       <!-- 2、搜索栏 -->
+        <div class="form">
+          <el-form :inline="true"  class="demo-form-inline" :model="formInline1" ref="formInline">
+            <el-form-item label="预警市场">
+              <el-select  v-model="formInline1.market" size="mini">
+                <el-option label="股票" value="stock"></el-option>
+                <el-option label="债券" value="bond"></el-option>
+                <el-option label="期货" value="future"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button class="grayish_btn" @click="onSubmit1" size="mini">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <!-- 3、内容 -->
+        <div class="one_twins_card">
+          <!-- 一左 -->
+          <el-card style=" height:600px;width: 68%;" :body-style={padding:0}>         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+            <!--(1)风险预警  -->
+            <div style="display:flex;justify-content:space-between;">
+              <div style="display:flex;padding-bottom: 10px;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title' >风险预警</span>
+              </div>
+              <div style="display:flex;">
+<!--                <span class="text"  v-on:click="statistics1()">查看风险统计</span>-->
+                <span class="text"  v-on:click="detail2()">查看全部详情</span>
+              </div>
+            </div>
+            <el-table class='table' :data="tableData_main_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="215"
+                    >
+                <el-table-column v-for='(val,key) in tableLabel_main_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <!--(2)异常预警 -->
+            <div style="display:flex;justify-content:space-between;">
+              <div style="display:flex;padding-bottom: 10px;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title' >异常预警</span>
+              </div>
+              <div style="display:flex;">
+<!--                <span class="text"  v-on:click="statistics3()">查看异常统计</span>-->
+<!--                <span class="text"  v-on:click="detail3()">查看全部详情</span>-->
+              </div>
+            </div>
+<!--            v-if动态选择表类型-->
+            <el-table class='table' :data="tableData_main_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                      v-if="formInline1.market==='stock'"
+                  height="215"   >
+                <el-table-column  v-for='(val,key) in tableLabel1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_2)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <el-table class='table' :data="tableData_main_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                      border
+
+                      :row-style="{height:'28px'}"
+                      :cell-style="{padding:'0px'}"
+                      header-row-class-name="active_header"
+                      header-cell-class-name="active_header"
+                      cell-class-name="content_center"
+                      v-if="formInline1.market==='bond'"
+                      height="215"   >
+              <el-table-column  v-for='(val,key) in tableLabel2' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_2)">
+
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <el-table class='table' :data="tableData_main_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                      border
+
+                      :row-style="{height:'28px'}"
+                      :cell-style="{padding:'0px'}"
+                      header-row-class-name="active_header"
+                      header-cell-class-name="active_header"
+                      cell-class-name="content_center"
+                      v-if="formInline1.market==='future'"
+                      height="215"   >
+              <el-table-column  v-for='(val,key) in tableLabel3' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_2)">
+
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+
+
+          </el-card>
+          
+          <!-- 一右 -->
+          <el-card style=" height:600px;width: 31%;" :body-style={padding:0} overflow:hidden >
+            <div style="display:flex;margin-bottom: 10px;">
+              <el-divider direction="vertical" class="sublabel"></el-divider>
+              <span class='title'>预警提示</span>
+            </div>
+            
+
+
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/29 16:00股票1监测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/2916:00股票1检测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/29 16:00股票1检测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/29 16:00股票1检测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/29 16:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/2916:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/2916:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/29 16:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+
+            <vue-seamless-scroll v-if="contentList.length>0" :data="contentList" class="wrap"  >
+<!--            <div v-for="(val,key) in contentList" :key="key" style="padding: 5px;">【{{warning_type2}}】{{val.time}},{{val.entity}}检测到{{val.type}}<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+              <ul class="item">
+                <li v-for="(item, index) in contentList" :key="index">
+                  <span class="time" v-text="item.time"></span>
+                  <span class="entity" v-text="item.entity"></span>
+                  <span class="type" v-text="item.type"></span>
+<!--                 <span class="text_detail"  v-on:click="detail1(item.type)">[详情]</span>-->
+                </li>
+              </ul>
+            </vue-seamless-scroll>
+<!--            <vue-seamless-scroll :data="listData" class="warp">-->
+<!--              <ul class="item">-->
+<!--                <li v-for="(item, index) in listData" :key="index">-->
+<!--                  <span class="title" v-text="item.title"></span>-->
+<!--                  <span class="date" v-text="item.date">检测大</span>-->
+<!--                  <span class="t" v-text="item.t"></span>-->
+<!--                </li>-->
+<!--              </ul>-->
+<!--            </vue-seamless-scroll>-->
+          </el-card>
+        </div>
+      </el-card>
+
+      <!-- #1跳转-风险预警-查看风险统计 -->
+      <!-- 待完成 -->
+      <!-- #3跳转-异常预警-查看异常统计 -->
+      <!-- 待完成 -->
+
+      <!-- #1弹窗-风险预警-查看单条信息详情 -->
+      <el-dialog  :visible.sync="detailsdialog1" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:100% ;margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">预警详情-风险个体</span>
+          <el-table class='detail_table' :data="tableData_detail_1_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="215"   >
+                <el-table-column v-for='(val,key) in tableLabel_detail_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+          </el-table>
+            <div>
+                <el-table class='detail_table'
+                    :data="tableData_detail_1_2"
+                    style="width: 100%"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+
+
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center">
+
+                    <el-table-column
+                    prop="name"
+                    label="公司名称"
+                    width="100">
+                  </el-table-column>
+                  <el-table-column label="风险水平">
+                    <el-table-column
+                      prop="财务杠杆"
+                      label="财务杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="经营杠杆"
+                      label="经营杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="综合杠杆"
+                      label="综合杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="流动比率"
+                      label="流动比率"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                  </el-table-column>
+                    <el-table-column label="（一）流动风险">
+                      <el-table-column
+                        prop="速动比率"
+                        label="速动比率"
+                        sortable
+                        width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="应收账款周转天数(天)"
+                        label="应收账款周转天数（天）"
+                        width="100">
+                      </el-table-column>
+                      <el-table-column
+                        prop="流动风险综合指数"
+                        label="流动风险综合指数"
+                        width="120"
+                        sortable>
+                      </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（二）市场风险">
+                      <el-table-column
+                        prop="在险价值"
+                        label="在险价值"
+                        sortable
+                        width="120">
+                      </el-table-column>
+                    </el-table-column>
+
+                      <el-table-column label="（三）经营风险">
+                        <el-table-column
+                          prop="资产收益率标准差"
+                          label="资产收益率标准差"
+                          sortable
+                          width="120">
+                        </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（四）信用风险">
+                        <el-table-column
+                          prop="资产负债率"
+                          label="资产负债率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                        <el-table-column
+                          prop="投资盈利率"
+                          label="投资盈利率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                    </el-table-column>
+                  <el-table-column
+                      prop="声誉风险综合指数"
+                      label="声誉风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="政策风险综合指数"
+                      label="政策风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="法律风险综合指数"
+                      label="法律风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="操作风险综合指数"
+                      label="操作风险"
+                      width="100">
+                  </el-table-column>
+                    <el-table-column
+                    prop="综合风险等级"
+                    label="综合风险等级"
+                    width="100">
+                  </el-table-column>
+                </el-table>
+            </div>
+        </el-card>
+      </el-dialog>      
+      <!-- #2弹窗-异常预警-查看单条信息详情 -->
+      <el-dialog  :visible.sync="detailsdialog2" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:100%;margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">预警详情-风险个体</span>
+          <el-table class='detail_table' :data="tableData_detail_2_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="215"   >
+                <el-table-column v-for='(val,key) in tableLabel_detail_2_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+          </el-table>
+          <div style="display:flex;">
+              <el-divider direction="vertical" class="sublabel"></el-divider>
+              <span class='title'>异常关联分析</span>
+          </div>
+          <div style="height:300px;margin-left: 20px;">图谱</div>
+          <el-table class='detail_table'
+                    :data="tableData_detail_2_2"
+                    style="width: 100%"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+
+
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center"
+                    height="215" >
+                    <el-table-column v-for='(val,key) in tableLabel_detail_2_2' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+                    </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                 
+                  
+                </el-table>
+                <Histogram/>
+              <span style="display:block;text-indent:2em;line-height: 25px;margin: 10px;">
+                股票1在2021-01-01至2021-02-01时间段内，在2021-1-8内达到股价峰值，为26元/每股，比该公司该段时间内平均股价（9元/每股），上涨15元，涨幅188.8%。在股价过高的情况下可能会导致风险增加、股票泡沫、不良收购等多种导致经济不稳定的风险因素的增加，在2021-01-09达到交易量峰值，为231支，比该公司该段时间内平均交易量（121股），上涨110股，涨幅为90.9%。在交易量过高的情况下可能会在一定程度上可能对市场稳定性、公平竞争和投资者信心造成负面影响。
+                
+              </span>
+
+
+
+        </el-card>
+      </el-dialog>
+      <!-- #3弹窗-风险预警-查看全部详情 -->
+      <el-dialog  :visible.sync="detailsdialog_all_1"    width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">预警详情</span>
+          <el-table class='detail_table' :data="tableData_detail_all_risk_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="300"   >
+                <el-table-column v-for='(val,key) in tableLabel_detail_all_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+          </el-table>
+        </el-card>
+
+<!--        暂不需要-->
+<!--          <div style="display:flex;padding-bottom: 10px;">-->
+<!--            <el-divider direction="vertical" class="sublabel"></el-divider>-->
+<!--            <span class='title' >个体风险指数分析</span>-->
+<!--          </div>-->
+<!--          <el-table class='detail_table'-->
+<!--                    :data="tableData_detail_1_2"-->
+<!--                    style="width: 100%"-->
+<!--                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"-->
+<!--                    border-->
+
+
+<!--                    :row-style="{height:'28px'}"-->
+<!--                    :cell-style="{padding:'0px'}"-->
+<!--                    header-row-class-name="active_header"-->
+<!--                    header-cell-class-name="active_header"-->
+<!--                    cell-class-name="content_center">-->
+
+<!--                    <el-table-column-->
+<!--                    prop="name"-->
+<!--                    label="公司名称"-->
+<!--                    width="100">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column label="风险水平">-->
+<!--                    <el-table-column-->
+<!--                      prop="财务杠杆"-->
+<!--                      label="财务杠杆"-->
+<!--                      sortable-->
+<!--                      width="70">-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column-->
+<!--                      prop="经营杠杆"-->
+<!--                      label="经营杠杆"-->
+<!--                      sortable-->
+<!--                      width="70">-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column-->
+<!--                      prop="综合杠杆"-->
+<!--                      label="综合杠杆"-->
+<!--                      sortable-->
+<!--                      width="70">-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column-->
+<!--                      prop="流动比率"-->
+<!--                      label="流动比率"-->
+<!--                      sortable-->
+<!--                      width="70">-->
+<!--                    </el-table-column>-->
+<!--                  </el-table-column>-->
+<!--                    <el-table-column label="（一）流动风险">-->
+<!--                      <el-table-column-->
+<!--                        prop="速动比率"-->
+<!--                        label="速动比率"-->
+<!--                        sortable-->
+<!--                        width="70">-->
+<!--                      </el-table-column>-->
+<!--                      <el-table-column-->
+<!--                        prop="应收账款周转天数(天)"-->
+<!--                        label="应收账款周转天数（天）"-->
+<!--                        width="100">-->
+<!--                      </el-table-column>-->
+<!--                      <el-table-column-->
+<!--                        prop="流动风险综合指数"-->
+<!--                        label="流动风险综合指数"-->
+<!--                        width="120"-->
+<!--                        sortable>-->
+<!--                      </el-table-column>-->
+<!--                    </el-table-column>-->
+
+<!--                    <el-table-column label="（二）市场风险">-->
+<!--                      <el-table-column-->
+<!--                        prop="在险价值"-->
+<!--                        label="在险价值"-->
+<!--                        sortable-->
+<!--                        width="120">-->
+<!--                      </el-table-column>-->
+<!--                    </el-table-column>-->
+
+<!--                      <el-table-column label="（三）经营风险">-->
+<!--                        <el-table-column-->
+<!--                          prop="资产收益率标准差"-->
+<!--                          label="资产收益率标准差"-->
+<!--                          sortable-->
+<!--                          width="120">-->
+<!--                        </el-table-column>-->
+<!--                    </el-table-column>-->
+
+<!--                    <el-table-column label="（四）信用风险">-->
+<!--                        <el-table-column-->
+<!--                          prop="资产负债率"-->
+<!--                          label="资产负债率"-->
+<!--                          sortable-->
+<!--                          width="100">-->
+<!--                        </el-table-column>-->
+
+<!--                        <el-table-column-->
+<!--                          prop="投资盈利率"-->
+<!--                          label="投资盈利率"-->
+<!--                          sortable-->
+<!--                          width="100">-->
+<!--                        </el-table-column>-->
+
+<!--                    </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                      prop="声誉风险综合指数"-->
+<!--                      label="声誉风险"-->
+<!--                      width="100">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                      prop="政策风险综合指数"-->
+<!--                      label="政策风险"-->
+<!--                      width="100">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                      prop="法律风险综合指数"-->
+<!--                      label="法律风险"-->
+<!--                      width="100">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                      prop="操作风险综合指数"-->
+<!--                      label="操作风险"-->
+<!--                      width="100">-->
+<!--                  </el-table-column>-->
+<!--                    <el-table-column-->
+<!--                    prop="综合风险等级"-->
+<!--                    label="综合风险等级"-->
+<!--                    width="100">-->
+<!--                  </el-table-column>-->
+<!--                </el-table>-->
+
+
+      </el-dialog>
+      <!-- #4弹窗-异常预警-查看异常统计 -->
+      <el-dialog  :visible.sync="detailsdialog_all_2" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style="margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">预警详情</span>
+          <el-table class='detail_table' :data="tableData_detail_all_risk_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="500"   >
+                <el-table-column v-for='(val,key) in tableLabel_detail_all_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+          </el-table>
+        </el-card>
+      </el-dialog>
   </div>
+</div>
 </template>
 
 <script>
+import Histogram from "@/components/echarts/Histogram.vue";
+import http from "@/utils/request";
+import vueSeamlessScroll from 'vue-seamless-scroll'
+import {Loading} from "element-ui";
 export default {
+  name:'warning',
   components:{
+    Histogram,
+    vueSeamlessScroll,
   },
   data () {
     return {
+      stockLow:1862,
+      stockMid:442,
+      stockHigh:87,
+      // 滚动窗数据
+      listData: [{
+        'title': '无缝滚动第一行无缝滚动第一行',
+        'date': '2017-12-16',
+        't':'ss'
+      }, {
+        'title': '无缝滚动第二行无缝滚动第二行',
+        'date': '2017-12-16',
+        't':'qq'
+      }, {
+        'title': '无缝滚动第三行无缝滚动第三行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第四行无缝滚动第四行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第五行无缝滚动第五行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第六行无缝滚动第六行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第七行无缝滚动第七行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第八行无缝滚动第八行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第九行无缝滚动第九行',
+        'date': '2017-12-16'
+      }],
+      defaultOption:{
+        step: 0.1, // 数值越大速度滚动越快
+        limitMoveNum: 10, // 开始无缝滚动的数据量 this.dataList.length
+        hoverStop: true, // 是否开启鼠标悬停stop
+        direction: 0, // 0向下 1向上 2向左 3向右
+        openWatch: true, // 开启数据实时监控刷新dom
+        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+      },
+      contentList:[],
+      // 整合收据进行接收
+      formInline1:{
+        market:'stock'
+      },
+      // 表格数据
+      tableData_main_1:[
+        {
+          序号:1,
+          主体名称:'股票1',
+          主体代码:'688001.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'流动风险',
+        },
+        {
+          序号:2,
+          主体名称:'股票3',
+          主体代码:'688002.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'市场风险',
+        },
+      ],
+      tableLabel_main_1: {
+        // 序号: '序号',
+        // 主体名称: '主体名称',
+        code: '主体代码',
+        // 主体类型: '主体类型',
+        industry:'行业',
+        early_warning_time:'预警时刻',
+        warning_type:'风险水平',
+        risk_type:'风险类型',
+
+      },
+        
+      tableData_main_2:[
+        {
+          序号:1,
+          主体名称:'股票1',
+          主体代码:'688001.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'流动风险',
+        },
+        {
+          序号:2,
+          主体名称:'股票2',
+          主体代码:'688002.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'市场风险',
+        },
+      ],
+      tableLabel_main_2: {
+        编码: '序号',
+        // 名称: '主体名称',
+        名称: '主体代码',
+        // 主体类型: '主体类型',
+        // 行业:'行业',
+        监测时间:'预警时刻',
+        异常水平:'异常水平',
+        异常关联类型:'风险类型',
+      },
+
+      //三个表
+      tableLabel1: {
+        编码: '编号',
+        异常关联类型: '异常关联类型',
+        名称: '涉及股票',
+        监测时间: '监测时间',
+        股票价格: '股票价格',
+        交易数量: '交易数量',
+        风险等级: '风险等级',
+      },
+      tableLabel2: {
+        编码: '编号',
+        异常关联类型: '异常关联类型',
+        名称: '涉及主体',
+        监测时间: '监测时间',
+        股票价格: '债券价格',
+        交易数量: '交易数量',
+        风险等级: '风险等级',
+      },
+      tableLabel3: {
+        编码: '编号',
+        异常关联类型: '异常关联类型',
+        涉及商品: '涉及商品',
+        合约名称: '合约名称',
+        监测时间: '监测时间',
+        股票价格: '股票价格',
+        交易数量: '交易数量',
+        风险等级: '风险等级',
+
+      },
+      // 弹窗-表格全部数据
+      tableData_detail_all_risk_1:[
+      {
+        序号: 1,
+        主体名称: '股票1',
+        主体代码: '680001.SH',
+        主体类型: '股票',
+        省份:'北京',
+        行业:'计算机',
+        当前预警时刻:'2023/6/29 10:00',
+        历史预警时刻:'2023/6/21 16:00',
+        预警值:80,
+        预警值同比:'+1',
+        预警类型:'严重',
+        风险类型:'流动风险',
+        风险等级:8,
+        影响力等级:'高',
+        健康等级:'危险',
+
+      },
+
+      ],
+      tableLabel_detail_all_1: 
+      {
+        // 序号: '序号',
+        name: '主体名称',
+        code: '主体代码',
+        // 主体类型: '主体类型',
+        province:'省份',
+        industry:'行业',
+        early_warning_time:'预警时刻',
+        last_time:'历史预警时刻',
+        warning_score:'预警值',
+        increase:'预警值同比',
+        // warning_type:'预警类型',
+        risk_type:'风险类型',
+        warning_type:'风险水平',
+        index:'影响力等级',
+        健康等级:'健康等级',
+
+      },
+      tableData_detail_all_risk_2: [
+      {
+      name:'秦农商行',
+      },
+      {  
+      name:'华夏商行',
+      },
+      ],
+
+      // 弹窗-滑动窗数据
+      tableData_detail_1_1:[
+      {
+        序号: 1,
+        主体名称: '股票1',
+        主体类型: '股票',
+        省份:'北京',
+        行业:'计算机',
+        历史预警时刻:'2023/6/21 16:00',
+        当前预警时刻:'2023/6/29 10:00',
+        预警值:80,
+        预警值同比:'+1',
+        预警类型:'严重',
+        风险类型:'流动风险',
+        风险等级:8,
+        影响力等级:'高',
+        健康等级:'危险',
+
+      },
+
+      ],
+      tableLabel_detail_1: 
+      {
+        序号: '序号',
+        主体名称: '主体名称',
+        主体类型: '主体类型',
+        省份:'省份',
+        行业:'行业',
+        历史预警时刻:'历史预警时刻',
+        当前预警时刻:'当前预警时刻',
+        预警值:'预警值',
+        预警值同比:'预警值同比',
+        预警类型:'预警类型',
+        风险类型:'风险类型',
+        风险等级:'风险等级',
+        影响力等级:'影响力等级',
+        健康等级:'健康等级',
+
+      },
+      tableData_detail_1_2: [
+      {
+      name:'秦农商行',
+      },
+      {  
+      name:'华夏商行',
+      },
+      ],
+      
+      tableData_detail_2_1:[
+      {
+        序号: 1,
+        主体名称: '股票1',
+        主体类型: '股票',
+        省份:'北京',
+        行业:'计算机',
+        历史预警时刻:'2023/6/21 16:00',
+        当前预警时刻:'2023/6/29 10:00',
+        预警值:80,
+        预警值同比:'+1',
+        预警类型:'严重',
+        风险类型:'流动风险',
+        风险等级:8,
+        影响力等级:'高',
+        健康等级:'危险',
+
+      },
+
+      ],
+      tableLabel_detail_2_1: 
+      {
+        序号: '序号',
+        主体名称: '主体名称',
+        主体类型: '主体类型',
+        省份:'省份',
+        行业:'行业',
+        历史预警时刻:'历史预警时刻',
+        当前预警时刻:'当前预警时刻',
+        预警值:'预警值',
+        预警值同比:'预警值同比',
+        预警类型:'预警类型',
+        风险类型:'风险类型',
+        风险等级:'风险等级',
+        影响力等级:'影响力等级',
+        健康等级:'健康等级',
+
+      },
+      tableLabel_detail_2_2: 
+      {
+        编号: '编号',
+        异常主体:'异常主体',
+        关联对象:'关联对象',
+        异常关联类型:'异常关联类型',
+        关联相似度:'关联相似度',
+        涉及事件详情:'涉及事件详情',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'风险等级',
+      },
+      tableData_detail_2_2:[
+      {
+        编号: '',
+        异常主体:'股票1',
+        关联对象:'股票2',
+        异常关联类型:'高频交易',
+        关联相似度:'关联相似度',
+        涉及事件详情:'事件分析',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'',
+      },
+
+      ],
+
+
+      // 判断是否弹窗打开
+      detailsdialog1:false,
+      detailsdialog2:false,
+      detailsdialog_all_1:false,
+      detailsdialog_all_2:false,
+
+      //预警类型
+      warning_type1:'风险预警',
+      warning_type2:'异常预警',
+
+
     }
+ 
   },
   mounted(){
+    let that=this
+    http.get('/warning/get_warning_count/').then((res)=> {
+        this.stockLow=res.data["低风险"]
+      this.stockMid=res.data["中风险"]
+      this.stockHigh=res.data["高风险"]
+    })
+          this.contentList.length=0
+    http.get('/anomaly/item_anomaly/',{params:{
+        sc:this.formInline1.market,
+      }}).then((res)=>{
+
+      for (let i in res.data.data){
+        let tmp={}
+        if (that.formInline1.market!=='future')
+        {tmp['time']=res.data.data[i].监测时间
+        tmp['entity']=res.data.data[i].名称
+        tmp['type']=res.data.data[i].异常关联类型}
+        else {
+          tmp['time']=res.data.data[i].监测时间
+          tmp['entity']=res.data.data[i].涉及商品
+          tmp['type']=res.data.data[i].异常关联类型
+        }
+        this.contentList.push(tmp)
+      }
+      // console.log(this.contentList)
+      // console.log(this.listData)
+    })
+    this.onSubmit1()
   },
   methods:{
+// 调整表格列宽
+  calculateColumnWidth(prop,data) {
+      const text = String(data[0][prop]); // 使用第一行的数据作为示例
+      const calculatedWidth = text.length;
+      // console.log('console.log(calculatedWidth):',calculatedWidth)
+      if(calculatedWidth>10 && calculatedWidth<=50){
+        const baseWidth= 20 + calculatedWidth * 0.5
+        return `${baseWidth}px`;
+      }
+      if(calculatedWidth<=10){
+        const baseWidth= 15
+        return `${baseWidth}px`;
+      }
+      else{
+        const baseWidth= 20 + calculatedWidth * 0.5
+        return `${baseWidth}px`;
+      }
+ },
+
+
+    onSubmit1(){
+      http.get('/anomaly/item_anomaly/',{params:{
+          sc:this.formInline1.market,
+        }}).then((res)=>{
+        this.tableData_main_2=res.data.data
+      })
+      http.get('/warning/risk_warning/',{params:{
+          market: this.formInline1.market,
+        }}).then((res)=>{
+        this.tableData_main_1=res.data
+      })
+    },
+    // 1、风险/异常单条数据查看详情
+    detail1(warning_type){
+      if(warning_type==='价格波动异常'){
+          this.detailsdialog1 = true//打开弹窗
+      }
+      if (warning_type==='高频交易异常') {
+        this.detailsdialog2 = true//打开弹窗
+        
+      }
+         
+    },
+     // 2、风险预警-查看全部详情
+     detail2(){
+       this.$message({
+         showClose: true,
+         message: '请稍候',
+         type: 'info'
+       });
+       let options={
+         text:'请稍等'
+       }
+       let loadingInstance = Loading.service(options);
+       http.get('/warning/risk_warning_detail/',{params:{
+           market: this.formInline1.market,
+         }}).then((res)=>{
+           // unicode?
+         this.tableData_detail_all_risk_1=eval(unescape(res.data.replace(/\\u/g, '%u')))
+
+         // this.tableData_detail_all_risk_1=res.data
+         loadingInstance.close()
+         this.detailsdialog_all_1 = true//打开弹窗
+       }).finally(()=>loadingInstance.close())
+
+    },
+     // 4、异常预警-查看全部详情
+     detail3(){  
+      this.detailsdialog_all_2 = true//打开弹窗
+    },
+
+    // 1、风险预警-查看风险统计
+    statistics1(){
+      // 页面跳转
+    },
+    // 2、异常预警-查看异常统计
+    statistics3(){
+      // this.detailsdialog3 = true//打开弹窗
+    },
+   
+    // 打开弹窗图像
+    open(){
+              // this.$nextTick(() => {
+              // //  执行echarts方法
+              //   this.initEcharts()
+              // })
+            },
+    
   },
+  watch:{
+    'formInline1.market': {
+      handler() {
+        this.contentList.length = 0
+          http.get('/anomaly/item_anomaly/', {
+            params: {
+              sc: this.formInline1.market,
+            }
+          }).then((res) => {
+            for (let i in res.data.data) {
+              let tmp = {}
+              tmp.time = res.data.data[i].监测时间
+              tmp.entity = res.data.data[i].名称
+              tmp.type = res.data.data[i].异常关联类型
+              this.contentList.push(tmp)
+      }
+    })
+    }
+  }
+  }
 }
 </script>
 
-<style lang='less' scoped>
+<style lang='scss' scoped>
+.wrap {
+  
+  // height: 270px;
+  width: 100%;
+  margin: 0 auto;
+  overflow: hidden;
+  ul {
+    list-style: none;
+    padding: 10px;
+    // padding: 0;
+    margin: 0 auto;
+    li,
+    //span {
+    //  display: block;
+    //  height: 30px;
+    //  line-height: 30px;
+    //  display: flex;
+    //  justify-content: space-between;
+    //  font-size: 15px;
+    //}
+    span {
+      display: inline-block;
+      height: 30px;
+      line-height: 30px;
+      display: flex;
+      // width: 550px;
+      white-space: normal;
+      word-break: break-all;
+      justify-content: space-between;
+      font-size: 15px;
+    }
+  }
+}
+.form{//产品搜索栏
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:5px; 
+    margin-bottom:0px; 
+    // height: 40px;
+    margin-left: 50px;
+    padding: 0px;
+    .el-form-item {
+    margin-bottom: 5px;
+    }
+  }
 
+.my-element {
+  background-image: url('~@/assets/card.png');
+  // width:100%;			//大小设置为100%
+  // height:100%;			//大小设置为100%
+  // position:fixed;
+  background-size:100% 100%;
+  margin-left: 20px;
+  margin-right: 20px;
+  margin-top: 20px;
+
+
+
+}
+.tirCard {
+  display:flex;
+  justify-content:space-between;
+}
+.tirCircle{
+  display:flex;
+  justify-content:space-between;
+  margin-left: 20px;
+  margin-right: 30px;
+  .circle_low {
+    background: #dffbee;
+    border: 0.7em solid #4dca8e;
+    border-radius: 50%;
+    // box-shadow: 0.375em 0.375em 0 0 rgba(15, 28, 63, 0.125);
+    height: 5em;
+    width: 5em;
+    // margin-left: 20px;
+  }
+  .circle_mid {
+    background: #fdf6e5;
+    border: 0.7em solid #f1c049; 
+    border-radius: 50%;
+    // box-shadow: 0.375em 0.375em 0 0 rgba(15, 28, 63, 0.125);
+    height: 5em;
+    width: 5em;
+
+  }
+  .circle_high {
+    background: #fce0ee;
+    border: 0.7em solid #c43434cc;
+    border-radius: 50%;
+    // box-shadow: 0.375em 0.375em 0 0 rgba(15, 28, 63, 0.125);
+    height: 5em;
+    width: 5em;
+    // margin-right: 20px;
+  }
+}
+.tirText{
+  display:flex;
+  justify-content:space-between;
+  margin-left: 45px;
+  margin-right: 60px;
+}
+
+
+.one_twins_card{
+    margin-top:0px;
+    margin-bottom:10px;
+    margin-left: 10px;
+    margin-right: 10px;
+    display:flex;
+    justify-content:space-between;//左右贴边
+    .el-card {
+      width:49.5%;
+    } 
+    .el-col-2 {
+     width: 2%;
+
+  }
+}
+.sublabel{ // 小标签标识
+    // font-size: 13px;
+    // padding:2px;
+    margin-top:10px;
+    background-color: rgba(2, 167, 240, 0.5);
+    width: 5px; 
+    height: 35px;
+
+    
+  }
+.title{
+    padding-left: 4px;
+    margin-top:15px;
+    font-weight: bold;//字体加粗
+    display:flex;
+    justify-content:flex-start
+}
+/deep/ .text{
+      color:rgba(2, 167, 240, 0.729411764705882);
+      margin-top:15px;
+      padding: 10px;
+      padding-bottom: 5px;
+      display:flex;
+    // justify-content:right;
+    }
+/deep/ .text_detail{
+      color:rgba(2, 167, 240, 0.729411764705882);
+      cursor: pointer;
+    // justify-content:right;
+    }
+
+  
+
+
+
+
+
+.table{
+  font-size: 12px;
+  margin: 2px 10px 2px 10px;//返回表格添加间隙 上 右
+  // padding-right:10px;
+}
+.detail_table{
+  margin-top: 15px;
+  margin-left: 10px;
+  margin-right: 0px;
+/deep/ .el-table {
+  width: 98.5% !important;
+}
+}
+  // 右侧空只能这样调整，左侧必须用margin
+  /deep/ .el-table {
+    width: 97.5% !important;
+    // margin-right: 10px;
+  }
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 1px 1px 1px; 
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0; 
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #333333;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+
+
+
+    .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
 </style>
diff --git a/src/views/预警服务old.vue b/src/views/预警服务old.vue
new file mode 100644
index 0000000..c32bcde
--- /dev/null
+++ b/src/views/预警服务old.vue
@@ -0,0 +1,1090 @@
+<!-- 预警服务主页面 -->
+<template>
+  <div>
+    <div class="one">
+      <el-card style='height: 360px;' :body-style={padding:0}> 
+       <!-- height:400px -->
+       <!-- 1、上标 -->
+        <span class="superscript" style="width: 20px; height: 40px;">整体风险概括</span>
+        <!-- 2、卡片x3 -->
+        <div class="tirCard">
+          <!-- 股票市场 -->
+          <div class="my-element" style="width: 380px; height: 250px;">
+            <h4 style="padding-left: 50px;">股票市场</h4>
+            <div class="tirCircle">
+              <div class="circle_low">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">{{ stockLow }}</div>
+              </div>
+              <div class="circle_mid">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">{{ stockMid }}</div>
+              </div>
+              <div class="circle_high">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">{{ stockHigh }}</div>
+              </div>
+            </div>
+            <div class="tirText"> 
+              <span>低风险</span>
+              <span>中风险</span>
+              <span>高风险</span>
+            </div>
+
+            <div>
+              <h5 style="display: flex;justify-content:center">综合风险水平       95</h5>
+            </div>
+
+
+          </div>
+
+          <!-- 债券市场 -->
+          <div class="my-element" style="width: 380px; height: 250px;">
+            <h4 style="padding-left: 50px;">债券市场</h4>
+            <div class="tirCircle">
+              <div class="circle_low">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">1862</div>
+              </div>
+              <div class="circle_mid">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">441</div>          
+              </div>
+              <div class="circle_high">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">87</div>
+              </div>
+            </div>
+            <div class="tirText"> 
+              <span>低风险</span>
+              <span>中风险</span>
+              <span>高风险</span>
+            </div>
+            <div>
+              <h5 style="display: flex;justify-content:center">综合风险水平       95</h5>
+            </div>
+          </div>
+          <!-- 期货市场 -->
+          <div class="my-element" style="width: 380px; height: 250px;">
+            <h4 style="padding-left: 50px;">期货市场</h4>
+            <div class="tirCircle">
+              <div class="circle_low">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">1862</div>
+              </div>
+              <div class="circle_mid">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">441</div>          
+              </div>
+              <div class="circle_high">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">87</div>
+              </div>
+            </div>
+            <div class="tirText"> 
+              <span>低风险</span>
+              <span>中风险</span>
+              <span>高风险</span>
+            </div>
+            <div>
+              <h5 style="display: flex;justify-content:center">综合风险水平       95</h5>
+            </div>
+          </div>
+
+        </div>
+        <!-- 3、总结语句 -->
+        <span style="margin: 10px;padding-left:20px;padding-right:20px;display: inline-block;">
+          &#8194 &#8194中国资本市场主要由股票市场、债券市场和期货市场组成，
+          其中股票市场份额占比为 50%，
+          债券市场份额占比为 30%、
+          期货市场份额占比为20%，
+          整体市场风险水平评估为 89，属于 低风险</span>
+
+          <!--  &#32; == 普通的英文半角空格
+                &#160; == &nbsp; == &#xA0; == no-break space （普通的英文半角空格但不换行）
+                &#12288; == 中文全角空格 （一个中文宽度）
+                &#8194; == &ensp; == en空格 （半个中文宽度）
+                &#8195; == &emsp; == em空格 （一个中文宽度）
+                &#8197; == 四分之一em空格 （四分之一中文宽度） -->
+      </el-card>
+    </div>
+
+  <div class="two">
+      <el-card style='height: 800px;margin-top:5px' :body-style={padding:0} > 
+       <!-- height:400px -->
+       <!-- 1、上标 -->
+        <span class="superscript" style="width: 20px; height: 40px;">预警服务</span>
+       <!-- 2、搜索栏 -->
+        <div class="form">
+          <el-form :inline="true"  class="demo-form-inline" :model="formInline1" ref="formInline">
+            <el-form-item label="预警市场">
+              <el-select  v-model="formInline1.market" size="mini">
+                <el-option label="股票" value="stock"></el-option>
+                <el-option label="债券" value="bond"></el-option>
+                <el-option label="期货" value="future"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button class="grayish_btn" @click="onSubmit1" size="mini">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <!-- 3、内容 -->
+        <div class="one_twins_card">
+          <!-- 一左 -->
+          <el-card style=" height:600px;width: 68%;" :body-style={padding:0}>         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+            <!--(1)风险预警  -->
+            <div style="display:flex;justify-content:space-between;">
+              <div style="display:flex;padding-bottom: 10px;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title' >风险预警</span>
+              </div>
+              <div style="display:flex;">
+                <span class="text"  v-on:click="statistics1()">查看风险统计</span>
+                <span class="text"  v-on:click="detail2()">查看全部详情</span>
+              </div>
+            </div>
+            <el-table class='table' :data="tableData_main_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="215"
+                    >
+                <el-table-column v-for='(val,key) in tableLabel_main_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <!--(2)异常预警 -->
+            <div style="display:flex;justify-content:space-between;">
+              <div style="display:flex;padding-bottom: 10px;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title' >异常预警</span>
+              </div>
+              <div style="display:flex;">
+                <span class="text"  v-on:click="statistics3()">查看异常统计</span>
+                <span class="text"  v-on:click="detail3()">查看全部详情</span>
+              </div>
+            </div>
+<!--            v-if动态选择表类型-->
+            <el-table class='table' :data="tableData_main_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                      v-if="formInline1.market==='stock'"
+                  height="215"   >
+                <el-table-column  v-for='(val,key) in tableLabel1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_2)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <el-table class='table' :data="tableData_main_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                      border
+
+                      :row-style="{height:'28px'}"
+                      :cell-style="{padding:'0px'}"
+                      header-row-class-name="active_header"
+                      header-cell-class-name="active_header"
+                      cell-class-name="content_center"
+                      v-if="formInline1.market==='bond'"
+                      height="215"   >
+              <el-table-column  v-for='(val,key) in tableLabel2' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_2)">
+
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <el-table class='table' :data="tableData_main_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                      border
+
+                      :row-style="{height:'28px'}"
+                      :cell-style="{padding:'0px'}"
+                      header-row-class-name="active_header"
+                      header-cell-class-name="active_header"
+                      cell-class-name="content_center"
+                      v-if="formInline1.market==='future'"
+                      height="215"   >
+              <el-table-column  v-for='(val,key) in tableLabel3' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_2)">
+
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+
+
+          </el-card>
+          
+          <!-- 一右 -->
+          <el-card style=" height:600px;width: 31%;" :body-style={padding:0} overflow:hidden >
+            <div style="display:flex;">
+              <el-divider direction="vertical" class="sublabel"></el-divider>
+              <span class='title'>预警提示</span>
+            </div>
+            
+
+
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/29 16:00股票1监测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/2916:00股票1检测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/29 16:00股票1检测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/29 16:00股票1检测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/29 16:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/2916:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/2916:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/29 16:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+
+            <vue-seamless-scroll :data="contentList" class="wrap"  >
+<!--            <div v-for="(val,key) in contentList" :key="key" style="padding: 5px;">【{{warning_type2}}】{{val.time}},{{val.entity}}检测到{{val.type}}<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+              <ul class="item">
+                <li v-for="(item, index) in contentList" :key="index">
+                  <span class="time" v-text="item.time"></span>
+                  <span class="entity" v-text="item.entity"></span>
+                  <span class="type" v-text="item.type"></span>
+<!--                  <span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span>-->
+                </li>
+              </ul>
+            </vue-seamless-scroll>
+<!--            <vue-seamless-scroll :data="listData" class="warp">-->
+<!--              <ul class="item">-->
+<!--                <li v-for="(item, index) in listData" :key="index">-->
+<!--                  <span class="title" v-text="item.title"></span>-->
+<!--                  <span class="date" v-text="item.date">检测大</span>-->
+<!--                  <span class="t" v-text="item.t"></span>-->
+<!--                </li>-->
+<!--              </ul>-->
+<!--            </vue-seamless-scroll>-->
+          </el-card>
+        </div>
+      </el-card>
+
+      <!-- #1跳转-风险预警-查看风险统计 -->
+      <!-- 待完成 -->
+      <!-- #3跳转-异常预警-查看异常统计 -->
+      <!-- 待完成 -->
+
+      <!-- #1弹窗-风险预警-查看单条信息详情 -->
+      <el-dialog  :visible.sync="detailsdialog1" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:100% ;margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">预警详情-风险个体</span>
+          <el-table class='detail_table' :data="tableData_detail_1_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="215"   >
+                <el-table-column v-for='(val,key) in tableLabel_detail_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <div>
+                <el-table class='detail_table'
+                    :data="tableData_detail_1_2"
+                    style="width: 100%"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+
+
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center">
+
+                    <el-table-column
+                    prop="name"
+                    label="公司名称"
+                    width="100">
+                  </el-table-column>
+                  <el-table-column label="风险水平">
+                    <el-table-column
+                      prop="财务杠杆"
+                      label="财务杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="经营杠杆"
+                      label="经营杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="综合杠杆"
+                      label="综合杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="流动比率"
+                      label="流动比率"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                  </el-table-column>
+                    <el-table-column label="（一）流动风险">
+                      <el-table-column
+                        prop="速动比率"
+                        label="速动比率"
+                        sortable
+                        width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="应收账款周转天数(天)"
+                        label="应收账款周转天数（天）"
+                        width="100">
+                      </el-table-column>
+                      <el-table-column
+                        prop="流动风险综合指数"
+                        label="流动风险综合指数"
+                        width="120"
+                        sortable>
+                      </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（二）市场风险">
+                      <el-table-column
+                        prop="在险价值"
+                        label="在险价值"
+                        sortable
+                        width="120">
+                      </el-table-column>
+                    </el-table-column>
+
+                      <el-table-column label="（三）经营风险">
+                        <el-table-column
+                          prop="资产收益率标准差"
+                          label="资产收益率标准差"
+                          sortable
+                          width="120">
+                        </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（四）信用风险">
+                        <el-table-column
+                          prop="资产负债率"
+                          label="资产负债率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                        <el-table-column
+                          prop="投资盈利率"
+                          label="投资盈利率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                    </el-table-column>
+                  <el-table-column
+                      prop="声誉风险综合指数"
+                      label="声誉风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="政策风险综合指数"
+                      label="政策风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="法律风险综合指数"
+                      label="法律风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="操作风险综合指数"
+                      label="操作风险"
+                      width="100">
+                  </el-table-column>
+                    <el-table-column
+                    prop="综合风险等级"
+                    label="综合风险等级"
+                    width="100">
+                  </el-table-column>
+                </el-table>
+            </div>
+        </el-card>
+      </el-dialog>      
+      <!-- #2弹窗-异常预警-查看单条信息详情 -->
+      <el-dialog  :visible.sync="detailsdialog2" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:100%;margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">预警详情-风险个体</span>
+          <el-table class='detail_table' :data="tableData_detail_2_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="215"   >
+                <el-table-column v-for='(val,key) in tableLabel_detail_2_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+          </el-table>
+          <div style="display:flex;">
+              <el-divider direction="vertical" class="sublabel"></el-divider>
+              <span class='title'>异常关联分析</span>
+          </div>
+          <div style="height:300px;margin-left: 20px;">图谱</div>
+          <el-table class='detail_table'
+                    :data="tableData_detail_2_2"
+                    style="width: 100%"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+
+
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center"
+                    height="215" >
+                    <el-table-column v-for='(val,key) in tableLabel_detail_2_2' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+                    </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                 
+                  
+                </el-table>
+                <Histogram/>
+              <span style="display:block;text-indent:2em;line-height: 25px;margin: 10px;">
+                股票1在2021-01-01至2021-02-01时间段内，在2021-1-8内达到股价峰值，为26元/每股，比该公司该段时间内平均股价（9元/每股），上涨15元，涨幅188.8%。在股价过高的情况下可能会导致风险增加、股票泡沫、不良收购等多种导致经济不稳定的风险因素的增加，在2021-01-09达到交易量峰值，为231支，比该公司该段时间内平均交易量（121股），上涨110股，涨幅为90.9%。在交易量过高的情况下可能会在一定程度上可能对市场稳定性、公平竞争和投资者信心造成负面影响。
+                
+              </span>
+
+
+
+        </el-card>
+      </el-dialog>
+      <!-- #3弹窗-风险预警-查看全部详情 -->
+      <el-dialog  :visible.sync="detailsdialog_all_1" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:300px;margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">风险预警详情</span>
+        </el-card>
+      </el-dialog>
+      <!-- #4弹窗-异常预警-查看异常统计 -->
+      <el-dialog  :visible.sync="detailsdialog_all_2" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:300px;margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">all-2</span>
+        </el-card>
+      </el-dialog>
+  </div>
+</div>
+</template>
+
+<script>
+import Histogram from "@/components/echarts/Histogram.vue";
+import http from "@/utils/request";
+import vueSeamlessScroll from 'vue-seamless-scroll'
+export default {
+  components:{
+    Histogram,
+    vueSeamlessScroll,
+  },
+  data () {
+    return {
+      stockLow:1862,
+      stockMid:442,
+      stockHigh:87,
+      listData: [{
+        'title': '无缝滚动第一行无缝滚动第一行',
+        'date': '2017-12-16',
+        't':'ss'
+      }, {
+        'title': '无缝滚动第二行无缝滚动第二行',
+        'date': '2017-12-16',
+        't':'qq'
+      }, {
+        'title': '无缝滚动第三行无缝滚动第三行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第四行无缝滚动第四行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第五行无缝滚动第五行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第六行无缝滚动第六行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第七行无缝滚动第七行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第八行无缝滚动第八行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第九行无缝滚动第九行',
+        'date': '2017-12-16'
+      }],
+      defaultOption:{
+        step: 0.1, // 数值越大速度滚动越快
+        limitMoveNum: 10, // 开始无缝滚动的数据量 this.dataList.length
+        hoverStop: true, // 是否开启鼠标悬停stop
+        direction: 0, // 0向下 1向上 2向左 3向右
+        openWatch: true, // 开启数据实时监控刷新dom
+        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+      },
+      contentList:[],
+      // 整合收据进行接收
+      formInline1:{
+        market:'stock'
+      },
+      // 表格数据
+      tableData_main_1:[
+        {
+          序号:1,
+          主体名称:'股票1',
+          主体代码:'688001.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'流动风险',
+        },
+        {
+          序号:2,
+          主体名称:'股票2',
+          主体代码:'688002.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'市场风险',
+        },
+      ],
+      tableLabel_main_1: {
+        序号: '序号',
+        主体名称: '主体名称',
+        主体代码: '主体代码',
+        主体类型: '主体类型',
+        行业:'行业',
+        当前预警时刻:'当前预警时刻',
+        预警类型:'预警类型',
+        风险类型:'风险类型',
+
+      },
+        
+      tableData_main_2:[
+        {
+          序号:1,
+          主体名称:'股票1',
+          主体代码:'688001.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'流动风险',
+        },
+        {
+          序号:2,
+          主体名称:'股票2',
+          主体代码:'688002.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'市场风险',
+        },
+      ],
+      tableLabel_main_2: {
+        编码: '序号',
+        // 名称: '主体名称',
+        名称: '主体代码',
+        // 主体类型: '主体类型',
+        // 行业:'行业',
+        监测时间:'当前预警时刻',
+        异常水平:'异常水平',
+        异常关联类型:'风险类型',
+      },
+
+      //三个表
+      tableLabel1: {
+        编码: '编号',
+        异常关联类型: '异常关联类型',
+        名称: '涉及股票',
+        监测时间: '监测时间',
+        股票价格: '股票价格',
+        交易数量: '交易数量',
+        风险等级: '风险等级',
+      },
+      tableLabel2: {
+        编码: '编号',
+        异常关联类型: '异常关联类型',
+        名称: '涉及主体',
+        监测时间: '监测时间',
+        股票价格: '债券价格',
+        交易数量: '交易数量',
+        风险等级: '风险等级',
+      },
+      tableLabel3: {
+        编码: '编号',
+        异常关联类型: '异常关联类型',
+        涉及商品: '涉及商品',
+        合约名称: '合约名称',
+        监测时间: '监测时间',
+        股票价格: '股票价格',
+        交易数量: '交易数量',
+        风险等级: '风险等级',
+
+      },
+      tableData_detail_1_1:[
+      {
+        序号: 1,
+        主体名称: '股票1',
+        主体类型: '股票',
+        省份:'北京',
+        行业:'计算机',
+        历史预警时刻:'2023/6/21 16:00',
+        当前预警时刻:'2023/6/29 10:00',
+        预警值:80,
+        预警值同比:'+1',
+        预警类型:'严重',
+        风险类型:'流动风险',
+        风险等级:8,
+        影响力等级:'高',
+        健康等级:'危险',
+
+      },
+
+      ],
+      tableLabel_detail_1: 
+      {
+        序号: '序号',
+        主体名称: '主体名称',
+        主体类型: '主体类型',
+        省份:'省份',
+        行业:'行业',
+        历史预警时刻:'历史预警时刻',
+        当前预警时刻:'当前预警时刻',
+        预警值:'预警值',
+        预警值同比:'预警值同比',
+        预警类型:'预警类型',
+        风险类型:'风险类型',
+        风险等级:'风险等级',
+        影响力等级:'影响力等级',
+        健康等级:'健康等级',
+
+      },
+      tableData_detail_1_2: [
+      {
+      name:'秦农商行',
+      },
+      {  
+      name:'华夏商行',
+      },
+      ],
+      tableData_detail_2_1:[
+      {
+        序号: 1,
+        主体名称: '股票1',
+        主体类型: '股票',
+        省份:'北京',
+        行业:'计算机',
+        历史预警时刻:'2023/6/21 16:00',
+        当前预警时刻:'2023/6/29 10:00',
+        预警值:80,
+        预警值同比:'+1',
+        预警类型:'严重',
+        风险类型:'流动风险',
+        风险等级:8,
+        影响力等级:'高',
+        健康等级:'危险',
+
+      },
+
+      ],
+      tableLabel_detail_2_1: 
+      {
+        序号: '序号',
+        主体名称: '主体名称',
+        主体类型: '主体类型',
+        省份:'省份',
+        行业:'行业',
+        历史预警时刻:'历史预警时刻',
+        当前预警时刻:'当前预警时刻',
+        预警值:'预警值',
+        预警值同比:'预警值同比',
+        预警类型:'预警类型',
+        风险类型:'风险类型',
+        风险等级:'风险等级',
+        影响力等级:'影响力等级',
+        健康等级:'健康等级',
+
+      },
+      tableLabel_detail_2_2: 
+      {
+        编号: '编号',
+        异常主体:'异常主体',
+        关联对象:'关联对象',
+        异常关联类型:'异常关联类型',
+        关联相似度:'关联相似度',
+        涉及事件详情:'涉及事件详情',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'风险等级',
+      },
+      tableData_detail_2_2:[
+      {
+        编号: '',
+        异常主体:'股票1',
+        关联对象:'股票2',
+        异常关联类型:'高频交易',
+        关联相似度:'关联相似度',
+        涉及事件详情:'事件分析',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'',
+      },
+
+      ],
+
+
+      // 判断是否弹窗打开
+      detailsdialog1:false,
+      detailsdialog2:false,
+      detailsdialog_all_1:false,
+      detailsdialog_all_2:false,
+
+      //预警类型
+      warning_type1:'风险预警',
+      warning_type2:'异常预警',
+
+
+    }
+ 
+  },
+  mounted(){
+    let that=this
+    http.get('/warning/get_warning_count/').then((res)=> {
+        this.stockLow=res.data["低风险"]
+      this.stockMid=res.data["中风险"]
+      this.stockHigh=res.data["高风险"]
+    })
+          this.contentList.length=0
+    http.get('/anomaly/item_anomaly/',{params:{
+        sc:this.formInline1.market,
+      }}).then((res)=>{
+
+      for (let i in res.data.data){
+        let tmp={}
+        if (that.formInline1.market!=='future')
+        {tmp['time']=res.data.data[i].监测时间
+        tmp['entity']=res.data.data[i].名称
+        tmp['type']=res.data.data[i].异常关联类型}
+        else {
+          tmp['time']=res.data.data[i].监测时间
+          tmp['entity']=res.data.data[i].涉及商品
+          tmp['type']=res.data.data[i].异常关联类型
+        }
+        this.contentList.push(tmp)
+      }
+      console.log(this.contentList)
+      console.log(this.listData)
+    })
+  },
+  methods:{
+// 调整表格列宽
+  calculateColumnWidth(prop,data) {
+      const text = String(data[0][prop]); // 使用第一行的数据作为示例
+      const calculatedWidth = text.length;
+      // console.log('console.log(calculatedWidth):',calculatedWidth)
+      if(calculatedWidth>10 && calculatedWidth<=50){
+        const baseWidth= 20 + calculatedWidth * 0.5
+        return `${baseWidth}px`;
+      }
+      if(calculatedWidth<=10){
+        const baseWidth= 15
+        return `${baseWidth}px`;
+      }
+      else{
+        const baseWidth= 20 + calculatedWidth * 0.5
+        return `${baseWidth}px`;
+      }
+ },
+
+
+    onSubmit1(){
+      http.get('/anomaly/item_anomaly/',{params:{
+          sc:this.formInline1.market,
+        }}).then((res)=>{
+        this.tableData_main_2=res.data.data
+      })
+      // http.get('/warning/warning_rank/',{params:{
+      //     market: this.formInline1.market,
+      //   }}).then((res)=>{
+      //   this.tableData_main_2=res.data.data
+      // })
+    },
+    // 1、风险/异常单条数据查看详情
+    detail1(warning_type){
+      if(warning_type==='风险预警'){
+          this.detailsdialog1 = true//打开弹窗
+      }
+      if (warning_type==='异常预警') {
+        this.detailsdialog2 = true//打开弹窗
+        
+      }
+         
+    },
+     // 2、风险预警-查看全部详情
+     detail2(){
+      this.detailsdialog_all_1 = true//打开弹窗
+    },
+     // 4、异常预警-查看全部详情
+     detail3(){  
+      this.detailsdialog_all_2 = true//打开弹窗
+    },
+
+    // 1、风险预警-查看风险统计
+    statistics1(){
+      // this.detailsdialog1 = true//打开弹窗
+      // 修改成页面跳转
+    },
+    // 2、异常预警-查看异常统计
+    statistics3(){
+      // this.detailsdialog3 = true//打开弹窗
+    },
+   
+    // 打开弹窗图像
+    open(){
+              // this.$nextTick(() => {
+              // //  执行echarts方法
+              //   this.initEcharts()
+              // })
+            },
+    
+  },
+  watch:{
+    'formInline1.market': {
+      handler() {
+        this.contentList.length = 0
+          http.get('/anomaly/item_anomaly/', {
+            params: {
+              sc: this.formInline1.market,
+            }
+          }).then((res) => {
+            for (let i in res.data.data) {
+              let tmp = {}
+              tmp.time = res.data.data[i].监测时间
+              tmp.entity = res.data.data[i].名称
+              tmp.type = res.data.data[i].异常关联类型
+              this.contentList.push(tmp)
+      }
+    })
+    }
+  }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.wrap {
+  height: 270px;
+  width: 550px;
+  margin: 0 auto;
+  overflow: hidden;
+  ul {
+    list-style: none;
+    padding: 0;
+    margin: 0 auto;
+    li,
+    //span {
+    //  display: block;
+    //  height: 30px;
+    //  line-height: 30px;
+    //  display: flex;
+    //  justify-content: space-between;
+    //  font-size: 15px;
+    //}
+    span {
+      display: inline-block;
+      height: 30px;
+      line-height: 30px;
+      display: flex;
+      width: 550px;
+      white-space: normal;
+      word-break: break-all;
+      justify-content: space-between;
+      font-size: 15px;
+    }
+  }
+}
+.form{//产品搜索栏
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:5px; 
+    margin-bottom:0px; 
+    // height: 40px;
+    margin-left: 50px;
+    padding: 0px;
+    .el-form-item {
+    margin-bottom: 5px;
+    }
+  }
+
+.my-element {
+  background-image: url('~@/assets/card.png');
+  // width:100%;			//大小设置为100%
+  // height:100%;			//大小设置为100%
+  // position:fixed;
+  background-size:100% 100%;
+  margin-left: 20px;
+  margin-right: 20px;
+  margin-top: 20px;
+
+
+
+}
+.tirCard {
+  display:flex;
+  justify-content:space-between;
+}
+.tirCircle{
+  display:flex;
+  justify-content:space-between;
+  margin-left: 20px;
+  margin-right: 30px;
+  .circle_low {
+    background: #dffbee;
+    border: 0.7em solid #4dca8e;
+    border-radius: 50%;
+    // box-shadow: 0.375em 0.375em 0 0 rgba(15, 28, 63, 0.125);
+    height: 5em;
+    width: 5em;
+    // margin-left: 20px;
+  }
+  .circle_mid {
+    background: #fdf6e5;
+    border: 0.7em solid #f1c049; 
+    border-radius: 50%;
+    // box-shadow: 0.375em 0.375em 0 0 rgba(15, 28, 63, 0.125);
+    height: 5em;
+    width: 5em;
+
+  }
+  .circle_high {
+    background: #fce0ee;
+    border: 0.7em solid #c43434cc;
+    border-radius: 50%;
+    // box-shadow: 0.375em 0.375em 0 0 rgba(15, 28, 63, 0.125);
+    height: 5em;
+    width: 5em;
+    // margin-right: 20px;
+  }
+}
+.tirText{
+  display:flex;
+  justify-content:space-between;
+  margin-left: 45px;
+  margin-right: 60px;
+}
+
+
+.one_twins_card{
+    margin-top:0px;
+    margin-bottom:10px;
+    margin-left: 10px;
+    margin-right: 10px;
+    display:flex;
+    justify-content:space-between;//左右贴边
+    .el-card {
+      width:49.5%;
+    } 
+    .el-col-2 {
+     width: 2%;
+
+  }
+}
+.sublabel{ // 小标签标识
+    // font-size: 13px;
+    // padding:2px;
+    margin-top:10px;
+    background-color: rgba(2, 167, 240, 0.5);
+    width: 5px; 
+    height: 35px;
+
+    
+  }
+.title{
+    padding-left: 4px;
+    margin-top:15px;
+    font-weight: bold;//字体加粗
+    display:flex;
+    justify-content:flex-start
+}
+/deep/ .text{
+      color:rgba(2, 167, 240, 0.729411764705882);
+      margin-top:15px;
+      padding: 10px;
+      padding-bottom: 5px;
+      display:flex;
+    // justify-content:right;
+    }
+/deep/ .text_detail{
+      color:rgba(2, 167, 240, 0.729411764705882);
+    // justify-content:right;
+    }
+
+  
+
+
+
+
+
+.table{
+  font-size: 12px;
+  margin: 2px 10px 2px 10px;//返回表格添加间隙 上 右
+  // padding-right:10px;
+}
+.detail_table{
+  margin-top: 15px;
+  margin-left: 10px;
+  margin-right: 0px;
+/deep/ .el-table {
+  width: 98.5% !important;
+}
+}
+  // 右侧空只能这样调整，左侧必须用margin
+  /deep/ .el-table {
+    width: 97.5% !important;
+    // margin-right: 10px;
+  }
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 1px 1px 1px; 
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0; 
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #333333;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+
+
+
+    .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+</style>
diff --git a/src/views/风险传导.vue b/src/views/风险传导.vue
new file mode 100644
index 0000000..efb474d
--- /dev/null
+++ b/src/views/风险传导.vue
@@ -0,0 +1,1260 @@
+<!-- 风险传导 -->
+<template>
+   <div>
+
+
+<!--     加载容器-->
+<!--     <div class="honeycomb" v-if="waitLoad"></div>-->
+        <el-button @click="drawer = true" type="primary" plain style="margin-left: 20px;">更多功能</el-button>
+        风险源：{{source}}
+        <el-drawer
+        title="风险传导条件查询"
+        :visible.sync="drawer"
+        :modal="false"
+        :show-close="true" 
+        :with-header="false">
+
+        <p  style="padding: 0; margin-top:5px; margin-left:12px;margin-bottom: 15px;font-size: 22px;">风险传导条件查询</p>
+        
+        
+        <el-form :inline="true">
+            <!-- 0主要查询 -->
+            <el-form-item label="风险类型:" style="padding: 0; margin: 1px;margin-left:12px ;font-weight: bold;">
+                <el-select v-model="riskSelect" placeholder="流动风险"  size="mini">
+                    <el-option label="流动风险" value="流动风险"></el-option>
+                    <el-option label="市场风险" value="市场风险"></el-option>
+                    <el-option label="经营风险" value="经营风险"></el-option>
+                    <el-option label="信用风险" value="信用风险"></el-option>
+                    <el-option label="资产负债风险" value="资产负债风险"></el-option>
+                    <el-option label="获现风险" value="获现风险"></el-option>
+                </el-select>
+            </el-form-item>
+            
+            <el-form-item label="传导范围:" style="padding: 0; margin: 1px;margin-left:12px ;font-weight: bold;">
+    
+                <el-checkbox :indeterminate="isIndeterminate" v-model="checkAllRange" @change="handleCheckAllChange" style="display: flex-start;">全选</el-checkbox>
+                <el-checkbox-group v-model="checkedRanges" @change="handleCheckedRangesChange" style="display: flex-start;padding: 0;margin: 0 0px 0 1px">
+                    <el-checkbox v-for="range in Ranges" :label="range" :key="range" >{{range}}</el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+
+            <el-form-item label="选择时间:" prop="选择时间" style="padding: 0;margin: 0 0 0 12px;font-weight: bold;">
+                <el-date-picker v-model="date" type="date" placeholder="年/月/日" size="mini"> </el-date-picker>
+            </el-form-item>
+
+            <el-form-item style="padding: 0;margin: 0 0 0 12px;">
+                <el-button  type="primary" plain size="mini" @click="onSubmit1" style="margin-left: 20px;">查询</el-button>
+            </el-form-item>
+
+            
+
+
+
+
+
+
+            
+            <el-dialog :visible.sync="dialogVisible2" width="100%" >弹窗2
+            </el-dialog>
+
+
+            <el-divider content-position="left"></el-divider>
+
+        </el-form>
+
+        </el-drawer>
+     <!--渲染容器-->
+     <div class="graph" ref="graph" id="graph" ></div>
+
+<!--     表格-->
+     <el-dialog :visible.sync="dialogVisible1"  :modal="false" width="100%" >
+       <el-table style="width: 100%" border :data="currentData.slice((currentPage-1)*pageSize,currentPage*pageSize)" empty-text="暂无数据" >
+         <el-table-column
+             type="index"
+             width="40">
+         </el-table-column>
+         <el-table-column
+             prop="name"
+             label="名称"
+             width="200">
+         </el-table-column>
+         <el-table-column
+             prop="val"
+             label="风险值"
+             width="200">
+         </el-table-column>
+       </el-table>
+
+       <!--     分页-->
+       <div class="block" style="margin-top:15px;"  >
+         <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                        :current-page="currentPage"
+
+                        :page-size="pageSize"
+                        layout="total, sizes, prev, pager, next, jumper"
+                        :total="currentData.length">
+         </el-pagination>
+       </div>
+     </el-dialog>
+
+
+     <!--     步骤条-->
+     <el-steps :active="active" finish-status="success" v-if="showStep">
+       <el-step v-for="(s,index) in steps"  :key="index"  :title="s.title"></el-step>
+<!--       <el-step title="步骤 2"></el-step>-->
+<!--       <el-step title="步骤 3"></el-step>-->
+     </el-steps>
+<!--     <el-button style="margin-top: 12px;" @click="next"  icon="el-cion-right">下一步</el-button>-->
+
+
+<!--     <el-form :inline="true">-->
+     <div class="button-container">
+     <button class="flashButton"  @click="next">下一步</button>
+     <div class="toggle-cont">
+       <input class="toggle-input"
+              id="toggle"
+              name="toggle"
+              type="checkbox"
+              v-model="dispalyInfect" />
+       <label class="toggle-label" for="toggle">
+         <div class="cont-label-play">
+           <span class="label-play"></span>
+         </div>
+       </label>
+     </div>
+<!--       <el-form-item style="padding: 0; margin: 10px 0 0 12px;">-->
+         <el-button type="primary" round @click="dialogVisible1 = true" class="button button-right" >当前步的风险节点</el-button>
+         <!--                <el-button type="text" @click="dialogVisible2 = true" style="margin-left:20px">风险源</el-button>-->
+<!--       </el-form-item>-->
+
+     </div>
+    </div>
+
+</template>
+
+<script>
+import {Loading} from "element-ui";
+import http from "@/utils/request";
+import cytoscape from 'cytoscape'
+import expandCollapse from "cytoscape-expand-collapse";
+import euler from "cytoscape-euler";
+const rangeOptions = ['股东', '流通股东', '股权质押', '担保', '格兰杰因果关系'];
+export default {
+  name:'diffus',
+  components: {},
+  data() {
+    return {
+
+      currentPage: 1, // 当前页码
+      total: 20, // 总条数
+      pageSize: 10, // 每页的数据条数
+      activityData:[],
+      source:'',
+      currentData:'',
+      clock:undefined,
+      dispalyInfect:false,
+      table_datas:[],
+      showStep:false,
+      active:0,
+      waitLoad:false,
+      elements_data: { 'nodes': [], 'edges': [] },
+      step: 0,
+      intervalId: null,
+      warningString:'',
+
+      // 控制抽屉是否展开
+      drawer: false,
+      riskSelect: '',
+      conductionRange: '',
+      // 多选框-传导范围
+      checkAllRange: false,
+      checkedRanges: [],
+      Ranges: rangeOptions,
+      isIndeterminate: true,//用以表示 checkbox 的不确定状态，一般用于实现全选的效果
+      // 时间
+      date: '',
+
+      // 弹窗
+      dialogVisible1: false,
+      dialogVisible2: false,
+
+    }
+  },
+
+  watch:{
+    dispalyInfect(newValue){
+
+      if (newValue===true){
+
+        this.$message.info('开始播放')
+        //开始播放
+        this.clock=setInterval(this.next,3000)
+      }
+      if(newValue===false){
+        this.$message.info('暂停播放')
+        clearInterval(this.clock)
+      }
+    },
+
+    $route: {
+      handler: function(old) {
+        if (Object.keys(old.params).length>0){
+          this.sent(old.params.name,old.params.type,'股东,流通股东,股权质押,担保,格兰杰因果关系',old.params.date)
+          this.source=old.params.name
+
+        }
+
+      },
+      immediate: true
+    },
+   //  step(newValue){
+   //    this.currentData=this.table_datas[this.step]
+   //
+   // }
+
+  },
+beforeDestroy() {
+  clearInterval(this.clock)
+    //需要清除
+    },
+  computed: {
+
+    // step改变才会触发steps的计算属性？
+    steps() {
+      const result = [];
+      for (let i = 1; i <= this.step; i++) {
+        result.push({
+          title: '第' + i  + '阶段'
+        });
+      }
+      return result;
+    }
+  },
+  mounted() {
+    this.initGraph()
+  },
+
+  methods: {
+
+
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.currentPage = 1;
+      this.pageSize = val;
+    },
+    //当前页改变时触发 跳转其他页
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.currentPage = val;
+    },
+
+    next() {
+
+      if (this.active=== this.step) {
+
+        this.active = 0;   //回零  ++优先级高与>
+        //初始状态
+        //点击每一个阶段
+        //代表不同的感染程度？ //只有最后一个阶段才会出现，前面都是感染节点
+
+        this.$cy.nodes().removeClass('cr_node');
+        this.$cy.nodes().removeClass('cr_node25');
+        this.$cy.nodes().removeClass('cr_node50');
+        this.$cy.nodes().removeClass('cr_node75');
+        this.$cy.nodes().removeClass('cr_node100');
+
+      }
+
+
+        // var index = $(this).index('.step-icon-txt');
+        this.currentData = this.table_datas[this.active];  //这一阶段的传染节点  和table_datas的下标相对应
+      // console.log(cr_data)
+      // console.log(this.active)
+        //对最后一阶段的节点权重进行排序
+        // let last_index = $('.step-icon-txt').length - 1;
+      let last_data = this.table_datas[this.step-1];
+        last_data.sort(function (a, b) {
+          return (a['val'] - b['val'])
+        });
+        let l = last_data.length;
+      let s25 = last_data.slice(0, parseInt(l * 0.25)),
+            s50 = last_data.slice(parseInt(l * 0.25), parseInt(l * 0.5)),
+            s75 = last_data.slice(parseInt(l * 0.5), parseInt(l * 0.75)),
+            s100 = last_data.slice(parseInt(l * 0.75), l);
+
+        if (this.active < this.step-1) {
+          for (let i = 0; i < this.currentData.length; i++) {
+            let name = this.currentData[i]['name'];
+            this.$cy.nodes().filter(function (element, i) {
+              return element.data('name') === name
+            }).addClass('cr_node')
+
+          }
+        } else
+        {
+
+          //最后阶段
+          for (let i = 0; i < s25.length; i++) {
+            let name = s25[i]['name'];
+            this.$cy.nodes().filter(function (element, i) {
+              return element.data('name') === name
+            }).addClass('cr_node25')
+          }
+          for (let i = 0; i < s50.length; i++) {
+            let name = s50[i]['name'];
+            this.$cy.nodes().filter(function (element, i) {
+              return element.data('name') === name
+            }).addClass('cr_node50')
+          }
+          for (let i = 0; i < s75.length; i++) {
+            let name = s75[i]['name'];
+            this.$cy.nodes().filter(function (element, i) {
+              return element.data('name') === name
+            }).addClass('cr_node75')
+          }
+          for (let i = 0; i < s100.length; i++) {
+            let name = s100[i]['name'];
+            this.$cy.nodes().filter(function (element, i) {
+              return element.data('name') === name
+            }).addClass('cr_node100')
+          }
+        }
+
+      this.active++
+//这里源代码是根据的点击阶段改变了表格展现的数据
+        // //表格
+        // var tableData = [];
+        // // for(var h=0;h<=index;h++)
+        // // {
+        // var con = '';
+        // var dd = table_datas[index];
+        // dd.sort(function (a, b) {
+        //   return (b['val'] - a['val'])
+        // })
+        // for (var i = 0; i < dd.length; i++) {
+        //   con += (dd[i]['name'] + '：' + dd[i]['val'] + '\n');
+        // }
+        //
+        // var d1 = {
+        //   jd: index + 1,
+        //   cons: con
+        // }
+        // tableData.push(d1)
+        // }
+        // $("#info_table").bootstrapTable('destroy');
+        // $('#info_table').bootstrapTable({
+        //   data: tableData,
+        //   toolbar: '#toolbar1',                //工具按钮用哪个容器
+        //   striped: true,                      //是否显示行间隔色
+        //   cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        //   pagination: true,                   //是否显示分页（*）
+        //   sortable: false,                     //是否启用排序
+        //   sortOrder: "asc",                   //排序方式
+        //   locale: "zh-CN", //表格汉化
+        //   // queryParams: oTableInit.queryParams,//传递参数（*）
+        //   sidePagination: "client",           //分页方式：client客户端分页，server服务端分页（*）
+        //   pageNumber: 1,                       //初始化加载第一页，默认第一页
+        //   pageSize: 10,                       //每页的记录行数（*）
+        //   pageList: [10, 25, 50, 100],        //可供选择的每页的行数（*）
+        //   clickToSelect: true,
+        //   showExport: true,                     //是否显示导出
+        //   // exportDataType: $(this).val(),
+        //   exportDataType: "all",              //basic', 'all', 'selected'.
+        //   columns: [
+        //     {
+        //       field: 'jd',
+        //       title: '阶段'
+        //     }, {
+        //       field: 'cons',
+        //       title: '详细信息（公司名称：风险值）'
+        //     }]
+        // });
+        // $('#info_table').bootstrapTable('hideLoading');
+
+
+
+
+
+    },
+
+    initGraph(){
+      if (!cytoscape().expandCollapse) {
+        cytoscape.use(expandCollapse)
+      }
+      if (!cytoscape().euler) {
+        cytoscape.use(euler)
+      }
+      this.$cy = cytoscape({
+            container: document.getElementById('graph'),
+            // ready: function () {
+            // var api = this.expandCollapse({
+            //   layoutBy: {
+            //     name: 'euler',
+            //     randomize: true,
+            //     animate: false
+            //   },
+            //   fisheye: true,
+            //   animate: false,
+            //   ready: function () { },
+            //   undoable: false,
+            //   randomize: false,
+            //
+            //   cueEnabled: true, // Whether cues are enabled
+            //   expandCollapseCueSize: 12, // size of expand-collapse cue
+            //   expandCollapseCueLineSize: 8, // size of lines used for drawing plus-minus icons
+            //   expandCueImage: undefined, // image of expand icon if undefined draw regular expand cue
+            //   collapseCueImage: undefined, // image of collapse icon if undefined draw regular collapse cue
+            //   expandCollapseCueSensitivity: 1, // sensitivity of expand-collapse cues
+            //   allowNestedEdgeCollapse: false
+            // });
+            //api.collapseAll();
+
+          // },
+          style: cytoscape.stylesheet()
+
+          .selector('node[label = "公司"]')   //定义节点的样式
+          .css({ 'background-color': '#d71345' })
+          .selector('node[label = "上市公司"]')
+          .css({ 'background-color': '#ef4136' }) //'shape':'triangle'
+          .selector('node[label = "上市公司-实体企业"]')
+          .css({ 'background-color': '#FF1493' })
+          .selector('node[label = "上市公司-金融机构"]')
+          .css({ 'background-color': '#C71585' })
+          .selector('node[label = "上市公司-金融机构-银行"]')
+          .css({ 'background-color': '#f8aba6' })
+          .selector('node[label = "上市公司-金融机构-证券"]')
+          .css({ 'background-color': '#f05b72' })
+          .selector('node[label = "上市公司-金融机构-保险"]')
+          .css({ 'background-color': '#d93a49' })
+          .selector('node[label = "上市公司-金融机构-信托"]')
+          .css({ 'background-color': '#FF69B4' })
+          .selector('node[label = "上市公司-金融机构-基金"]')
+          .css({ 'background-color': '#DB7093' })
+          .selector('node[label = "上市公司-金融机构-基金-公募基金"]')
+          .css({ 'background-color': '#FFB6C1' })
+          .selector('node[label = "上市公司-金融机构-基金-私募基金"]')
+          .css({ 'background-color': '#FFC0CB' })
+          .selector('node[label = "上市公司-金融机构-其他金融机构"]')
+          .css({ 'background-color': '#D8BFD8' })
+          .selector('node[label = "非上市公司"]')
+          .css({ 'background-color': '#102b6a' })
+          .selector('node[label = "非上市公司-实体企业"]')
+          .css({ 'background-color': '#224b8f' })
+          .selector('node[label = "非上市公司-金融机构"]')
+          .css({ 'background-color': '#2a5caa' })
+          .selector('node[label = "非上市公司-金融机构-银行"]')
+          .css({ 'background-color': '#2b4490' })
+          .selector('node[label = "非上市公司-金融机构-证券"]')
+          .css({ 'background-color': '#426ab3' })
+          .selector('node[label = "非上市公司-金融机构-保险"]')
+          .css({ 'background-color': '#0072E3' })
+          .selector('node[label = "非上市公司-金融机构-信托"]')
+          .css({ 'background-color': '#0080FF' })
+          .selector('node[label = "非上市公司-金融机构-基金"]')
+          .css({ 'background-color': '#46A3FF' })
+          .selector('node[label = "非上市公司-金融机构-基金-公募基金"]')
+          .css({ 'background-color': '#66B3FF' })
+
+          .selector('node[label = "非上市公司-金融机构-基金-私募基金"]')
+          .css({ 'background-color': '#84C1FF' })
+          .selector('node[label = "非上市公司-金融机构-其他金融机构"]')
+          .css({ 'background-color': '#97CBFF' })
+
+          .selector('node[label = "人物"]')
+          .css({ 'background-color': '#e0861a' })
+          .selector('node[label = "人物-普通人物"]')
+          .css({ 'background-color': '#fcaf17' })
+          .selector('node[label = "人物-基金经理"]')
+          .css({ 'background-color': '#faa755' })
+          .selector('node[label = "人物-投资经理"]')
+          .css({ 'background-color': '#f58220' })
+
+          .selector('node[label = "机构-国务院国有资产监督管理委员会"]')
+          .css({ 'background-color': '#2e3a1f' })
+
+          .selector('node[label = "监管机构"]')
+          .css({ 'background-color': '#1d953f' })
+          .selector('node[label = "监管机构-银保监会（局）"]')
+          .css({ 'background-color': '#78a355' })
+          .selector('node[label = "监管机构-证监会（局）"]')
+          .css({ 'background-color': '#7fb80e' })
+          .selector('node[label = "监管机构-人民银行（分行）"]')
+          .css({ 'background-color': '#78a355' })
+          .selector('node[label = "监管机构-食药监局"]')
+          .css({ 'background-color': '#abc88b' })
+          .selector('node[label = "监管机构-网信"]')
+          .css({ 'background-color': '#45b97c' })
+          .selector('node[label = "监管机构-工信"]')
+          .css({ 'background-color': '#007d65' })
+          .selector('node[label = "监管机构-行业协会"]')
+          .css({ 'background-color': '#40835e' })
+
+          .selector('node[label = "交易所"]')
+          .css({ 'background-color': '#3e4145' })
+
+          .selector('node[label = "板块"]')
+          .css({ 'background-color': '#563624' })
+
+          .selector('node[label = "地点"]')
+          .css({ 'background-color': '#2468a2' })
+          .selector('node[label = "地点-国家"]')
+          .css({ 'background-color': '#228fbd' })
+          .selector('node[label = "地点-省"]')
+          .css({ 'background-color': '#33a3dc' })
+          .selector('node[label = "地点-县/区"]')
+          .css({ 'background-color': '#7bbfea' })
+          .selector('node[label = "地点-市"]')
+          .css({ 'background-color': '#90d7ec' })
+
+          .selector('node[label = "行业"]')
+          .css({ 'background-color': '#2e3a1f' })
+          .selector('node[label = "行业-门类"]')
+          .css({ 'background-color': '#454926' })
+          .selector('node[label = "行业-大类"]')
+          .css({ 'background-color': '#726930' })
+          .selector('node[label = "行业-中类"]')
+          .css({ 'background-color': '#4d4f36' })
+
+          .selector('node[label = "产品"]')
+          .css({ 'background-color': '#494e8f' })
+          .selector('node[label = "产品-一般产品"]')
+          .css({ 'background-color': '#585eaa' })
+          .selector('node[label = "产品-服务产品"]')
+          .css({ 'background-color': '#6a6da9' })
+          .selector('node[label = "产品-金融产品"]')
+          .css({ 'background-color': '#6950a1' })
+          .selector('node[label = "产品-金融产品-股票"]')
+          .css({ 'background-color': '#6f60aa' })
+          .selector('node[label = "产品-金融产品-债券"]')
+          .css({ 'background-color': '#6f599c' })
+          .selector('node[label = "产品-金融产品-基金"]')
+          .css({ 'background-color': '#9b95c9' })
+          .selector('node[label = "产品-金融产品-基金--公募"]')
+          .css({ 'background-color': '#afb4db' })
+          .selector('node[label = "产品-金融产品-基金--私募"]')
+          .css({ 'background-color': '#C7C7E2' })
+          .selector('node[label = "产品-金融产品-基金--REITS"]')
+          .css({ 'background-color': '#867892' })
+          .selector('node[label = "产品-金融产品-信托"]')
+          .css({ 'background-color': '#918597' })
+          .selector('node[label = "产品-金融产品-其他"]')
+          .css({ 'background-color': '#6f6d85' })
+
+          .selector('node[label = "学校"]')
+          .css({ 'background-color': '#ffd400' })
+
+          .selector('node[label = "非上市公司其他公司"]')
+          .css({ 'background-color': '#cbc547' })
+
+          .selector('node[label = "未知"]')
+          .css({ 'background-color': '#d9d6c3' })
+
+          // .selector('node.cy-expand-collapse-collapsed-node')
+          //   .style({
+          //       "background-color": "darkblue",
+          //       "shape": "rectangle"
+          //   })
+          .selector(':parent')
+          .style({
+            'background-opacity': 0.1,
+            'border-width': .001
+          })
+          .selector('node')
+          .style({
+            'color': '#999999', //定义节点标签颜色
+            'background-opacity': 1,
+            'font-size': '5px',
+            'width': '17px',
+            'height': '17px',
+
+          })
+          .selector('edge')   //定义边的样式
+          .style({
+            //'label': 'data(relationship)',
+            'target-arrow-shape': 'triangle-backcurve', /*箭头样式*/
+            'target-arrow-size': '0.1px', /*箭头大小*/
+            'target-arrow-color': '#8B8989', /*箭头颜色*/
+            'curve-style': 'bezier', /*线条样式曲线*/
+            'line-color': '#8B8989', /*线条颜色*/
+            'width': '2px', /*线条宽度*/
+            'font-size': '6px', /*标签字体大小*/
+            'color': '#999999', /*标签字体大小*/
+            'text-outline-color': 'white', /*文本轮廓颜色*/
+            'text-outline-width': '1px', /*文本轮廓宽度*/
+            'text-rotation': 'autorotate', /*标签方向*/
+          })
+          .selector('edge.cy-expand-collapse-collapsed-edge')
+          .style(
+              {
+                "text-outline-color": "#ffffff",
+                "text-outline-width": "1px",
+                'label': (e) => {
+                  return '(' + e.data('collapsedEdges').length + ')';
+                },
+                'width': function (edge) {
+                  const n = edge.data('collapsedEdges').length;
+                  return (1 + Math.log2(n)) + 'px';
+                },
+                //'line-opacity':1,
+                'line-style': 'dashed',
+                'line-color': this.setColor4CompoundEdge,
+                'target-arrow-color': this.setColor4CompoundEdge,
+                'target-arrow-shape': this.setTargetArrowShape,
+                'source-arrow-shape':this.setSourceArrowShape,
+                'source-arrow-color': this.setColor4CompoundEdge,
+              })
+          .selector('node:selected')
+          .style({ 'border-color': '#c84e40', 'border-width': "1px", })
+          .selector('.search_node')
+          .style({ 'border-color': '#c84e40', 'border-width': "2px", })
+          .selector('.key_node')
+          .style({
+            'background-color': 'red',
+            'width': 30,
+            'height': 30,
+            shape: 'polygon',
+            'shape-polygon-points': '0 1, 0.8660254037844386 0.5, 0.8660254037844386 -0.5, 0 -1, -0.8660254037844386 -0.5, -0.8660254037844386 0.5',
+
+            animation: true,
+            duration: 1000
+          })
+          .selector('.cr_node')
+          .css({
+            'background-color': '#f05b72', //定义节点标签颜色
+          })
+          .selector('.cr_edge')
+          .style({
+            'target-arrow-color': '#f05b72', /*箭头颜色*/
+            'line-color': '#f05b72' /*线条颜色*/
+          })
+
+          .selector('.cr_node25')
+          .css({
+            'background-color': '#45b97c', //定义节点标签颜色
+          })
+          .selector('.cr_node50')
+          .css({
+            'background-color': '#ffc20e',
+          })
+          .selector('.cr_node75')
+          .css({
+            'background-color': '#f58220',
+          })
+          .selector('.cr_node100')
+          .css({
+            'background-color': '#b22c46', //最严重
+          })
+
+          .selector('edge:selected')
+          .style({
+            'color': '#3165fc', /*标签字体大小*/
+            'target-arrow-color': '#61bffc', /*箭头颜色*/
+            'line-color': '#61bffc', /*线条颜色*/
+            // 'width':'2px',
+          })
+          .selector('.xianshi_label_edge')
+          .style({
+            'label': 'data(relationship)',
+          })
+          .selector('.xianshi_name_node')
+          .style({
+            'content': 'data(name)',
+          })
+          .selector('.mouse_xianshi_name_node')  //鼠标 显示
+          .style({
+            'content': 'data(name)',
+            'font-size': '15px',
+            'color': '#d71345',
+          })
+          .selector('.mouse_xianshi_label_edge')  //显示边
+          .style({
+            'label': 'data(relationship)',
+            'font-size': '15px',
+            'color': '#d71345',
+          })
+          .selector('.light-off')   //高亮样式
+          .style({ 'opacity': '0.1', })    //opacity: 透明度
+          .selector('.highlighted')
+          .style({
+            'background-color': '#65c294',
+            'line-color': '#d71345',
+            'target-arrow-color': '#d71345',
+            'transition-property': 'background-color, line-color, target-arrow-color',
+            'transition-duration': '0.5s',
+            // 'width': '2px'
+          })
+          .selector('.hbnode')
+          .style({
+            'label': '合并节点',
+            'background-color': '#000080', //定义节点标签颜色
+            'background-opacity': 0.8,
+            'font-size': '20px',
+            'width': '30px',
+            'height': '30px',
+          })
+          // .selector('.keynodes')
+          //     .style({'border-color': '#1d953f', 'border-width': "1px",})
+          .selector('.hbnodes_edge')
+          .style({
+            'target-arrow-color': '#ffd400', /*箭头颜色*/
+            'line-color': '#ffd400', /*线条颜色*/
+            'width': '2px',
+          }),
+
+          elements: this.elements_data,
+          layout: {
+        name: 'breadthfirst',
+            directed: true,
+            padding: 30,
+      },   //可选：'breadthfirst', 'circle', 'concentric', 'cose', 'grid','null', 'preset', 'random'
+      zoom: 1,
+          pan: { x: 0, y: 0 },
+      minZoom: 1e-10,
+          maxZoom: 1e10,
+          zoomingEnabled: true, // 是否通过用户事件和编程方式启用缩放图形.
+          userZoomingEnabled: true, // 是否允许用户事件(例如鼠标滚轮,捏合缩放)缩放图形.对此缩放的编程更改不受此选项的影响.
+          panningEnabled: true, // 是否通过用户事件和编程方式启用平移图形.
+          userPanningEnabled: true, // 是否允许用户事件(例如拖动图形背景)平移图形.平移的程序化更改不受此选项的影响.
+          boxSelectionEnabled: true,
+          wheelSensitivity: 0.3, //缩放时更改滚轮灵敏度.这是一个乘法修饰符.因此,0到1之间的值会降低灵敏度(变焦较慢),而大于1的值会增加灵敏度(变焦更快).
+          multiselectionEnabled: true,
+          //selectionType:"additive",
+          touchTapThreshold: 8,
+          desktopTapThreshold: 4,
+          hideEdgesOnViewport: true,
+      // textureOnViewport: true
+    });
+
+
+},
+
+    getRandomColor() {
+      var r = Math.floor(Math.random() * 256);
+      var g = Math.floor(Math.random() * 256);
+      var b = Math.floor(Math.random() * 256);
+      if (r === 255 && g === 255 && b === 255)
+        this.getRandomColor();
+      else
+        return "rgb(" + r + ',' + g + ',' + b + ")";
+    },
+
+   doElemsMultiTypes(elems) {
+  const classDict = {};
+  for (let i = 0; i < elems.length; i++) {
+    classDict[elems[i].data('edgeType')] = true;
+  }
+  return Object.keys(classDict).length > 1;
+},
+ setColor4CompoundEdge(e) {
+  const collapsedEdges = e.data('collapsedEdges');
+  if (this.doElemsMultiTypes(collapsedEdges)) {
+    return '#b3b3b3';
+  }
+  return collapsedEdges[0].style('line-color')
+},
+ setTargetArrowShape(e) {
+  const collapsedEdges = e.data('collapsedEdges');
+  const shapes = {};
+  for (let i = 0; i < collapsedEdges.length; i++) {
+    shapes[collapsedEdges[0].style('target-arrow-shape')] = true;
+  }
+  delete shapes['none'];
+  if (Object.keys(shapes).length < 1) {
+    if (collapsedEdges.sources().length > 1) {
+      return collapsedEdges[0].style('source-arrow-shape');
+    }
+    return 'none';
+  }
+  return Object.keys(shapes)[0];
+},
+ setSourceArrowShape(e) {
+  const collapsedEdges = e.data('collapsedEdges');
+  const shapes = {};
+  for (let i = 0; i < collapsedEdges.length; i++) {
+    shapes[collapsedEdges[0].style('source-arrow-shape')] = true;
+  }
+  delete shapes['none'];
+  if (Object.keys(shapes).length < 1) {
+    if (collapsedEdges.sources().length > 1) {
+      return collapsedEdges[0].style('target-arrow-shape');
+    }
+    return 'none';
+  }
+  return Object.keys(shapes)[0];
+},
+
+
+
+    sent(code, fxlxValue, cdfw_str, time_input) {
+      this.currentData=''
+      this.table_datas=''
+      let that=this
+      console.log(cdfw_str)
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
+      http.get('/risk_model/risk_diff/'
+      ,{params:{
+        type:fxlxValue,
+              range:cdfw_str,
+              date:time_input,
+              code:code,
+
+            }}
+      ).then((res)=>{
+        this.source=res.data.source
+        this.initGraph()
+            this.$cy.elements().remove();
+            let get_data=res
+            // $("#info_table").bootstrapTable('destroy');
+
+            // $('.glyphicon-exclamation-sign').css('display','block').html('(' + get_data['data']['method'] + ')' + '当前风险源：' + get_data['data']['source']);
+            // $('.glyphicon-exclamation-sign').css('display', 'block').html(fxlxValue + '-' + '风险源(由' + get_data['data']['method'].slice(0, 2) + '数据筛选)：' + get_data['data']['source']);
+            this.warningString=fxlxValue + '-' + '风险源(由' + get_data['data']['method'].slice(0, 2) + '数据筛选)：' + get_data['data']['source']
+        this.waitLoad=false
+
+            if (get_data['data']['method'] === '财务报表') {
+              // document.getElementById('a1').innerText = '(财务报表) 当前风险源：' + get_data['data']['source'];
+              // document.getElementById('a1').innerText = fxlxValue + '-' + '风险源(由财务数据筛选)：' + get_data['data']['source'];
+              this.$message({
+                showClose: true,
+                message: this.warningString,
+                type: 'success',
+                duration:5000,
+              });
+
+            }
+
+        let net_datas = get_data['data']['net'];
+        this.table_datas = get_data['data']['table'];
+        // let stepTitles = [];
+
+            this.step=net_datas.length
+            this.showStep=true
+            for (let i = 0; i < net_datas.length; i++) {
+              let info = {"nodes": net_datas[i]['nodes'], "edges": net_datas[i]['edges']}
+              this.$cy.add(info);
+
+              // stepTitles.push('第' + (i + 1) + '阶段');
+              // time_div_cons += '<span data-time='+ i +'>  </span>';
+            }
+
+            // $('.box').html("")
+            // $('.box').step({
+            //   stepDirection: 'x',
+            //   showStepButton: true,
+            //   stepCount: stepTitles.length,
+            //   stepTitles: stepTitles,
+            // });
+
+      //       var tableData = [];
+      //
+      //       var con = '';
+      //       var dd = table_datas[0];
+      //       //dd是源信息 格式如下[
+      // //   {
+      // //     "name": "深圳市天健(集团)股份有限公司",
+      // //       "val": 996055135.6
+      // //   }
+      // // ],
+      //       dd.sort(function (a, b) {
+      //         return (b['val'] - a['val'])
+      //       })
+      //       for (let i = 0; i < dd.length; i++) {
+      //         con += (dd[i]['name'] + '：' + dd[i]['val'] + '\n');
+      //       }
+      //
+      //       var d1 = {
+      //         jd: 1,
+      //         cons: con
+      //       }
+      //       tableData.push(d1)
+
+            // }
+            // $("#info_table").bootstrapTable('destroy');
+            // $('#info_table').bootstrapTable({
+            //   data: tableData,
+            //   toolbar: '#toolbar1',                //工具按钮用哪个容器
+            //   striped: true,                      //是否显示行间隔色
+            //   cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+            //   pagination: true,                   //是否显示分页（*）
+            //   sortable: false,                     //是否启用排序
+            //   sortOrder: "asc",                   //排序方式
+            //   locale: "zh-CN", //表格汉化
+            //   // queryParams: oTableInit.queryParams,//传递参数（*）
+            //   sidePagination: "client",           //分页方式：client客户端分页，server服务端分页（*）
+            //   pageNumber: 1,                       //初始化加载第一页，默认第一页
+            //   pageSize: 10,                       //每页的记录行数（*）
+            //   pageList: [10, 25, 50, 100],        //可供选择的每页的行数（*）
+            //   clickToSelect: true,
+            //   showExport: true,                     //是否显示导出
+            //   // exportDataType: $(this).val(),
+            //   exportDataType: "all",              //basic', 'all', 'selected'.
+            //   columns: [
+            //     {
+            //       field: 'jd',
+            //       title: '阶段'
+            //     }, {
+            //       field: 'cons',
+            //       title: '详细信息（公司名称：风险值）'
+            //     }]
+            // });
+            // $('#info_table').bootstrapTable('hideLoading');
+
+            const layout = this.$cy.layout({
+              name: 'euler',
+              randomize: true,
+              animate: false,
+            });
+            layout.run();
+
+        this.$cy.nodes().filter(function (element, i) {
+              return element.data('name') === that.table_datas[0][0]['name']
+            }).addClass('cr_node')  //传染节点
+
+            // document.getElementById('fade').style.display = 'none';
+            // document.getElementById('light').style.display = 'none';
+            // $("#light_a").attr("disabled", false).css("pointer-events", "auto");
+
+
+
+        loadingInstance.close()
+      }).finally(()=>
+          loadingInstance.close()
+      )
+
+    },
+
+
+    // 多选框-传导范围
+    handleCheckAllChange(val) {
+      this.checkedRanges = val ? rangeOptions : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedRangesChange(value) {
+      let checkedCount = value.length;
+      this.checkAllRange = checkedCount === this.Ranges.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.Ranges.length;
+    },
+    // 查询
+    onSubmit1() {
+
+
+      // var fxlx = document.querySelector("#fxlx");
+      // var fxlxIndex = fxlx.selectedIndex;
+      // var fxlxValue = fxlx.options[fxlxIndex].value;  //风险类型
+
+      // var cdfw = $(".cdfw_label");
+      var cdfw_str = '';
+      for (var i = 0; i < this.checkedRanges.length; i++) {
+        // if (this.checkedRanges[i].checked) {
+          cdfw_str += this.checkedRanges[i] + ","
+        // }
+      }  //传导范围 cdfw_str
+      // cdfw_str += cdfw[cdfw.length-1].value
+      cdfw_str = cdfw_str.substr(cdfw_str.length - 1, 1) === ',' ? cdfw_str.substr(0, cdfw_str.length - 1) : cdfw_str;
+      console.log(cdfw_str)
+      // var time_input = $("#time_input").val();  //选择的时间
+
+      if (this.date === '' || this.riskSelect === "" ||this.checkedRanges===[] ) {
+        alert("请检查时间、传导范围和风险类型！")
+
+      }
+      else {
+        // let options = {
+        //   text: '请稍等'
+        // }
+        // let loadingInstance = Loading.service(options);
+        this.waitLoad=true
+        http.get('/risk_model/risk_gg/',{params: {
+              date:this.date ,
+              wh: this.riskSelect,
+          }
+          }).then((res) => {
+          // console.log(get_data.code,'llllllllllllll')
+          let get_data=res.data
+          // let str = '';
+          // for(let key in get_data.data) {
+          //     str += `<a>${key} ${get_data.data[key].join(', ')}</a><br>`;
+          // }
+          let ks = Object.keys(get_data.data)
+          // if (ks.length == 0)
+          // console.log(typeof (get_data.data))
+          if (typeof get_data.data === "string") {
+            // 无个股事件
+            // document.getElementById('light').style.display = 'none';
+            // document.getElementById('fade').innerText = "正在加载数据";
+            // document.getElementById('a1').innerText = '(财务报表)当前风险源：' + get_data.data;
+
+            //
+            // document.getElementById('a1').innerText = fxlxValue + '-' + '风险源(由财务数据筛选)：' + get_data.data;
+            // document.getElementById('a2').innerText = '';
+            // document.getElementById('a3').innerText = '';
+          } else {
+            // document.getElementById('a1').innerText = ks[0] + get_data.data[ks[0]];
+            // document.getElementById('a2').innerText = ks[1] + get_data.data[ks[1]];
+            // document.getElementById('a3').innerText = ks[2] + get_data.data[ks[2]];
+          }
+          // $("#light_a").attr("disabled", true).css("pointer-events", "none");
+
+          // document.getElementById('light').innerText = str;
+          // setTimeout(function () {
+          //     document.getElementById('fade').style.display = 'none';
+          //     document.getElementById('light').style.display = 'none';
+          // }, 1500)
+          console.log(get_data.code, this.riskSelect, cdfw_str, this.date)
+          this.sent(get_data.code, this.riskSelect, cdfw_str, this.date);
+          // loadingInstance.close()
+// sent(fxlxValue, cdfw_str, time_input);
+
+        }).catch((e)=>{
+          this.waitLoad=false
+          alert(e)}
+        )
+
+      }
+
+
+
+    },
+  }
+}
+</script>
+
+<style lang='less' scoped>
+
+.graph {
+  /*//margin-left: -800px;*/
+  /*  transform: translate(0,0);*/
+  height: 700px;
+  /*width: */
+}
+
+
+.toggle-cont {
+  width: 100px;
+  height: 50px;
+  border-radius: 9999px;
+}
+
+.toggle-cont .toggle-input {
+  display: none;
+}
+
+.toggle-cont .toggle-label {
+  cursor: pointer;
+  position: relative;
+  display: inline-block;
+  padding: 6px;
+  width: 100%;
+  height: 100%;
+  background: #d0f3cb;
+  border-radius: 9999px;
+  box-sizing: content-box;
+  box-shadow: 0px 0px 16px -8px #fefefe;
+}
+
+.toggle-cont .toggle-label .cont-label-play {
+  position: relative;
+  width: 50px;
+  aspect-ratio: 1 / 1;
+  background: rgb(75, 229, 70);
+  border-radius: 9999px;
+  transition: all 0.5s cubic-bezier(1, 0, 0, 1);
+}
+
+.toggle-cont .toggle-input:checked + .toggle-label .cont-label-play {
+  background: #f43f5e;
+  transform: translateX(50px);
+}
+
+.toggle-cont .toggle-label .label-play {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  display: inline-block;
+  width: 24px;
+  aspect-ratio: 1 / 1;
+  background: #fefefe;
+  border-radius: 4px;
+  clip-path: polygon(25% 0, 75% 50%, 25% 100%, 25% 51%);
+  transition: all 0.5s cubic-bezier(1, 0, 0, 1);
+}
+
+.toggle-cont .toggle-input:checked + .toggle-label .label-play {
+  width: 20px;
+  clip-path: polygon(0 0, 100% 0, 100% 100%, 0 100%);
+}
+//input:checked ~ .slider {
+//  background-color: #f6cfb5;
+//}
+
+
+.button-container {
+  display: flex;
+  align-items: center; /* 垂直居中 */
+}
+.button-right {
+  margin-right: 0;
+  margin-left: auto;
+}
+
+.flashButton {
+  margin-right: 10px;
+  padding: 13px 20px;
+  border-radius: 30px;
+  cursor: pointer;
+  border: 0;
+  background-color: white;
+  box-shadow: rgb(0 0 0 / 5%) 0 0 8px;
+  letter-spacing: 1.5px;
+  text-transform: uppercase;
+  font-size: 15px;
+  transition: all 0.5s ease;
+}
+
+.flashButton:hover {
+  letter-spacing: 3px;
+  background-color: hsl(150deg 80% 48%);
+  color: hsl(0, 0%, 100%);
+  box-shadow: rgb(150 220 170) 0px 7px 29px 0px;
+}
+
+.flashButton:active {
+  letter-spacing: 3px;
+  background-color: hsl(150deg 80% 48%);
+  color: hsl(0, 0%, 100%);
+  box-shadow: rgb(150 220 170) 0px 0px 0px 0px;
+  transform: translateY(4px);
+  transition: 100ms;
+}
+
+
+
+    .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+
+    @-webkit-keyframes honeycomb {
+      0%,
+      20%,
+      80%,
+      100% {
+        opacity: 0;
+        -webkit-transform: scale(0);
+        transform: scale(0);
+      }
+
+      30%,
+      70% {
+        opacity: 1;
+        -webkit-transform: scale(1);
+        transform: scale(1);
+      }
+    }
+
+    @keyframes honeycomb {
+      0%,
+      20%,
+      80%,
+      100% {
+        opacity: 0;
+        -webkit-transform: scale(0);
+        transform: scale(0);
+      }
+
+      30%,
+      70% {
+        opacity: 1;
+        -webkit-transform: scale(1);
+        transform: scale(1);
+      }
+    }
+
+    .honeycomb {
+      height: 24px;
+      position: relative;
+      width: 24px;
+    }
+
+    .honeycomb div {
+      -webkit-animation: honeycomb 2.1s infinite backwards;
+      animation: honeycomb 2.1s infinite backwards;
+      background: #f3f3f3;
+      height: 12px;
+      margin-top: 6px;
+      position: absolute;
+      width: 24px;
+    }
+
+    .honeycomb div:after, .honeycomb div:before {
+      content: '';
+      border-left: 12px solid transparent;
+      border-right: 12px solid transparent;
+      position: absolute;
+      left: 0;
+      right: 0;
+    }
+
+    .honeycomb div:after {
+      top: -6px;
+      border-bottom: 6px solid #f3f3f3;
+    }
+
+    .honeycomb div:before {
+      bottom: -6px;
+      border-top: 6px solid #f3f3f3;
+    }
+
+    .honeycomb div:nth-child(1) {
+      -webkit-animation-delay: 0s;
+      animation-delay: 0s;
+      left: -28px;
+      top: 0;
+    }
+
+    .honeycomb div:nth-child(2) {
+      -webkit-animation-delay: 0.1s;
+      animation-delay: 0.1s;
+      left: -14px;
+      top: 22px;
+    }
+
+    .honeycomb div:nth-child(3) {
+      -webkit-animation-delay: 0.2s;
+      animation-delay: 0.2s;
+      left: 14px;
+      top: 22px;
+    }
+
+    .honeycomb div:nth-child(4) {
+      -webkit-animation-delay: 0.3s;
+      animation-delay: 0.3s;
+      left: 28px;
+      top: 0;
+    }
+
+    .honeycomb div:nth-child(5) {
+      -webkit-animation-delay: 0.4s;
+      animation-delay: 0.4s;
+      left: 14px;
+      top: -22px;
+    }
+
+    .honeycomb div:nth-child(6) {
+      -webkit-animation-delay: 0.5s;
+      animation-delay: 0.5s;
+      left: -14px;
+      top: -22px;
+    }
+
+    .honeycomb div:nth-child(7) {
+      -webkit-animation-delay: 0.6s;
+      animation-delay: 0.6s;
+      left: 0;
+      top: 0;
+    }
+</style>
diff --git a/src/views/风险预警.vue b/src/views/风险预警.vue
index 2079da6..35af361 100644
--- a/src/views/风险预警.vue
+++ b/src/views/风险预警.vue
@@ -7,11 +7,11 @@
                                                     <!-- inline="true"表单域在一行 -->
       <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
 
-        <el-form-item label="预警市场">
-          <el-select   v-model="formInline1.market" placeholder="预警市场：" size="mini">
-            <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="预警市场">-->
+<!--          <el-select   v-model="formInline1.market" placeholder="预警市场：" size="mini">-->
+<!--            <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="开始时间">
           <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
         </el-form-item>
@@ -20,7 +20,7 @@
           <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+          <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -28,35 +28,29 @@
     <!-- 3、内容 -->
     <el-row :gutter="20">
       <el-col :span="15">
-        <el-card style=" height:700px;">
+        <el-card style=" height:800px;">
           <!-- 标题&按钮 -->
           <div style="display: flex;justify-content: space-between;"> 
-            <span style="font-size: 18px;font-weight: bold;">各省份风险情况</span>
-            <div>
-              <el-button type="primary" style="margin-right: 10px;" size="mini">高风险地区</el-button>
-              <el-button type="primary" size="mini">风险率攀升</el-button>
-            </div>
+            <span style="font-size: 18px;font-weight: bold;">各省份风险情况（默认近半年数据）</span>
+<!--            <div>-->
+<!--              <el-button class="grayish_btn" style="margin-right: 10px;" size="mini">高风险地区</el-button>-->
+<!--              <el-button class="grayish_btn" size="mini">风险率攀升</el-button>-->
+<!--            </div>-->
           </div>
           <!-- 地图 -->
           <!-- <el-card style=" height:500px;"> -->
-            <region />
+            <region :new-map-data="mapData"/>
           <!-- </el-card> -->
           <!-- 表 -->
           <el-table class='table' :data="tableData1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
             border  
-            
+            height="300" 
             :row-style="{height:'28px'}"
             :cell-style="{padding:'0px'}"
             header-row-class-name="active_header"
             header-cell-class-name="active_header"
             cell-class-name="content_center">
-            <!-- header-row-class-name 表头行 加classname -->
-            <!-- cell-class-name 单元格加名字 -->
-          <!-- border有边框 -->
-              <!-- stripe
-              height="90%"
-              :data="tableData"
-              style="width: 80%;  margin-top:10px; margin-bottom:10px;" -->
+
               <el-table-column v-for='(val,key) in tableLabel1' :prop="key" :label="val" show-overflow-tooltip /><!--插槽里面没有东西就可以用单标签  -->
                                                                             <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
               
@@ -77,18 +71,18 @@
                                                     <!-- inline="true"表单域在一行 -->
             <el-form :inline="true"  :model="formInline2" class="demo-form-inline">
 
-              <el-form-item label="行业">
-                <el-select   v-model="formInline2.industry" placeholder="选择行业" size="mini">
+              <el-form-item label="交易所">
+                <el-select   v-model="formInline2.industry" placeholder="选择交易所" size="mini">
                   <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
                 </el-select>
               </el-form-item>
             <el-form-item>
-                <el-button type="primary" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+                <el-button class="grayish_btn" @click="indusRisk" icon="el-icon-search" size="mini">查询</el-button>
               </el-form-item>
             </el-form>
           </div>
         <!-- <el-card style=" height:200px;"> -->
-          <div ref="echarts_2" style="height:320px;width:660px">
+          <div ref="echarts_2" style="height:320px;width:1000px">
           </div>
         <!-- </el-card> -->
         </el-card>
@@ -96,49 +90,51 @@
       </el-col>
 
       <el-col :span="9">
-        <el-card style=" height:1100px;">
+        <el-card style=" height:1200px;">
           <span style="font-size: 18px;font-weight: bold;">个体风险预警</span>
           <div class="form_small">
                                                     <!-- inline="true"表单域在一行 -->
             <el-form :inline="true"  :model="formInline3" class="demo-form-inline">
 
-              <el-form-item label="行业">
-                <el-select   v-model="formInline3.industry" placeholder="选择行业" size="mini">
+              <el-form-item label="交易所">
+                <el-select   v-model="formInline3.industry" placeholder="选择交易所" size="mini">
                   <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
                 </el-select>
               </el-form-item>
             <el-form-item>
-                <el-button type="primary" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+                <el-button class="grayish_btn" @click="individualRisk" icon="el-icon-search" size="mini">查询</el-button>
               </el-form-item>
             </el-form>
           </div>
 
-          <div >
-            <span>日</span>
-            <span>周</span>
-            <span>月</span>
-          </div>
+<!--          <div >-->
+<!--            <span>日</span>-->
+<!--            <span>周</span>-->
+<!--            <span>月</span>-->
+<!--          </div>-->
           <div>
-            本月风险率      12%  相较上月   上升  2%
+            预警次数
           </div>
           <el-row :gutter="12">
             <el-col :span="8">
-              <el-card style="background-color: #ec808d;">
-                <div> 严重</div>
-               
-                108
+              <el-card style="background-color: #c43434cc;">
+<!--                <div  class="button" @click="alert('here')"> 严重</div>-->
+                <el-button type="text" class="button" @click="choseType('严重')">严重</el-button>
+                {{ critical }}
               </el-card>
             </el-col>
             <el-col :span="8" >
-              <el-card style="background-color: #facd91;">
-                <div> 中等</div>
-                218
+              <el-card style="background-color: #f1c049;">
+<!--                <div> 中等</div>-->
+                <el-button type="text" class="button" @click="choseType('中等')">中等</el-button>
+                {{ mid }}
               </el-card>
             </el-col>
             <el-col :span="8" >
-              <el-card style="background-color: #caf982;">
-                <div>健康指数</div>
-                99
+              <el-card style="background-color: #4dca8e;">
+<!--                <div>轻微</div>-->
+                <el-button type="text" class="button"  @click="choseType('轻微')">轻微</el-button>
+                {{ good }}
               </el-card>
             </el-col>
           </el-row>
@@ -157,6 +153,7 @@
             :cell-style="{padding:'0px'}"
             header-row-class-name="active_header"
             header-cell-class-name="active_header"
+                    height="400"
             cell-class-name="content_center">
             <!-- header-row-class-name 表头行 加classname -->
             <!-- cell-class-name 单元格加名字 -->
@@ -211,9 +208,9 @@
          width="80%">
          <el-table class='table' :data="tableData_detail_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
             border  
-            
+            fit="true"
             :row-style="{height:'28px'}"
-            :cell-style="{padding:'0px'}"
+            :cell-style="{padding:'0px'}" style="width: 100%"
             header-row-class-name="active_header"
             header-cell-class-name="active_header"
             cell-class-name="content_center">
@@ -227,6 +224,14 @@
               <el-table-column v-for='(val,key) in tableLabel_detail_2' :prop="key" :label="val" show-overflow-tooltip /><!--插槽里面没有东西就可以用单标签  -->
                                                                             <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
 
+           <el-table-column
+               prop="scale"
+               label="点击查看新闻源">
+             <template slot-scope="scope">
+<!--               <span class="text" v-on:click="detail2(scope.row)">查看详情</span>-->
+               <el-button  icon="el-icon-s-promotion" @click="copy(scope.row.url)"></el-button>
+             </template>
+           </el-table-column>
          </el-table>
   </el-dialog>
   </div>
@@ -237,14 +242,23 @@ import * as echarts from "echarts"
 import region from "../components/region.vue";
 import http from '../utils/request'
 export default {
+  name:'risk_warning',
   //引入组件
 components: {
   region
 },
   data() {
     return {
+      type:'',
+      change:true,
+      mapData:'',
+      pieData:[],
+      critical:'',
+      mid:'',
+      good:'',
 // 【整合接收数据】（3个）
 // 1-"风险预警"
+
       formInline1: {
         market: '',
         start_date:'',
@@ -277,7 +291,7 @@ components: {
     }
   ],
   options_industry:[{
-      value: '全部',
+      value: '',
       label: '全部'
     }, {
       value: '深圳证券交易所',
@@ -285,14 +299,15 @@ components: {
     }, {
       value: '上海证券交易所',
       label: '上海证券交易所'
-    }, {
-      value: '北京证券交易所',
-      label: '北京证券交易所'
     },
+    // {
+    //   value: '北交所',
+    //   label: '北京证券交易所'
+    // },
   ],
 
   options_exchange:[{
-      value: '全部',
+      value: '',
       label: '全部'
     }, {
       value: '深圳证券交易所',
@@ -307,18 +322,19 @@ components: {
 
 // 【表格,不包括详情页】
 tableLabel1: {
-num: '事件序号',
+// num: '事件序号',
 province: '省份',
-total_risks: '严重风险总量',
-warning_time: '预警时刻',
-warning_average:'预警平均值',
-YOY:'严重风险总量同比',
+counts: '严重风险总量',
+  early_warning_time: '最新预警时刻',
+  warning_score:'预警平均值',
+  increase:'风险同比增加',
 },
+      origiData:[],//用于筛选时保存数据
 tableLabel2:{
-order: '排名',
+// order: '排名',
 code: '股票代码',
 name: '企业名称',
-warning: '预警值',
+warning_type: '风险水平',
 
 },
 
@@ -364,34 +380,35 @@ YOY:'+10',
 },
 ],
 
-tableData2: [{
-order: '1',
-code: '688001.SH',
-name: '华兴源创',
-warning: 80,
-
-},
-{
-order: '2',
-code: '688001.SH',
-name: '华兴源创',
-warning: 75,
-
-},
-{
-order: '3',
-code: '688001.SH',
-name: '华兴源创',
-warning: 75,
-
-},
-{
-order: '4',
-code: '688001.SH',
-name: '华兴源创',
-warning: 75,
-
-},
+tableData2: [
+//     {
+// order: '1',
+// code: '688001.SH',
+// name: '华兴源创',
+// warning: 80,
+//
+// },
+// {
+// order: '2',
+// code: '688001.SH',
+// name: '华兴源创',
+// warning: 75,
+//
+// },
+// {
+// order: '3',
+// code: '688001.SH',
+// name: '华兴源创',
+// warning: 75,
+//
+// },
+// {
+// order: '4',
+// code: '688001.SH',
+// name: '华兴源创',
+// warning: 75,
+//
+// },
 ],
 // 【详情页】
   // 详情页是否打开的判断标签
@@ -403,187 +420,344 @@ warning: 75,
 
   // 区域
   tableLabel_detail_1:{
-        主体代码:'主体代码',
-        主体类型:'主体类型',
-        省份:'省份',
-        行业:'行业',
-        当前预警时刻:'当前预警时刻',
-        历史预警时刻:'历史预警时刻',
-        预警值:'预警值',
-        预警值同比:'预警值同比',
-        预警类型:'预警类型',
-        风险等级:'风险等级',
-        影响力等级:'影响力等级',
-        健康等级:'健康等级',
+    code:'主体代码',
+    name:'名称',
+    province:'省份',
+    // 行业:'行业',
+    early_warning_time:'当前预警时刻',
+    // exchange:'交易所',
+    risk_type:'风险类型',
+    warning_type:'风险等级',
+    warning_score:'风险值',
+    last_time:'上次预警时刻',
+    increase:'同比',
+
   },
   // 个体
   tableLabel_detail_2:{
-        主体代码:'主体代码',
-        主体类型:'主体类型',
-        省份:'省份',
-        行业:'行业',
-        当前预警时刻:'当前预警时刻',
-        历史预警时刻:'历史预警时刻',
-        预警值:'预警值',
-        预警值同比:'预警值同比',
-        预警类型:'预警类型',
-        风险类型:'风险类型',
-        风险等级:'风险等级',
-        影响力等级:'影响力等级',
-        健康等级:'健康等级',
+        code:'主体代码',
+        name:'名称',
+        province:'省份',
+        // 行业:'行业',
+        early_warning_time:'当前预警时刻',
+        exchange:'交易所',
+        risk_type:'风险类型',
+        warning_type:'风险水平',
+        warning_score:'风险概率',
+        url:'相关链接'
   },
 
     }
   },
   mounted(){
-    const echarts1 = echarts.init(this.$refs.echarts_1)
-    const echarts2 = echarts.init(this.$refs.echarts_2)
-
-    const option_1={
-      // 右上角存图
-    toolbox: {
-      feature: {
-        saveAsImage: {}
-      }
-    },
-      tooltip: {
-      trigger: 'item'
-      },
-      legend: {
-        top: '5%',
-        left: 'center'
-      },
-      series: [
-        {
-          name: 'Access From',
-          type: 'pie',
-          radius: ['30%', '65%'],//调整饼图内圆和外圆大小
-          center:['50%','65%'],//调整饼在画布上的距离，此时偏下
-          avoidLabelOverlap: false,
-          itemStyle: {
-            borderRadius: 5,
-            borderColor: '#fff',
-            borderWidth: 2
-          },
-          label: {
-            show: true
-          },
-          emphasis: {
-            label: {
-              show: true,
-              fontSize: 40,
-              fontWeight: 'bold'
-            }
-          },
-          labelLine: {
-            show: true
-          },
-          data: [
-            { value: 40, name: '重大声誉风险' },
-            { value: 38, name: '流动风险' },
-            { value: 32, name: '获现风险' },
-            { value: 30, name: '市场风险' },
-            { value: 28, name: '经营风险' },
-            { value: 26, name: '信用风险' },
-            { value: 22, name: '资产负债风险' }
-          ]
-        }
-      ]
-    }
- 
-//      const option_2= {
-//   yAxis: {
-//     data: ['房地产业', '信息传输、软件和信息技术服务业', '水利、环境和公共设施管理业', '制造业', '建筑业','综合','批发和零售业','电力、热力、燃气及水生产和供应业','租赁和商务服务业','交通运输、仓储和邮政业','卫生和社会工作','文化、体育和娱乐业','采矿业','住宿和餐饮业','科学研究和技术服务业','教育','农、林、牧、渔业','居民服务、修理和其他服务业']
-
-//   },
-//   xAxis: {},
-//   series: [
-//     {
-//       type: 'bar',
-//       data: [
-//         10,
-//         22,
-//         28,
-//         {
-//           value: 43,
-//           // // 设置单个柱子的样式
-//           // itemStyle: {
-//           //   color: '#91cc75',
-//           //   shadowColor: '#91cc75',
-//           //   borderType: 'dashed',
-//           //   opacity: 0.5
-//           // }
-//         },
-//         49,
-//         45,
-//         66,84,
-//         46,45,88,45,64,11,21,45,87,88
-//       ],
-//       // itemStyle: {
-//       //   barBorderRadius: 5,
-//       //   borderWidth: 1,
-//       //   borderType: 'solid',
-//       //   borderColor: '#73c0de',
-//       //   shadowColor: '#5470c6',
-//       //   shadowBlur: 3
+    this.initMapData()
+    this.individualRisk()
+    this.indusRisk()
+//     const echarts2 = echarts.init(this.$refs.echarts_2)
+//
+//
+//     const option_2 = {
+//     // 右上角存图
+//     toolbox: {
+//       feature: {
+//         saveAsImage: {}
+//       }
+//     },
+//
+//     grid: {
+//       left: '20%',//离左边远一点
+//       right: '4%',
+//       // bottom: '10%',
+//       top:'8%',//如果不填，会默认一个特别大的值，导致图的上面留白特别大
+//       // containLabel: true
+//     },
+//     xAxis: {
+//       type: 'value',
+//       // boundaryGap: [0, 0.01]
+//     },
+//     yAxis: {
+//       type: 'category',
+//       data: ['房地产业', '信息传输、软件和信息技术服务业', '水利、环境和公共设施管理业', '制造业', '建筑业','综合','批发和零售业','电力、热力、燃气及水生产和供应业','租赁和商务服务业','交通运输、仓储和邮政业','卫生和社会工作','文化、体育和娱乐业','采矿业','住宿和餐饮业','科学研究和技术服务业','教育','农、林、牧、渔业','居民服务、修理和其他服务业']
+//
+// //   },
+//     },
+//     series: [
+//       {
+//         // color:'#6d7d87',
+//         type: 'bar',
+//         data: [18203, 23489, 29034, 104970, 131744, 630230,18203, 23489, 29034, 104970, 131744, 630230,19325, 23438, 31000, 121594, 134141, 681807,]
+//       },
+//       // {
+//       //   name: '2012',
+//       //   type: 'bar',
+//       //   data: [19325, 23438, 31000, 121594,19325, 23438, 31000, 121594, 134141, 681807, 134141, 681807,18203, 23489, 29034, 104970, 131744, 630230,]
 //       // }
-//     }
-//   ]
-// }
-    const option_2 = {
-    // 右上角存图
-    toolbox: {
-      feature: {
-        saveAsImage: {}
-      }
-    },
-
-    grid: {
-      left: '20%',//离左边远一点
-      right: '4%',
-      // bottom: '10%',
-      top:'8%',//如果不填，会默认一个特别大的值，导致图的上面留白特别大
-      // containLabel: true
-    },
-    xAxis: {
-      type: 'value',
-      // boundaryGap: [0, 0.01]
-    },
-    yAxis: {
-      type: 'category',
-      data: ['房地产业', '信息传输、软件和信息技术服务业', '水利、环境和公共设施管理业', '制造业', '建筑业','综合','批发和零售业','电力、热力、燃气及水生产和供应业','租赁和商务服务业','交通运输、仓储和邮政业','卫生和社会工作','文化、体育和娱乐业','采矿业','住宿和餐饮业','科学研究和技术服务业','教育','农、林、牧、渔业','居民服务、修理和其他服务业']
-
-//   },
-    },
-    series: [
-      {
-        // color:'#6d7d87',
-        type: 'bar',
-        data: [18203, 23489, 29034, 104970, 131744, 630230,18203, 23489, 29034, 104970, 131744, 630230,19325, 23438, 31000, 121594, 134141, 681807,]
-      },
-      // {
-      //   name: '2012',
-      //   type: 'bar',
-      //   data: [19325, 23438, 31000, 121594,19325, 23438, 31000, 121594, 134141, 681807, 134141, 681807,18203, 23489, 29034, 104970, 131744, 630230,]
-      // }
-    ]
-  }
-
-
-
-    echarts1.setOption(option_1),
-    echarts2.setOption(option_2)
+//     ]
+//   }
+//
+//
+//
+//
+//     echarts2.setOption(option_2)
   },
   methods: {
+    copy(url){
+
+      let oInput = document.createElement('input');
+      oInput.value = url;
+      document.body.appendChild(oInput);
+      oInput.select(); // 选择对象;
+      console.log(oInput.value)
+      document.execCommand("Copy"); // 执行浏览器复制命令
+      this.$message({
+        message: '复制成功',
+        type: 'success'
+      });
+      oInput.remove()
+      window.open(url, "_blank");
+    },
+    choseType(type){
+      if( this.change ||this.type!==type)//初始状态 或选择了新的类型
+      {
+        this.tableData2=this.origiData
+        this.tableData2=this.tableData2.filter(item=>item.warning_type===type)
+        this.type=type
+        this.change=!this.change
+      }
+      else if(!this.change)
+      {
+        this.tableData2=this.origiData
+        this.change=!this.change
+      }
+      // for(let i in this.tableData2){
+      //   if (i.warning_type!==type)
+      //     this.tableData2.
+    },
+    initMapData(){
+      http.get('/warning/region_all_risk/',{params:{
+        //  不传时间默认最近半年
+        }}).then((res)=>{
+        this.mapData=res.data
+      })
+    },
+
+
     onSubmit1() {
-      console.log('submit!');
+      http.get('/warning/warning_rank/',{params:{
+          // exchange:this.exchange
+          market:this.formInline1.market,
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+        }}).then((res)=>{
+        this.tableData2=res.data
+        this.origiData=res.data
+
+      })
+      http.get('/warning/region_rank/',{params:{
+          // exchange:this.exchange
+          market:this.formInline1.market,
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+        }}).then((res)=>{
+        this.tableData1 = eval(unescape(res.data.replace(/\\u/g, '%u')))
+        // this.tableData1=res.data
+      })
+      http.get('/warning/region_all_risk/',{params:{
+          //  不传时间默认最近半年
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+        }}).then((res)=>{
+        this.mapData=res.data
+      })
+    },
+    individualRisk() {
+      const echarts1 = echarts.init(this.$refs.echarts_1)
+      http.get('/warning/individual_rank/', {
+        params: {
+          // exchange:this.exchange
+          exchange: this.formInline3.industry,
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+
+        }
+      }).then((res) => {
+        this.pieData.length=0
+        this.critical = res.data['指数']['严重']
+        this.mid = res.data['指数']['中等']
+        this.good = res.data['指数']['轻微']
+        let tmp=res.data['环形图']
+        for(let key in tmp)
+        {
+          let arr={}
+          arr['name']=key
+          arr['value']=tmp[key]
+          this.pieData.push(arr)
+        }
+
+        echarts1.clear()
+        const option_1={
+          // 右上角存图
+          toolbox: {
+            feature: {
+              saveAsImage: {}
+            }
+          },
+          tooltip: {
+            trigger: 'item'
+          },
+          legend: {
+            top: '5%',
+            left: 'center'
+          },
+          series: [
+            {
+              name: 'Access From',
+              type: 'pie',
+              radius: ['30%', '65%'],//调整饼图内圆和外圆大小
+              center:['50%','65%'],//调整饼在画布上的距离，此时偏下
+              avoidLabelOverlap: false,
+              itemStyle: {
+                borderRadius: 5,
+                borderColor: '#fff',
+                borderWidth: 2
+              },
+              label: {
+                show: true
+              },
+              emphasis: {
+                label: {
+                  show: true,
+                  fontSize: 40,
+                  fontWeight: 'bold'
+                }
+              },
+              labelLine: {
+                show: true
+              },
+              data: this.pieData
+              //     [
+              //   { value: 40, name: '重大声誉风险' },
+              //   { value: 38, name: '流动风险' },
+              //   { value: 32, name: '获现风险' },
+              //   { value: 30, name: '市场风险' },
+              //   { value: 28, name: '经营风险' },
+              //   { value: 26, name: '信用风险' },
+              //   { value: 22, name: '资产负债风险' }
+              // ]
+            }
+          ]
+        }
+        echarts1.setOption(option_1,true)
+      })
+      http.get('/warning/warning_rank/',{params:{
+          // exchange:this.exchange
+          exchange: this.formInline3.industry,
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+        }}).then((res)=>{
+        this.tableData2=res.data
+        this.origiData=res.data
+      })
+
+    },
+    indusRisk() {
+      const echarts2 = echarts.init(this.$refs.echarts_2)
+      http.get('/warning/indus_rank/', {
+        params: {
+          // exchange:this.exchange
+          exchange: this.formInline2.industry,
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+        }
+      }).then((res) => {
+
+        let xData=[],yData=[]
+        let tmp=res.data
+        for(let key in tmp)
+        {
+          xData.push(tmp[key])
+          yData.push(key)
+        }
+
+
+        const option_2 = {
+          // 右上角存图
+          toolbox: {
+            feature: {
+              saveAsImage: {}
+            }
+          },
+
+          grid: {
+            left: '20%',//离左边远一点
+            right: '4%',
+            // bottom: '10%',
+            top:'8%',//如果不填，会默认一个特别大的值，导致图的上面留白特别大
+            // containLabel: true
+          },
+          xAxis: {
+            type: 'value',
+            // boundaryGap: [0, 0.01]
+          },
+          yAxis: {
+            type: 'category',
+            data: yData
+
+//   },
+          },
+          series: [
+            {
+              // color:'#6d7d87',
+              type: 'bar',
+              data: xData
+            },
+            // {
+            //   name: '2012',
+            //   type: 'bar',
+            //   data: [19325, 23438, 31000, 121594,19325, 23438, 31000, 121594, 134141, 681807, 134141, 681807,18203, 23489, 29034, 104970, 131744, 630230,]
+            // }
+          ]
+        }
+
+
+        echarts2.setOption(option_2)
+      })
+    },
+    regionRisk() {
+      http.get('/warning/region_rank/', {
+        params: {
+          // exchange:this.exchange
+          exchange: this.formInline3.industry,
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+        }
+      }).then((res) => {
+        this.pieData.length = 0
+        let data = eval(unescape(res.data.replace(/\\u/g, '%u')))
+        this.critical = data['指数']['严重']
+        this.mid = data['指数']['中等']
+        this.good = data['指数']['轻微']
+
+      })
     },
     // 详情页1
     detail1(row){
-    console.log("查看详情-各省份风险情况")
+    // console.log("查看详情-各省份风险情况")
+      http.get('/warning/region_rank_detail/', {
+        params: {
+          // exchange:this.exchange
+          region: row.province,
+          // start:this.formInline1.start_date,
+          // end:this.formInline1.end_date,
+        }
+      }).then((res) => {
+        // this.tableData_detail_1 = eval(unescape(res.data.replace(/\\u/g, '%u')))
+        this.tableData_detail_1=res.data
+      })
     console.log(row)//返回这一行所有的内容
     this.detailsdialog_1 = true//打开弹窗
 
+
     // http.get(
     //           "/",
     //           {params:{
@@ -604,8 +778,15 @@ warning: 75,
     detail2(row){
     console.log("查看详情-个体风险预警")
     console.log(row)//返回这一行所有的内容
-    this.detailsdialog_2 = true//打开弹窗
-
+      // console.log(this.tableData2)
+      this.tableData_detail_2=Array(row)
+    // for(let i in this.tableData2)
+    // {
+    //
+    //   if (this.tableData2[i]['name']===row['name'] && this.tableData2[i]['early_warning_time']===row['early_warning_time'])
+    //       this.tableData_detail_2=this.tableData2[i]
+    // }
+      this.detailsdialog_2 = true//打开弹窗
     // http.get(
     //           "/",
     //           {params:{
@@ -626,6 +807,22 @@ warning: 75,
 </script>
 
 <style lang="less" scoped>
+
+//div按钮
+.button{
+  .hover {
+    background-color: #0056b3;
+  }
+
+  .active {
+    background-color: #003e80;
+  }
+  display: block;
+  //background-color: #007bff;
+  color: #000000;
+  //padding: 10px 20px;
+  border: none;
+}
 // 地图布局，与下方表格的距离
 /deep/ .echartsGroup[data-v-02ef51f8] {
   // width: 500px;
@@ -671,7 +868,7 @@ warning: 75,
   }
   /deep/ .active_header{//表头
     color: #333333;
-    font-size: 9px;
+    font-size: 13px;
     text-align: center !important;
     // border-color:#333333;
 
@@ -679,12 +876,16 @@ warning: 75,
   }
   /deep/ .content_center{//表的内容
     text-align: center !important;
-    font-size: 10px;
+    font-size: 13px;
     // border-color:#333333;
   }
 }
 .text{
   color:rgba(2, 167, 240, 0.729411764705882);
 }
+.grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
 
 </style>
diff --git a/src/views/高影响力主体分析.vue b/src/views/高影响力主体分析.vue
index 953dc7d..6ace785 100644
--- a/src/views/高影响力主体分析.vue
+++ b/src/views/高影响力主体分析.vue
@@ -1,280 +1,570 @@
 <template>
 
     <el-row> 
-       <!-- 搜索栏 -->
+      <el-tabs type="border-card"> 
+        <!-- 1、横向对比 -->
+        <el-tab-pane label="横向对比">
+           <!-- 搜索栏 -->
+          <div class="form">
+                                                          <!-- inline="true"表单域在一行 -->
+            <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+              <el-form-item label="市场">
+                <el-select   v-model="formInline1.market" placeholder="选择市场" size="mini">
+                  <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
 
-        <div class="form">
-                                                        <!-- inline="true"表单域在一行 -->
-          <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
-            <el-form-item label="市场">
-              <el-select   v-model="formInline1.market" placeholder="选择市场" size="mini">
-                <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>
-              </el-select>
-            </el-form-item>
+              <el-form-item label="主体类型">
+                <el-select   v-model="formInline1.industry" placeholder="选择行业" size="mini">
+                  <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
 
-            <el-form-item label="行业">
-              <el-select   v-model="formInline1.industry" placeholder="选择行业" size="mini">
-                <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="开始时间">
-              <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
-            </el-form-item>
+              <el-form-item label="时间粒度">
+                <el-select   v-model="formInline1.timeType" placeholder="选择时间粒度" size="mini">
+                  <el-option v-for="item in optionsTime" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="时间">
+  <!--              <span class="demonstration">月</span>-->
+                <el-date-picker
+                    v-if="formInline1.timeType==='month'"
+                    v-model="formInline1.pre_date"
+                    type="month"
+                    size="mini"
+                    placeholder="选择月">
+                </el-date-picker>
+                <quter-component  v-if="formInline1.timeType==='quarter'" v-model="formInline1.quarter_date"></quter-component>
+                <half-year v-if="formInline1.timeType==='half_year'" v-model="formInline1.pre_date"/>
+              </el-form-item>
+  <!--            <el-form-item label="时间">-->
+  <!--              <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+  <!--            </el-form-item>-->
 
-            <el-form-item label="结束时间">
-              <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
+  <!--            <el-form-item label="结束时间">-->
+  <!--              <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+  <!--            </el-form-item>-->
+              <el-form-item>
+                <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+              </el-form-item>
 
-
-
-       <div class="one_twins_card">
-          <!-- 一左 -->
-          <el-card style=" height:300px" :body-style={padding:0}>         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
-            <span class="superscript" style="width: 20px; height: 40px;">总体分析</span>
-            <div class="num_card" :body-style="{display: 'flex'}">
-              <el-row >
-                    <el-col :span="11">
-                      <div class="num">
-                        <p class="desc">风险主体总量</p>
-                        <p class="desc_value">{{ totalRisk }}个</p>
-                      </div>
-                     
-
-                    </el-col>
-                    <el-col :span="2">
-                      <el-divider direction="vertical"  content-position="center"></el-divider>
-                    </el-col>
-                    
-                    <el-col :span="11">
-                      <div class="num">
-                        <p class="desc">主体风险类型</p>
-                        <p class="desc_value">{{totalType}}种</p>
-                      </div>
-                    </el-col>
-              </el-row>
-
-           </div>
-          </el-card>
-          
-          <!-- 一右 -->
-          <el-card style=" height:300px" :body-style={padding:0}>
-            <div>
-              <span class="superscript" style="width: 20px; height: 40px;">风险分布</span>
-              <!-- 两个饼状图 -->
-              <div class="twins_pie">
-
-                <div ref="echarts_1" style="height:200px;width:300px"></div>
-                <div ref="echarts_2" style="height:200px;width:300px"></div>
-
-                <!-- <div ref="echarts1" style="height: 100px"></div> -->
-                <!-- <div ref="echarts2" style="height: 100px"></div> -->
-              </div>
-
-
-           </div>
-          </el-card>
-    </div>
-
-
-
-
-    <!-- 第二层表格与图像 -->
-    <div class="two">
-      <el-card :body-style={padding:0} style='height: 400px;width: 100%;'>
-         <!-- 1、上标 -->
-         <span class="superscript" style="width: 20px; height: 40px;">影响力排名</span>
-
-        
-        <!-- 2、内容 -->
-        <div class="content">
-
-          <div class="table" style="width: 50%; float: left; overflow: hidden">
-            <el-table :data="tableData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
-                  border  
-                  height="250" 
-                  :row-style="{height:'28px'}"
-                  :cell-style="{padding:'0px'}"
-                  header-row-class-name="active_header"
-                  header-cell-class-name="active_header"
-                  cell-class-name="content_center"
-                  style="width: 90%">          <!-- style="width: 40%"               height="215"  -->
-                <el-table-column v-for='(val,key) in tableLabel' :prop="key" :label="val"  :key="key"/><!--插槽里面没有东西就可以用单标签  -->
-                <el-table-column
-                        prop="scale"
-                        label="操作">
-                        <template slot-scope="scope">
-                          <span class="text"  v-on:click="detail(scope.row)">查看详情</span>
-                        </template>
-                    </el-table-column>
-            </el-table>
+            </el-form>
           </div>
 
-        <div>
-          <!-- 详细信息弹窗，默认关闭 -->
-          <el-dialog  :visible.sync="detailsdialog" width="100%" @open="open()" >
-            <!-- title="收货地址" -->
-            <el-card >
-            <!-- 详细信息 -->
-            <el-card style=" height:300px;margin-bottom:10px ; " :body-style={padding:0} >    
-              <span class="superscript" style="width: 20px; height: 40px;">详细信息</span>
-              <el-table :data="detailData"
-              border  
-                  :row-style="{height:'28px'}"
-                  :cell-style="{padding:'0px'}"
-                  header-row-class-name="active_header"
-                  header-cell-class-name="active_header"
-                  cell-class-name="content_center"
-                  style="margin:15px;">     
-                  <el-table-column
-                  prop="n"
-                  label="主体名称"
-                  width="70">
-                </el-table-column>
-                <el-table-column label="市场结构">
-                  <el-table-column
-                    prop="D"
-                    label="度中心性"
-                    width="100">
-                  </el-table-column>
-                  <el-table-column
-                    prop="B"
-                    label="介数中心性"
-                    width="100">
-                  </el-table-column>
-                  <el-table-column
-                    prop="C"
-                    label="接近中心性"
-                    width="100">
-                  </el-table-column>
-                  <el-table-column
-                    prop="P"
-                    label="PageRank"
-                    width="100">
-                  </el-table-column>
-                </el-table-column>
-                  <el-table-column label="个体规模">
-                    <el-table-column
-                      prop="资金规模"
-                      label="资金规模"
-                      width="100">
-                    </el-table-column>
-                    <el-table-column
-                      prop="持股数量"
-                      label="持股数量"
-                      width="100">
-                    </el-table-column>
-                  </el-table-column>
-                  <el-table-column
-                  prop="主体风险"
-                  label="主体风险"
-                  width="70">
-                </el-table-column>
-                <el-table-column
-                  prop="zhfs"
-                  label="影响力综合分数"
-                  width="100">
-                </el-table-column>
-                <el-table-column
-                  prop="leve"
-                  label="影响等级"
-                  width="70">
-                </el-table-column>
-                <el-table-column
-                        prop="scale"
-                        label="操作"
-                        width="200">
-                        <template slot-scope="scope">
-                          <span class="text"  v-on:click="detail(scope.row)">查看风险指标详情</span>
-                        </template>
-                    </el-table-column>
-              </el-table>
-            </el-card>
-                    
-            <!-- 关联主体 -->
-            <el-card style=" height:200px;margin-bottom:10px " :body-style={padding:0} >    
-              <span class="superscript" style="width: 20px; height: 40px;">关联主体</span>
-                 
-              <!-- 表单 -->
-              <div class="form">
-                                                        <!-- inline="true"表单域在一行 -->
-                  <el-form :inline="true"  :model="formInline2" class="demo-form-inline" style="margin: 10px;">
-                    <template>
-                      <el-radio v-model="type" label="key_node">关键节点</el-radio>
-                      <el-radio v-model="type" label="other">相似节点</el-radio>
-                    </template>
-                    <el-form-item>
-                      <el-button class="grayish_btn" @click="onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
-                    </el-form-item>
-                  </el-form>
-              </div>
-              <!-- 关联主体点 -->
-              <div style="display:flex;padding-left:130px" v-if="showRelated">
-                <el-button  v-for='(val,key) in relatedRes'  :key="key" type="primary" round style=" height:60px; width:180px ;margin-right:50px">{{val}}:{{key}}</el-button>
-              </div>
-            </el-card>
 
-            <!-- 影响范围 -->
-            <el-card style=" height:400px; " :body-style={padding:0} >    
-              <span class="superscript" style="width: 20px; height: 40px;">影响范围</span>
-              <div class="form">
-                                                        <!-- inline="true"表单域在一行 -->
-                  <el-form :inline="true"  :model="formInline3" class="demo-form-inline">
-                    <el-form-item >
-                      <el-checkbox v-model="formInline3.ndustry_selection">行业</el-checkbox>
-                    </el-form-item>
 
-                    <el-form-item >
-                      <el-checkbox v-model="formInline3.regional_selection">地域</el-checkbox>
-                    </el-form-item>
+<!--          <div class="one_twins_card">-->
+<!--              &lt;!&ndash; 一左 &ndash;&gt;-->
+<!--              <el-card style=" height:300px;width: 30%;" :body-style={padding:0}>         &lt;!&ndash;:body-style={padding:0}取消卡片边距，btn就能在左上角 &ndash;&gt;-->
+<!--                <span class="superscript" style="width: 20px; height: 40px;">总体分析</span>-->
+<!--                <div class="num_card" :body-style="{display: 'flex'}">-->
+<!--                  &lt;!&ndash; <el-row > &ndash;&gt;-->
+<!--                        &lt;!&ndash; <el-col :span="11"> &ndash;&gt;-->
+<!--                          <div>-->
+<!--                            <p class="desc">高影响力风险主体总量:</p>-->
+<!--                            <p class="desc_value">{{ totalRisk }}个</p>-->
+<!--                          </div>-->
 
-                    <el-form-item>
-                      <el-button class="grayish_btn" @click="onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
-                    </el-form-item>
-                  </el-form>
+
+<!--                          <el-divider style="width:60%"></el-divider>-->
+
+
+<!--                        &lt;!&ndash; </el-col>-->
+<!--                        <el-col :span="2">-->
+<!--                          <el-divider direction="vertical"  content-position="center"></el-divider>-->
+
+<!--                        </el-col> &ndash;&gt;-->
+<!--                        -->
+<!--                        &lt;!&ndash; <el-col :span="11"> &ndash;&gt;-->
+<!--                          <div>-->
+<!--                            <p class="desc">高影响力主体风险类型:</p>-->
+<!--                            <p class="desc_value">{{totalType}}种</p>-->
+<!--                          </div>-->
+<!--                        &lt;!&ndash; </el-col> &ndash;&gt;-->
+<!--                  &lt;!&ndash; </el-row> &ndash;&gt;-->
+
+<!--              </div>-->
+<!--              </el-card>-->
+<!--              -->
+<!--              &lt;!&ndash; 一右 &ndash;&gt;-->
+<!--              <el-card style=" height:300px;width: 68%;" :body-style={padding:0}>-->
+<!--                <div>-->
+<!--                  <span class="superscript" style="width: 20px; height: 40px;">风险分布</span>-->
+<!--                  &lt;!&ndash; 两个饼状图 &ndash;&gt;-->
+<!--                  <div class="twins_pie">-->
+
+<!--                    <div ref="echarts_1" style="height:280px;width:400px"></div>-->
+<!--                    <div ref="echarts_2" style="height:280px;width:400px"></div>-->
+
+<!--                    &lt;!&ndash; <div ref="echarts1" style="height: 100px"></div> &ndash;&gt;-->
+<!--                    &lt;!&ndash; <div ref="echarts2" style="height: 100px"></div> &ndash;&gt;-->
+<!--                  </div>-->
+
+
+<!--              </div>-->
+<!--              </el-card>-->
+<!--          </div>-->
+
+          <!-- 第二层表格与图像 -->
+          <div class="two">
+            <el-card :body-style={padding:0} style='width: 100%;'>
+              <!-- 1、上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">影响力排名</span>
+
+      <!--        模型暂时不支持-->
+      <!--         <el-form :inline="true"  class="demo-form-inline" :model="formInline4" ref="formInline">-->
+      <!--            <el-form-item label="个体类型" style="margin: 0px;padding-left: 80px;padding-top: 5px">-->
+      <!--              <el-select  v-model="formInline4.type"  size="mini">-->
+      <!--                <el-option label="私募" value="私募"></el-option>-->
+      <!--                <el-option label="公募" value="公募"></el-option>-->
+      <!--              </el-select>-->
+      <!--            </el-form-item>-->
+      <!--        </el-form>-->
+              
+              <!-- 2、内容 -->
+              <div class="content">
+
+                <div class="table" style="width: 100%; float: left; overflow: hidden">
+                  <el-table :data="tableData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                        border  
+                        height="250" 
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center"
+                        style="width: 98%">          <!-- style="width: 40%"               height="215"  -->
+                      <el-table-column v-for='(val,key) in tableLabel' :prop="key" :label="val"  :key="key"/><!--插槽里面没有东西就可以用单标签  -->
+                      <el-table-column
+                              prop="scale"
+                              label="操作">
+                              <template slot-scope="scope">
+                                <span class="text"  v-on:click="detail(scope.row)">查看详情</span>
+                              </template>
+                          </el-table-column>
+                  </el-table>
+                </div>
+
+              <div>
+                <!-- 详细信息弹窗，默认关闭 -->
+                <el-dialog  :visible.sync="detailsdialog" width="100%" @open="open()" >
+                  <!-- title="收货地址" -->
+                  <el-card >
+                  <!-- 详细信息 -->
+                  <el-card style=" height:600px;margin-bottom:10px ; " :body-style={padding:0} >    
+                    <span class="superscript" style="width: 20px; height: 40px;">详细信息</span>
+                    <el-table :data="detailData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border  
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center"
+                        style="margin:15px;">     
+                        <el-table-column
+                        prop="comp_name"
+                        label="主体名称"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column label="市场结构">
+                        <el-table-column
+                          prop="DC"
+                          label="度中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="BC"
+                          label="介数中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="CC"
+                          label="接近中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="weighted-PR"
+                          label="加权PageRank"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                            prop="SLC"
+                            label="局部中心性"
+                            width="120">
+                        </el-table-column>
+                      </el-table-column>
+                        <el-table-column label="个体规模">
+                          <el-table-column
+                            prop="region"
+                            label="所在区域"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                            prop="held_num"
+                            label="持股数量(股)"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                              prop="asset"
+                              label="当前资金规模(万)"
+                              width="120">
+                          </el-table-column>
+                        </el-table-column>
+      <!--                  <el-table-column-->
+      <!--                  prop="主体风险"-->
+      <!--                  label="主体风险"-->
+      <!--                  width="120">-->
+      <!--                </el-table-column>-->
+                      <el-table-column
+                        prop="Total_score"
+                        label="影响力综合分数"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column
+                        prop="grade"
+                        label="影响等级"
+                        width="120">
+                      </el-table-column>
+      <!--                <el-table-column-->
+      <!--                        prop="scale"-->
+      <!--                        label="操作">-->
+      <!--                        <template slot-scope="scope">-->
+      <!--                          <span class="text"  v-on:click="detail(scope.row)">查看风险指标详情</span>-->
+      <!--                        </template>-->
+      <!--                    </el-table-column>-->
+                    </el-table>
+                    <div style="display:flex;">
+                      <el-divider direction="vertical" class="sublabel"></el-divider>
+                      <span class='title'>个体规模分析</span>
+                    </div>
+      <!--              模型暂时不支持-->
+      <!--              <el-form :inline="true"  class="demo-form-inline" :model="formInline4" ref="formInline">-->
+      <!--                <el-form-item label="指标" style="margin: 0px;padding-left: 80px;padding-top: 5px">-->
+      <!--                  <el-select  v-model="formInline4.type"  size="mini">-->
+      <!--                    <el-option label="基金规模" value="基金规模"></el-option>-->
+      <!--                    <el-option label="持股数量" value="持股数量"></el-option>-->
+      <!--                  </el-select>-->
+      <!--                </el-form-item>-->
+      <!--              </el-form>-->
+                    <DifferentialChart :asset="asset" :datelis="datelis" :held_num="held_num"/>
+              
+
+
+                  </el-card>
+                          
+                  <!-- 关联主体 -->
+                  <el-card style=" height:300px;margin-bottom:10px " :body-style={padding:0} >
+                    <span class="superscript" style="width: 20px; height: 40px;">关联主体</span>
+                      
+                    <!-- 表单 -->
+                    <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                        <el-form :inline="true"  :model="formInline2" class="demo-form-inline" style="margin: 10px;">
+                          <template>
+                            <el-radio v-model="typeRela" label="key_node">关键节点</el-radio>
+                            <el-radio v-model="typeRela" label="other">相似节点</el-radio>
+                          </template>
+                          <el-form-item>
+                            <el-button class="grayish_btn" @click="onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
+                          </el-form-item>
+                        </el-form>
+                    </div>
+                    <!-- 关联主体点 -->
+                    <div style="display:flex;padding-left:130px" v-if="showRelated">
+                      <el-button  v-for='(val,key) in relatedRes'  :key="key"  round style=" height:100px; width:300px ;margin-right:50px">{{val}}</el-button>
+                    </div>
+                  </el-card>
+
+                  <!-- 影响范围 -->
+      <!--            <el-card style=" height:400px; " :body-style={padding:0} >    -->
+      <!--              <span class="superscript" style="width: 20px; height: 40px;margin-bottom: 10px;">风险影响</span>-->
+      <!--              <div class="form">-->
+      <!--                                                        &lt;!&ndash; inline="true"表单域在一行 &ndash;&gt;-->
+      <!--                  <el-form :inline="true"  :model="formInline3" class="demo-form-inline">-->
+      <!--                    <template>-->
+      <!--                      <el-radio v-model="typeSpread" label="industry">行业</el-radio>-->
+      <!--                      <el-radio v-model="typeSpread" label="regions">地域</el-radio>-->
+      <!--                    </template>-->
+      <!--&lt;!&ndash;                    <el-form-item >&ndash;&gt;-->
+      <!--&lt;!&ndash;                      <el-checkbox v-model="formInline3.ndustry_selection">行业</el-checkbox>&ndash;&gt;-->
+      <!--&lt;!&ndash;                    </el-form-item>&ndash;&gt;-->
+
+      <!--&lt;!&ndash;                    <el-form-item >&ndash;&gt;-->
+      <!--&lt;!&ndash;                      <el-checkbox v-model="formInline3.regional_selection">地域</el-checkbox>&ndash;&gt;-->
+      <!--&lt;!&ndash;                    </el-form-item>&ndash;&gt;-->
+
+      <!--                    <el-form-item>-->
+      <!--                      <el-button class="grayish_btn" @click="onSubmit3" icon="el-icon-search" size="mini">查询</el-button>-->
+      <!--                    </el-form-item>-->
+      <!--                  </el-form>-->
+      <!--              </div>-->
+      <!--              <div class="flex-charts">-->
+      <!--                <div ref="echarts_4" style="height:300px;width:50%"></div>-->
+      <!--                <div ref="echarts_5" style="height:300px;width:50%"></div>-->
+      <!--            </div>-->
+      <!--            </el-card>-->
+                </el-card>
+                </el-dialog>
               </div>
-              <div class="flex-charts">
-                <div ref="echarts_4" style="height:300px;width:50%"></div>
-                <div ref="echarts_5" style="height:300px;width:50%"></div>
+
+                <div class='bar' style="width: 100%; float: left; overflow: hidden">
+                  <div ref="echarts_3" style="height:300px;width:100%"></div>
+                </div>
+
             </div>
+
+
             </el-card>
-          </el-card>
-          </el-dialog>
-        </div>
 
 
-          <div class='bar' style="width: 50%; float: left; overflow: hidden">
-            <div ref="echarts_3" style="height:300px;width:100%"></div>
+          </div>
+   
+        </el-tab-pane>
+
+
+        <!-- 2、纵向对比 -->
+        <el-tab-pane label="纵向对比">
+          <!-- 搜索栏 -->
+          <div class="form">
+                                                          <!-- inline="true"表单域在一行 -->
+            <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+              <el-form-item label="市场">
+                <el-select   v-model="formInline1.market" placeholder="选择市场" size="mini">
+                  <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="主体类型">
+                <el-select   v-model="formInline1.industry" placeholder="选择行业" size="mini">
+                  <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="时间粒度">
+                <el-select   v-model="formInline1.timeType" placeholder="选择时间粒度" size="mini">
+                  <el-option v-for="item in optionsTime" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+
+              <el-form-item label="开始时间">
+
+                <el-date-picker
+                    v-if="formInline1.timeType==='month'"
+                    v-model="formInline1.start_pre"
+                    type="month"
+                    size="mini"
+                    placeholder="选择月">
+                </el-date-picker>
+                <quter-component  v-if="formInline1.timeType==='quarter'" v-model="formInline1.start_quarter"></quter-component>
+                <half-year v-if="formInline1.timeType==='half_year'" v-model="formInline1.start_pre"/>
+<!--                原始时间组件-->
+<!--                <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+              </el-form-item>
+              <el-form-item label="结束时间">
+
+                <el-date-picker
+                    v-if="formInline1.timeType==='month'"
+                    v-model="formInline1.end_pre"
+                    type="month"
+                    size="mini"
+                    placeholder="选择月">
+                </el-date-picker>
+                <quter-component  v-if="formInline1.timeType==='quarter'" v-model="formInline1.end_quarter"></quter-component>
+                <half-year v-if="formInline1.timeType==='half_year'" v-model="formInline1.end_pre"/>
+
+<!--                <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+              </el-form-item>
+              <el-form-item>
+                <el-button class="grayish_btn" @click="onSubmit4" icon="el-icon-search" size="mini">查询</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="table" style=" overflow: hidden">
+                  <el-table :data="historyData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                        border  
+                        height="400" 
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center">          <!-- style="width: 40%"               height="215"  -->
+                    <el-table-column v-for='(val,key) in timeLis' :prop="key" :label="val"  :key="key">
+<!--                      <el-table-column v-for='(val,key) in historyDataLabel' :prop="key" :label="val"  :key="key"/>&lt;!&ndash;插槽里面没有东西就可以用单标签  &ndash;&gt;-->
+                      <!--                      <el-table-column-->
+                      <!--                              prop="scale"-->
+                      <!--                              label="操作">-->
+                      <!--                              <template slot-scope="scope">-->
+                      <!--                                <span class="text"  v-on:click="detail(scope.row)">查看详情</span>-->
+                      <!--                              </template>-->
+                      <!--                          </el-table-column>-->
+
+                    </el-table-column>
+
+                  </el-table>
           </div>
 
-      </div>
+              <div>
+                <!-- 详细信息弹窗，默认关闭 -->
+                <el-dialog  :visible.sync="detailsdialog" width="100%" @open="open()"  :modal="false" >
+                  <!-- title="收货地址" -->
+                  <el-card >
+                  <!-- 详细信息 -->
+                  <el-card style=" height:600px;margin-bottom:10px ; " :body-style={padding:0} >    
+                    <span class="superscript" style="width: 20px; height: 40px;">详细信息</span>
+                    <el-table :data="detailData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border  
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center"
+                        style="margin:15px;">     
+                        <el-table-column
+                        prop="comp_name"
+                        label="主体名称"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column label="市场结构">
+                        <el-table-column
+                          prop="DC"
+                          label="度中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="BC"
+                          label="介数中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="CC"
+                          label="接近中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="weighted-PR"
+                          label="加权PageRank"
+                          width="120">
+                        </el-table-column>
+                      </el-table-column>
+                        <el-table-column label="个体规模">
+                          <el-table-column
+                            prop="region"
+                            label="所在区域"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                            prop="held_num"
+                            label="持股数量"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                              prop="asset"
+                              label="当前资金规模(万)"
+                              width="120">
+                          </el-table-column>
+                        </el-table-column>
+      <!--                  <el-table-column-->
+      <!--                  prop="主体风险"-->
+      <!--                  label="主体风险"-->
+      <!--                  width="120">-->
+      <!--                </el-table-column>-->
+                      <el-table-column
+                        prop="Total_score"
+                        label="影响力综合分数"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column
+                        prop="grade"
+                        label="影响等级"
+                        width="120">
+                      </el-table-column>
+      <!--                <el-table-column-->
+      <!--                        prop="scale"-->
+      <!--                        label="操作">-->
+      <!--                        <template slot-scope="scope">-->
+      <!--                          <span class="text"  v-on:click="detail(scope.row)">查看风险指标详情</span>-->
+      <!--                        </template>-->
+      <!--                    </el-table-column>-->
+                    </el-table>
+                    <div style="display:flex;">
+                      <el-divider direction="vertical" class="sublabel"></el-divider>
+                      <span class='title'>个体规模分析</span>
+                    </div>
+      <!--              模型暂时不支持-->
+      <!--              <el-form :inline="true"  class="demo-form-inline" :model="formInline4" ref="formInline">-->
+      <!--                <el-form-item label="指标" style="margin: 0px;padding-left: 80px;padding-top: 5px">-->
+      <!--                  <el-select  v-model="formInline4.type"  size="mini">-->
+      <!--                    <el-option label="基金规模" value="基金规模"></el-option>-->
+      <!--                    <el-option label="持股数量" value="持股数量"></el-option>-->
+      <!--                  </el-select>-->
+      <!--                </el-form-item>-->
+      <!--              </el-form>-->
+                    <DifferentialChart :asset="asset" :datelis="datelis" :held_num="held_num"/>
+              
 
 
-      </el-card>
-    </div>
-
-
-    
+                  </el-card>
+                          
+                  <!-- 关联主体 -->
+                  <el-card style=" height:300px;margin-bottom:10px " :body-style={padding:0} >
+                    <span class="superscript" style="width: 20px; height: 40px;">关联主体</span>
+                      
+                    <!-- 表单 -->
+                    <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                        <el-form :inline="true"  :model="formInline2" class="demo-form-inline" style="margin: 10px;">
+                          <template>
+                            <el-radio v-model="typeRela" label="key_node">关键节点</el-radio>
+                            <el-radio v-model="typeRela" label="other">相似节点</el-radio>
+                          </template>
+                          <el-form-item>
+                            <el-button class="grayish_btn" @click="onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
+                          </el-form-item>
+                        </el-form>
+                    </div>
+                    <!-- 关联主体点 -->
+                    <div style="display:flex;padding-left:130px" v-if="showRelated">
+                      <el-button  v-for='(val,key) in relatedRes'  :key="key"  round style=" height:100px; width:300px ;margin-right:50px">{{val}}</el-button>
+                    </div>
+                  </el-card>
 
+                </el-card>
+                </el-dialog>
+              </div>
+                     
+        </el-tab-pane>
+</el-tabs>
   </el-row>
 </template>
   
-  <script>
-  import * as echarts from "echarts"
-  import http from '../utils/request'
+<script>
+import * as echarts from "echarts"
+import http from '../utils/request'
+import DifferentialChart from "@/components/echarts/DifferentialChart.vue";
+import halfYear from "@/components/halfYear";
+import quterComponent from "@/components/quterComponent";
+import qs from "qs";
+import {Loading} from "element-ui";
   export default {
+    name:'influential_entities',
+    components:{
+      DifferentialChart,
+      halfYear,
+      quterComponent,
+},
     data() {
       return {
+        datelis:[],
+        asset:[],
+        held_num:[],
         width:null,
         result:{},
         showRelated:false,
         relatedRes:[],
         seleced:'',
-        type:null,
+        typeRela:null,
+        typeSpread:null,
         totalRisk:Number,
         totalType:Number,
 // 【详情页】
@@ -299,192 +589,30 @@
           value: '债券',
           label: '债券'
         }],
-
+        optionsTime:[
+          {label: '半年',value:'half_year'},
+          {label: '季度',value:'quarter'},
+          {label: '月',value:'month'},
+        ],
         // 选择框——2行业选项
-        options_industry: [{
-        value: "新闻和出版业",
-        label: "新闻和出版业"}, {
-        value: "保险业",
-        label: "保险业"}, {
-        value: "铁路运输业",
-        label: "铁路运输业"}, {
-        value: "电力、热力生产和供应业",
-        label: "电力、热力生产和供应业"}, {
-        value: "专业技术服务业",
-        label: "专业技术服务业"}, {
-        value: "汽车制造业",
-        label: "汽车制造业"}, {
-        value: "零售业",
-        label: "零售业"}, {
-        value: "医药制造业",
-        label: "医药制造业"}, {
-        value: "电气机械和器材制造业",
-        label: "电气机械和器材制造业"}, {
-        value: "科技推广和应用服务业",
-        label: "科技推广和应用服务业"}, {
-        value: "金属制品业",
-        label: "金属制品业"}, {
-        value: "非金属矿物制品业",
-        label: "非金属矿物制品业"}, {
-        value: "软件和信息技术服务业",
-        label: "软件和信息技术服务业"}, {
-        value: "计算机、通信和其他电子设备制造业",
-        label: "计算机、通信和其他电子设备制造业"}, {
-        value: "化学原料和化学制品制造业",
-        label: "化学原料和化学制品制造业"}, {
-        value: "航空运输业",
-        label: "航空运输业"}, {
-        value: "石油、煤炭及其他燃料加工业",
-        label: "石油、煤炭及其他燃料加工业"}, {
-        value: "石油和天然气开采业",
-        label: "石油和天然气开采业"}, {
-        value: "电信、广播电视和卫星传输服务",
-        label: "电信、广播电视和卫星传输服务"}, {
-        value: "土木工程建筑业",
-        label: "土木工程建筑业"}, {
-        value: "互联网和相关服务",
-        label: "互联网和相关服务"}, {
-        value: "有色金属冶炼和压延加工业",
-        label: "有色金属冶炼和压延加工业"}, {
-        value: "商务服务业",
-        label: "商务服务业"}, {
-        value: "资本市场服务",
-        label: "资本市场服务"}, {
-        value: "铁路、船舶、航空航天和其他运输设备制造业",
-        label: "铁路、船舶、航空航天和其他运输设备制造业"}, {
-        value: "多式联运和运输代理业",
-        label: "多式联运和运输代理业"}, {
-        value: "装卸搬运和仓储业",
-        label: "装卸搬运和仓储业"}, {
-        value: "水的生产和供应业",
-        label: "水的生产和供应业"}, {
-        value: "批发业",
-        label: "批发业"}, {
-        value: "文教、工美、体育和娱乐用品制造业",
-        label: "文教、工美、体育和娱乐用品制造业"}, {
-        value: "房地产业",
-        label: "房地产业"}, {
-        value: "开采专业及辅助性活动",
-        label: "开采专业及辅助性活动"}, {
-        value: "通用设备制造业",
-        label: "通用设备制造业"}, {
-        value: "煤炭开采和洗选业",
-        label: "煤炭开采和洗选业"}, {
-        value: "食品制造业",
-        label: "食品制造业"}, {
-        value: "农副食品加工业",
-        label: "农副食品加工业"}, {
-        value: "有色金属矿采选业",
-        label: "有色金属矿采选业"}, {
-        value: "研究和试验发展",
-        label: "研究和试验发展"}, {
-        value: "酒、饮料和精制茶制造业",
-        label: "酒、饮料和精制茶制造业"}, {
-        value: "教育",
-        label: "教育"}, {
-        value: "专用设备制造业",
-        label: "专用设备制造业"}, {
-        value: "房屋建筑业",
-        label: "房屋建筑业"}, {
-        value: "纺织服装、服饰业",
-        label: "纺织服装、服饰业"}, {
-        value: "橡胶和塑料制品业",
-        label: "橡胶和塑料制品业"}, {
-        value: "水上运输业",
-        label: "水上运输业"}, {
-        value: "货币金融服务",
-        label: "货币金融服务"}, {
-        value: "黑色金属冶炼和压延加工业",
-        label: "黑色金属冶炼和压延加工业"}, {
-        value: "住宿业",
-        label: "住宿业"}, {
-        value: "燃气生产和供应业",
-        label: "燃气生产和供应业"}, {
-        value: "道路运输业",
-        label: "道路运输业"}, {
-        value: "生态保护和环境治理业",
-        label: "生态保护和环境治理业"}, {
-        value: "纺织业",
-        label: "纺织业"}, {
-        value: "化学纤维制造业",
-        label: "化学纤维制造业"}, {
-        value: "其他制造业",
-        label: "其他制造业"}, {
-        value: "广播、电视、电影和录音制作业",
-        label: "广播、电视、电影和录音制作业"}, {
-        value: "仪器仪表制造业",
-        label: "仪器仪表制造业"}, {
-        value: "皮革、毛皮、羽毛及其制品和制鞋业",
-        label: "皮革、毛皮、羽毛及其制品和制鞋业"}, {
-        value: "造纸和纸制品业",
-        label: "造纸和纸制品业"}, {
-        value: "印刷和记录媒介复制业",
-        label: "印刷和记录媒介复制业"}, {
-        value: "餐饮业",
-        label: "餐饮业"}, {
-        value: "公共设施管理业",
-        label: "公共设施管理业"}, {
-        value: "其他金融业",
-        label: "其他金融业"}, {
-        value: "土地管理业",
-        label: "土地管理业"}, {
-        value: "林业",
-        label: "林业"}, {
-        value: "农业",
-        label: "农业"}, {
-        value: "废弃资源综合利用业",
-        label: "废弃资源综合利用业"}, {
-        value: "畜牧业",
-        label: "畜牧业"}, {
-        value: "文化艺术业",
-        label: "文化艺术业"}, {
-        value: "建筑装饰、装修和其他建筑业",
-        label: "建筑装饰、装修和其他建筑业"}, {
-        value: "黑色金属矿采选业",
-        label: "黑色金属矿采选业"}, {
-        value: "其他采矿业",
-        label: "其他采矿业"}, {
-        value: "机动车、电子产品和日用产品修理业",
-        label: "机动车、电子产品和日用产品修理业"}, {
-        value: "家具制造业",
-        label: "家具制造业"}, {
-        value: "建筑安装业",
-        label: "建筑安装业"}, {
-        value: "其他服务业",
-        label: "其他服务业"}, {
-        value: "社会工作",
-        label: "社会工作"}, {
-        value: "渔业",
-        label: "渔业"}, {
-        value: "体育",
-        label: "体育"}, {
-        value: "居民服务业",
-        label: "居民服务业"}, {
-        value: "邮政业",
-        label: "邮政业"}, {
-        value: "金属制品、机械和设备修理业",
-        label: "金属制品、机械和设备修理业"}, {
-        value: "卫生",
-        label: "卫生"}, {
-        value: "木材加工和木、竹、藤、棕、草制品业",
-        label: "木材加工和木、竹、藤、棕、草制品业"}, {
-        value: "农、林、牧、渔专业及辅助性活动",
-        label: "农、林、牧、渔专业及辅助性活动"}, {
-        value: "非金属矿采选业",
-        label: "非金属矿采选业"}, {
-        value: "租赁业",
-        label: "租赁业"}, {
-        value: "水利管理业",
-        label: "水利管理业"}, 
-
-      
-      ],
+        options_industry: [
+          {label:'机构投资者',value:'institutional_investors'},
+          {label:'私募',value:'PrivFund'},
+          {label:'上市企业',value:'listedComp'},
+          {label:'海外机构',value:'ForeignComp'},
+          {label:'量化机构',value:'QuantFund'},
+        ],
         // 整合收据进行接收（3个）
         formInline1: {
+            timeType:'',
+            quarter_date:'',
+            pre_date:'',
             market: '',
             industry: '',
-            start_date:'',
-            end_date:'',
+            start_pre:'',
+            start_quarter:'',
+            end_pre:'',
+          end_quarter:'',
           },
         // 详情页
         formInline2: {
@@ -495,6 +623,10 @@
           regional_selection: false,//地域选择
           ndustry_selection: false,//行业选择
         },
+        formInline4: {
+          type:'',
+        },
+
 
         // 图表数据
         pieDataIndus:[],
@@ -507,10 +639,20 @@
 
         ],
         tableLabel: {
-          name: '主体名称',
-          main_risk: '主体风险',
-          zhfs: '影响力综合分数',
-          leve: '影响等级',
+          comp_name: '主体名称',
+          Total_score: '影响力综合分数',
+          grade: '影响等级',
+          spread_ability:'传播能力'
+        },
+        historyData:[],
+        timeLis:[],
+        historyDataLabel: {
+
+          // duration:'时间',
+          comp_name: '主体名称',
+          Total_score: '影响力综合分数',
+          // grade: '影响等级',
+          // spread_ability:'传播能力'
         },
                 // 柱状图
         barData: [
@@ -582,19 +724,27 @@
                   },
                   title: {
                     text: '风险行业分布',
+
                     x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    y:'bottom',
+
                     textStyle: {//主标题文本样式
                       fontSize: 13,
+                      color:'#696969',
                     },
-                    padding:[ 5,0,20,0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+                    padding:[ 35,0,5,0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
                   },
 
                   series: [
                     {
                       data: this.pieDataIndus,
                       type: 'pie',
+                      avoidLabelOverlap: true,   //是否启用防止标签重叠策略
+                      minAngle: 5,               //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互
+
                     }
                   ],
+
                 }
 
                 const option_2 = {
@@ -612,6 +762,7 @@
                     x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
                     textStyle: {//主标题文本样式
                       fontSize: 13,
+                      color:'#696969',
                     },
                     padding:[ 5,0,20,0],//[5,10] | [ 5,6, 7, 8] ,标题内边距
                   },
@@ -631,140 +782,411 @@
 
   },
     methods:{
-      width(){
-        return '60px'
-      },
+      // width(){
+      //   return '60px'
+      // },
     // 影响力排名
-    onSubmit1(){
-      console.log("影响力排名")
-      // console.log(this.formInline1)
-        http.get(
+      onSubmit1(){
+        console.log("影响力排名")
+        console.log(this.formInline1.start_date)
+        // console.log(this.formInline1)
+        //时间格式不一样，所以要分参数quarter_date
+        let options={
+          text:'请稍等'
+        }
+        let loadingInstance = Loading.service(options);
+        if (this.formInline1.timeType!=='quarter') {
+          http.get(
+              "/rank/network/",
+              {
+                params: {
+                  market: this.formInline1.market,
+                  com_type: this.formInline1.industry,
+                  time: this.formInline1.pre_date,
+                  time_type: this.formInline1.timeType
+                },
+                //   防止带中括号
+                paramsSerializer: params => {
+                  return qs.stringify(params, {indices: false})
+                }
+              }).then(response => {
+                loadingInstance.close()
+            if (response.data.length === 0)
+              alert('没有结果')
+            else {
+              let dat = response.data
+              this.tableData = dat
+              this.barData = dat
+
+              console.log(this.tableData)
+              this.result = response.data
+              // 柱状图
+              const echarts3 = echarts.init(this.$refs.echarts_3)
+              const option_3 = {
+                // 右上角存图
+                toolbox: {
+                  feature: {
+                    saveAsImage: {}
+                  }
+                },
+                legend: {
+                  // 图例文字颜色
+                  textStyle: {
+                    color: "#333",
+                  },
+                },
+                grid: {
+                  left: "20%",
+                },
+                // 提示框
+                tooltip: {
+                  trigger: "axis",
+                  axisPointer: {
+                    type: 'shadow'
+                  }
+                },
+                xAxis: {
+                  type: "category", // 类目轴
+                  // xData太多显示不出来
+                  data: []
+                },
+                yAxis: [
+                  {
+                    type: "value",
+                  }
+                ],
+                title: {
+                  text: '中心性分析',
+                  x: 'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                  y: "bottom",
+                  textStyle: {//主标题文本样式
+                    fontSize: 13,
+                  },
+                  padding: [5, 0, 10, 0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+                },
+                series: [
+                  {
+                    name: '介接近中心性',
+                    data: this.barData.map(item => item.CC),
+                    type: 'bar'
+                  },
+                  {
+                    name: '介数中心性',
+                    data: this.barData.map(item => item.BC),
+                    type: 'bar'
+                  },
+                  {
+                    name: '加权PageRank',
+                    data: this.barData.map(item => item['weighted-PR']),
+                    type: 'bar'
+                  },
+                  {
+                    name: '度中心性',
+                    data: this.barData.map(item => item.DC),
+                    type: 'bar'
+                  },
+
+                ],
+              }
+              echarts3.setOption(option_3)
+            }
+          }).finally(
+              ( )=>loadingInstance.close()
+          )
+        }
+        else {
+          {
+            http.get(
                 "/rank/network/",
-                {params:{
+                {
+                  params: {
                     market: this.formInline1.market,
-                    industry: this.formInline1.industry,
-                    start_date:this.formInline1.start_date,
-                    end_date:this.formInline1.end_date,
-        }}).then(response => {
-          let xData=[]
-            this.tableData= response.data.rank
-              this.barData=response.data.index
-              for (let i of this.barData) {
-                xData.push(i.n)
-                // delete i['n']
+                    com_type: this.formInline1.industry,
+                    time: this.formInline1.quarter_date,
+                    time_type: this.formInline1.timeType
+                  },
+                  //   防止带中括号
+                  paramsSerializer: params => {
+                    return qs.stringify(params, {indices: false})
+                  }
+                }).then(response => {
+                  loadingInstance.close()
+              if (response.data.length === 0)
+                alert('没有结果')
+              else {
+                let dat = response.data
+                this.tableData = dat
+                this.barData = dat
+
+                console.log(this.tableData)
+                this.result = response.data
+                // 柱状图
+                const echarts3 = echarts.init(this.$refs.echarts_3)
+                const option_3 = {
+                  // 右上角存图
+                  toolbox: {
+                    feature: {
+                      saveAsImage: {}
+                    }
+                  },
+                  legend: {
+                    // 图例文字颜色
+                    textStyle: {
+                      color: "#333",
+                    },
+                  },
+                  grid: {
+                    left: "20%",
+                  },
+                  // 提示框
+                  tooltip: {
+                    trigger: "axis",
+                    axisPointer: {
+                      type: 'shadow'
+                    }
+                  },
+                  xAxis: {
+                    type: "category", // 类目轴
+                    // xData太多显示不出来
+                    data: []
+                  },
+                  yAxis: [
+                    {
+                      type: "value",
+                    }
+                  ],
+                  title: {
+                    text: '中心性分析',
+                    x: 'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    y: "bottom",
+                    textStyle: {//主标题文本样式
+                      fontSize: 13,
+                    },
+                    padding: [5, 0, 10, 0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+                  },
+                  series: [
+                    {
+                      name: '介接近中心性',
+                      data: this.barData.map(item => item.CC),
+                      type: 'bar'
+                    },
+                    {
+                      name: '介数中心性',
+                      data: this.barData.map(item => item.BC),
+                      type: 'bar'
+                    },
+                    {
+                      name: '加权PageRank',
+                      data: this.barData.map(item => item['weighted-PR']),
+                      type: 'bar'
+                    },
+                    {
+                      name: '度中心性',
+                      data: this.barData.map(item => item.DC),
+                      type: 'bar'
+                    },
+
+                  ],
+                }
+                echarts3.setOption(option_3)
               }
-          // console.log(xData)
-          this.result=response.data
-          // 柱状图
-          const echarts3 = echarts.init(this.$refs.echarts_3)
-          const option_3 = {
-            // 右上角存图
-            toolbox: {
-              feature: {
-                saveAsImage: {}
-              }
-            },
-            legend: {
-              // 图例文字颜色
-              textStyle: {
-                color: "#333",
-              },
-            },
-            grid: {
-              left: "20%",
-            },
-            // 提示框
-            tooltip: {
-              trigger: "axis",
-              axisPointer: {
-                type: 'shadow'
-              }
-            },
-            xAxis: {
-              type: "category", // 类目轴
-              // xData太多显示不出来
-              data:[]
-            },
-            yAxis: [
-              {
-                type: "value",}
-            ],
-            title: {
-              text: '中心性分析',
-              x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
-              y:"bottom",
-              textStyle: {//主标题文本样式
-                fontSize: 13,
-              },
-              padding:[ 5,0,10,0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
-            },
-            series: [
-              {
-                name: '介接近中心性',
-                data: this.barData.map(item => item.C),
-                type: 'bar'
-              },
-              {
-                name: '介数中心性',
-                data: this.barData.map(item => item.B),
-                type: 'bar'
-              },
-              {
-                name: 'PageRank',
-                data: this.barData.map(item => item.P),
-                type: 'bar'
-              },
-              {
-                name: '度中心性',
-                data: this.barData.map(item => item.D),
-                type: 'bar'
-              }
-            ],
+            }).finally(
+               ( )=>loadingInstance.close()
+            )
           }
-          echarts3.setOption(option_3)
+        }
 
+      },
 
-        })
-    },
     // 关联主体、影响范围
     onSubmit2(){
+      this.relatedRes.length=0
       http.get('/rank/relate/',
       {params:{
             name:this.seleced,
-            type: this.type,
-          market:this.formInline1.market,
+            type: this.typeRela,
+            market:this.formInline1.market,
             industry: this.formInline1.industry,
             start_date:this.formInline1.start_date,
             end_date:this.formInline1.end_date,
       }}).then(res=>{
-        for (let i in res.data)
-        {this.relatedRes.push(res.data[i])
+        // console.log(res.data)
+        if (res.data!=='null'){
+          this.relatedRes.length=0
+          for (let i in res.data)
+          {this.relatedRes.push(res.data[i])
           }
-        console.log(this.relatedRes)
-        this.showRelated=true
+          console.log(this.relatedRes)
+          this.showRelated=true
+        }
+        else
+          this.$message({
+            showClose: true,
+            message: '未查询到结果',
+            type: 'info'
+          });
+
       })
     },
-    detail(row){
-      this.seleced=row.name
+    // 按行业、地域
+      onSubmit3(){
+      // this.relatedRes.length=0
+        http.get('/rank/spread/',
+            {params:{
+                name:this.seleced,
+                type: this.typeSpread,
+                market:this.formInline1.market,
+                industry: this.formInline1.industry,
+                start_date:this.formInline1.start_date,
+                end_date:this.formInline1.end_date,
+              }}).then(res=>{
+          console.log(res.data.data)
 
+        })
+      },
+      // 纵向对比表单提交
+      onSubmit4() {
+        if (this.formInline1.timeType !== 'quarter') {
+          http.get('/rank/history/',
+              {
+                params: {
+                  market: this.formInline1.market,
+                  com_type: this.formInline1.industry,
+                  time_type: this.formInline1.timeType,
+                  start: this.formInline1.start_pre,
+                  end: this.formInline1.end_pre,
+                },
+                paramsSerializer: params => {
+                  return qs.stringify(params, {indices: false})
+                }
+              }).then(res => {
+            if (res.data.length === 0)
+              alert('没有结果')
+            else {
+              // let tmp = res.data
+              // this.getSpanArr(tmp)
+              this.historyData=res.data.data
+              this.timeLis=res.data.time
+            }
+
+
+          })
+        } else {
+          http.get('/rank/history/',
+              {
+                params: {
+                  market: this.formInline1.market,
+                  com_type: this.formInline1.industry,
+                  time_type: this.formInline1.timeType,
+                  start: this.formInline1.start_quarter,
+                  end: this.formInline1.end_quarter,
+                },
+                paramsSerializer: params => {
+                  return qs.stringify(params, {indices: false})
+                }
+              }).then(res => {
+            if (res.data.length === 0)
+              alert('没有结果')
+            else {
+              // let tmp = res.data.data
+              // this.getSpanArr(tmp)
+              this.historyData=res.data.data
+              this.timeLis=res.data.time
+
+            }
+          })
+        }
+      },
+      getSpanArr(list) {
+        // 先给所有的数据都加一个v.rowspan = 1
+        list.forEach(item => {
+          item.rowspan = 1;
+          // item.rowspan1 = 1;
+          // 有几列想合并就设置几个
+
+        });
+        // 双层循环
+        for (let i = 0; i < list.length; i++) {
+          for (let j = i + 1; j < list.length; j++) {
+            //此处可根据相同字段进行合并
+            if (list[i].duration=== list[j].duration) {
+              list[i].rowspan++;
+              list[j].rowspan--;
+            }
+            // if (list[i].duration=== list[j].duration  && list[i].Total_score === list[j].Total_score ) {
+            //   list[i].rowspan1++;
+            //   // list[j].rowspan1--;
+            // }
+          }
+          console.log(list[i].rowspan)
+          // 这里跳过已经重复的数据
+          i = i + list[i].rowspan - 1;
+          // i = i + list[i].rowspan1 - 1;
+        }
+        this.historyData.length=0
+        this.historyData = list;
+        console.log(this.historyData)
+      },
+
+      // 复杂表格合并相同列
+      ObjectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        // 第一列
+        if (columnIndex === 0) {
+          return {
+            rowspan: row.rowspan,
+            colspan: 1,
+          };
+        }
+        // 第二列
+        // if (columnIndex === 1) {
+        //   return {
+        //     rowspan: row.rowspan1,
+        //     colspan: 1,
+        //   };
+        // }
+        // row.XXX的值跟上述函数对应
+
+      },
+
+    detail(row){
+      this.seleced=row.comp_name
+      this.datelis.length=0
+      this.asset.length=0
+      this.held_num.length=0
+      http.get('/rank/asset/',
+          {params:{
+              comp_name:this.seleced,
+            }}).then(res=>{
+            for (let i in res.data)
+            {
+              this.datelis.push(res.data[i]['duration'].slice(0,11))
+              this.asset.push(res.data[i]['asset'])
+              this.held_num.push(res.data[i]['held_num'])
+            }
+
+      })
       this.detailData.length=0
-      let tmp
-      for (let i in this.result.index)
+      for (let i in this.tableData)
       {
-        console.log(this.result.index[i].n)
-        if (this.result.index[i].n===this.seleced)
-          tmp=this.result.index[i]
-       }
-      console.log(this.result.rank)
-      for (let i in this.result.rank)
-        if (this.result.rank[i].name===this.seleced)
-          tmp=Object.assign(this.result.rank[i],tmp)
-          // tmp=[...this.result.rank[i],tmp]
-      this.detailData=Array(tmp)
+        if (this.tableData[i]['comp_name']===this.seleced)
+          this.detailData=Array(this.tableData[i])
+      }
+      // let tmp
+      // for (let i in this.result.index)
+      // {
+      //   console.log(this.result.index[i].n)
+      //   if (this.result.index[i].n===this.seleced)
+      //     tmp=this.result.index[i]
+      //  }
+      // console.log(this.result.rank)
+      // for (let i in this.result.rank)
+      //   if (this.result.rank[i].name===this.seleced)
+      //     tmp=Object.assign(this.result.rank[i],tmp)
+      //     // tmp=[...this.result.rank[i],tmp]
+      // this.detailData=Array(tmp)
         console.log(this.detailData)
       // console.log(row.name)//返回这一行所有的内容
-      //这个地方需要连一个新接口
-      //提供弹窗的数据
+
       this.detailsdialog = true//打开弹窗
     },
     initEcharts() {
@@ -905,7 +1327,7 @@
   background-color: #aaaaaa;//背景颜色
 }
 /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
-      border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
+      border-bottom: 1px solid rgba(242, 242, 242, 0.654901960784314) !important;
       padding: 0px 0 !important;
       min-width: 0 !important;
     }
@@ -932,14 +1354,16 @@
     justify-content:space-between;//左右贴边
     // margin-top:5px; 
     // height: 40px;
-    padding-left: 50px;
+    padding-left: 10px;
+    margin-bottom: 0px;
+    padding-bottom: 0px;
 
   }
   
   // 第一层
   .one_twins_card{
     margin-top:0px;
-    margin-bottom:10px;
+    margin-bottom:3px;
     display:flex;
     justify-content:space-between;//左右贴边
     .el-card {
@@ -951,40 +1375,35 @@
 }
     // 数据
     .num_card{
-    margin-top: 60px;
-    margin-left: 80px;
-    margin-right: 80px;
+    margin-top: 40px;
+    margin-left: 10px;
+    margin-right: 10px;
     margin-bottom: 20px;
-    display:flex;
-    flex-direction:column;//主轴显示
-    justify-content:space-center;//左右贴边
-    // align-items:center;//居中
+
 
     .desc{
-      // margin-bottom:10px;
-      // margin-left:20px;
-      // margin-right:50px;
       text-align: center;//居中
       font-weight: bold;//字体加粗
-      font-size: 16px;
+      font-size: 17px;
+      color:'#696969';
 
     }
     .desc_value{
-      // margin-left:40px;
-      // margin-right:50px;
       text-align: center;//居中
-      font-size: 15px;
+      font-size: 18px;
       color:#02A7F0;;
     }
 
-    .el-divider--vertical {
-    /* display: inline-block; */
-    height: 3em;//分割线宽度
-    text-align: center;//居中
-   
-    // margin-right:100px;
 
-    }
+
+
+    .el-divider--horizontal {
+    display: flex;
+    justify-content:center;
+    height: 1px;
+    width: 80%;
+    margin: 24px 70px 24px 30px;//上 右 下 左
+  }
     .el-statistic {
         font-size: 13px;
         color:#02A7F0;;//没改成，之后再改
@@ -994,10 +1413,10 @@
         display:flex;
         justify-content:space-between;
         // padding:10px;
-        margin-top: 30px;
-        margin-left: 20px;
-        margin-right: 20px;
-        margin-bottom: 20px;
+        // margin-top: 30px;
+        // margin-left: 20px;
+        // margin-right: 20px;
+        // margin-bottom: 20px;
 
     }
   }
@@ -1008,10 +1427,10 @@
 
   // 表格中操作
   .content{
-    display:flex;
-    justify-content:space-between;
+    // display:flex;
+    // justify-content:space-between;
     .table{
-    padding: 20px 2px 2px 20px;//返回表格添加间隙 上 右
+    padding: 20px 10px 2px 10px;//返回表格添加间隙 上 右
 
 
     // 调整表头间隔、设置表头下方边框颜色
@@ -1026,13 +1445,13 @@
     }
     /deep/ .active_header{//表头
       color: #333333;
-      font-size: 12px;
+      font-size: 13px;
       text-align: center !important;
       // height: 1px;
     }
     /deep/ .content_center{//表的内容
       text-align: center !important;
-      font-size: 12px;
+      font-size: 13px;
     }
   
 
@@ -1050,11 +1469,31 @@
     // padding:20px;
 }
 }
- 
-  
-  
+
+.grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+    margin-bottom: 20px;
+  }
   
   
+
+ .sublabel{ // 小标签标识
+    // font-size: 13px;
+    // padding:2px;
+    margin-top:10px;
+    background-color: rgba(2, 167, 240, 0.5);
+    width: 5px; 
+    height: 35px;
+    
+  } 
+  .title{
+    padding-left: 4px;
+    margin-top:15px;
+    font-weight: bold;//字体加粗
+    display:flex;
+    justify-content:flex-start
+}
   
    
    
diff --git a/src/views/高影响力主体分析old.vue b/src/views/高影响力主体分析old.vue
new file mode 100644
index 0000000..d0cd87f
--- /dev/null
+++ b/src/views/高影响力主体分析old.vue
@@ -0,0 +1,1477 @@
+<template>
+
+    <el-row> 
+      <el-tabs type="border-card"> 
+        <!-- 1、横向对比 -->
+        <el-tab-pane label="横向对比">
+           <!-- 搜索栏 -->
+          <div class="form">
+                                                          <!-- inline="true"表单域在一行 -->
+            <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+              <el-form-item label="市场">
+                <el-select   v-model="formInline1.market" placeholder="选择市场" size="mini">
+                  <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="主体类型">
+                <el-select   v-model="formInline1.industry" placeholder="选择行业" size="mini">
+                  <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="时间粒度">
+                <el-select   v-model="formInline1.timeType" placeholder="选择时间粒度" size="mini">
+                  <el-option v-for="item in optionsTime" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="时间">
+  <!--              <span class="demonstration">月</span>-->
+                <el-date-picker
+                    v-if="formInline1.timeType==='month'"
+                    v-model="formInline1.pre_date"
+                    type="month"
+                    size="mini"
+                    placeholder="选择月">
+                </el-date-picker>
+                <quter-component  v-if="formInline1.timeType==='quarter'" v-model="formInline1.quarter_date"></quter-component>
+                <half-year v-if="formInline1.timeType==='half_year'" v-model="formInline1.pre_date"/>
+              </el-form-item>
+  <!--            <el-form-item label="时间">-->
+  <!--              <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+  <!--            </el-form-item>-->
+
+  <!--            <el-form-item label="结束时间">-->
+  <!--              <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+  <!--            </el-form-item>-->
+              <el-form-item>
+                <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+
+
+
+<!--          <div class="one_twins_card">-->
+<!--              &lt;!&ndash; 一左 &ndash;&gt;-->
+<!--              <el-card style=" height:300px;width: 30%;" :body-style={padding:0}>         &lt;!&ndash;:body-style={padding:0}取消卡片边距，btn就能在左上角 &ndash;&gt;-->
+<!--                <span class="superscript" style="width: 20px; height: 40px;">总体分析</span>-->
+<!--                <div class="num_card" :body-style="{display: 'flex'}">-->
+<!--                  &lt;!&ndash; <el-row > &ndash;&gt;-->
+<!--                        &lt;!&ndash; <el-col :span="11"> &ndash;&gt;-->
+<!--                          <div>-->
+<!--                            <p class="desc">高影响力风险主体总量:</p>-->
+<!--                            <p class="desc_value">{{ totalRisk }}个</p>-->
+<!--                          </div>-->
+
+
+<!--                          <el-divider style="width:60%"></el-divider>-->
+
+
+<!--                        &lt;!&ndash; </el-col>-->
+<!--                        <el-col :span="2">-->
+<!--                          <el-divider direction="vertical"  content-position="center"></el-divider>-->
+
+<!--                        </el-col> &ndash;&gt;-->
+<!--                        -->
+<!--                        &lt;!&ndash; <el-col :span="11"> &ndash;&gt;-->
+<!--                          <div>-->
+<!--                            <p class="desc">高影响力主体风险类型:</p>-->
+<!--                            <p class="desc_value">{{totalType}}种</p>-->
+<!--                          </div>-->
+<!--                        &lt;!&ndash; </el-col> &ndash;&gt;-->
+<!--                  &lt;!&ndash; </el-row> &ndash;&gt;-->
+
+<!--              </div>-->
+<!--              </el-card>-->
+<!--              -->
+<!--              &lt;!&ndash; 一右 &ndash;&gt;-->
+<!--              <el-card style=" height:300px;width: 68%;" :body-style={padding:0}>-->
+<!--                <div>-->
+<!--                  <span class="superscript" style="width: 20px; height: 40px;">风险分布</span>-->
+<!--                  &lt;!&ndash; 两个饼状图 &ndash;&gt;-->
+<!--                  <div class="twins_pie">-->
+
+<!--                    <div ref="echarts_1" style="height:280px;width:400px"></div>-->
+<!--                    <div ref="echarts_2" style="height:280px;width:400px"></div>-->
+
+<!--                    &lt;!&ndash; <div ref="echarts1" style="height: 100px"></div> &ndash;&gt;-->
+<!--                    &lt;!&ndash; <div ref="echarts2" style="height: 100px"></div> &ndash;&gt;-->
+<!--                  </div>-->
+
+
+<!--              </div>-->
+<!--              </el-card>-->
+<!--          </div>-->
+
+          <!-- 第二层表格与图像 -->
+          <div class="two">
+            <el-card :body-style={padding:0} style='height: 400px;width: 100%;'>
+              <!-- 1、上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">影响力排名</span>
+
+      <!--        模型暂时不支持-->
+      <!--         <el-form :inline="true"  class="demo-form-inline" :model="formInline4" ref="formInline">-->
+      <!--            <el-form-item label="个体类型" style="margin: 0px;padding-left: 80px;padding-top: 5px">-->
+      <!--              <el-select  v-model="formInline4.type"  size="mini">-->
+      <!--                <el-option label="私募" value="私募"></el-option>-->
+      <!--                <el-option label="公募" value="公募"></el-option>-->
+      <!--              </el-select>-->
+      <!--            </el-form-item>-->
+      <!--        </el-form>-->
+              
+              <!-- 2、内容 -->
+              <div class="content">
+
+                <div class="table" style="width: 50%; float: left; overflow: hidden">
+                  <el-table :data="tableData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                        border  
+                        height="250" 
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center"
+                        style="width: 90%">          <!-- style="width: 40%"               height="215"  -->
+                      <el-table-column v-for='(val,key) in tableLabel' :prop="key" :label="val"  :key="key"/><!--插槽里面没有东西就可以用单标签  -->
+                      <el-table-column
+                              prop="scale"
+                              label="操作">
+                              <template slot-scope="scope">
+                                <span class="text"  v-on:click="detail(scope.row)">查看详情</span>
+                              </template>
+                          </el-table-column>
+                  </el-table>
+                </div>
+
+              <div>
+                <!-- 详细信息弹窗，默认关闭 -->
+                <el-dialog  :visible.sync="detailsdialog" width="100%" @open="open()" >
+                  <!-- title="收货地址" -->
+                  <el-card >
+                  <!-- 详细信息 -->
+                  <el-card style=" height:600px;margin-bottom:10px ; " :body-style={padding:0} >    
+                    <span class="superscript" style="width: 20px; height: 40px;">详细信息</span>
+                    <el-table :data="detailData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border  
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center"
+                        style="margin:15px;">     
+                        <el-table-column
+                        prop="comp_name"
+                        label="主体名称"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column label="市场结构">
+                        <el-table-column
+                          prop="DC"
+                          label="度中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="BC"
+                          label="介数中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="CC"
+                          label="接近中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="weighted-PR"
+                          label="加权PageRank"
+                          width="120">
+                        </el-table-column>
+                      </el-table-column>
+                        <el-table-column label="个体规模">
+                          <el-table-column
+                            prop="region"
+                            label="所在区域"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                            prop="held_num"
+                            label="持股数量"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                              prop="asset"
+                              label="当前资金规模"
+                              width="120">
+                          </el-table-column>
+                        </el-table-column>
+      <!--                  <el-table-column-->
+      <!--                  prop="主体风险"-->
+      <!--                  label="主体风险"-->
+      <!--                  width="120">-->
+      <!--                </el-table-column>-->
+                      <el-table-column
+                        prop="Total_score"
+                        label="影响力综合分数"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column
+                        prop="grade"
+                        label="影响等级"
+                        width="120">
+                      </el-table-column>
+      <!--                <el-table-column-->
+      <!--                        prop="scale"-->
+      <!--                        label="操作">-->
+      <!--                        <template slot-scope="scope">-->
+      <!--                          <span class="text"  v-on:click="detail(scope.row)">查看风险指标详情</span>-->
+      <!--                        </template>-->
+      <!--                    </el-table-column>-->
+                    </el-table>
+                    <div style="display:flex;">
+                      <el-divider direction="vertical" class="sublabel"></el-divider>
+                      <span class='title'>个体规模分析</span>
+                    </div>
+      <!--              模型暂时不支持-->
+      <!--              <el-form :inline="true"  class="demo-form-inline" :model="formInline4" ref="formInline">-->
+      <!--                <el-form-item label="指标" style="margin: 0px;padding-left: 80px;padding-top: 5px">-->
+      <!--                  <el-select  v-model="formInline4.type"  size="mini">-->
+      <!--                    <el-option label="基金规模" value="基金规模"></el-option>-->
+      <!--                    <el-option label="持股数量" value="持股数量"></el-option>-->
+      <!--                  </el-select>-->
+      <!--                </el-form-item>-->
+      <!--              </el-form>-->
+                    <DifferentialChart :asset="asset" :datelis="datelis" :held_num="held_num"/>
+              
+
+
+                  </el-card>
+                          
+                  <!-- 关联主体 -->
+                  <el-card style=" height:300px;margin-bottom:10px " :body-style={padding:0} >
+                    <span class="superscript" style="width: 20px; height: 40px;">关联主体</span>
+                      
+                    <!-- 表单 -->
+                    <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                        <el-form :inline="true"  :model="formInline2" class="demo-form-inline" style="margin: 10px;">
+                          <template>
+                            <el-radio v-model="typeRela" label="key_node">关键节点</el-radio>
+                            <el-radio v-model="typeRela" label="other">相似节点</el-radio>
+                          </template>
+                          <el-form-item>
+                            <el-button class="grayish_btn" @click="onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
+                          </el-form-item>
+                        </el-form>
+                    </div>
+                    <!-- 关联主体点 -->
+                    <div style="display:flex;padding-left:130px" v-if="showRelated">
+                      <el-button  v-for='(val,key) in relatedRes'  :key="key"  round style=" height:100px; width:300px ;margin-right:50px">{{val}}</el-button>
+                    </div>
+                  </el-card>
+
+                  <!-- 影响范围 -->
+      <!--            <el-card style=" height:400px; " :body-style={padding:0} >    -->
+      <!--              <span class="superscript" style="width: 20px; height: 40px;margin-bottom: 10px;">风险影响</span>-->
+      <!--              <div class="form">-->
+      <!--                                                        &lt;!&ndash; inline="true"表单域在一行 &ndash;&gt;-->
+      <!--                  <el-form :inline="true"  :model="formInline3" class="demo-form-inline">-->
+      <!--                    <template>-->
+      <!--                      <el-radio v-model="typeSpread" label="industry">行业</el-radio>-->
+      <!--                      <el-radio v-model="typeSpread" label="regions">地域</el-radio>-->
+      <!--                    </template>-->
+      <!--&lt;!&ndash;                    <el-form-item >&ndash;&gt;-->
+      <!--&lt;!&ndash;                      <el-checkbox v-model="formInline3.ndustry_selection">行业</el-checkbox>&ndash;&gt;-->
+      <!--&lt;!&ndash;                    </el-form-item>&ndash;&gt;-->
+
+      <!--&lt;!&ndash;                    <el-form-item >&ndash;&gt;-->
+      <!--&lt;!&ndash;                      <el-checkbox v-model="formInline3.regional_selection">地域</el-checkbox>&ndash;&gt;-->
+      <!--&lt;!&ndash;                    </el-form-item>&ndash;&gt;-->
+
+      <!--                    <el-form-item>-->
+      <!--                      <el-button class="grayish_btn" @click="onSubmit3" icon="el-icon-search" size="mini">查询</el-button>-->
+      <!--                    </el-form-item>-->
+      <!--                  </el-form>-->
+      <!--              </div>-->
+      <!--              <div class="flex-charts">-->
+      <!--                <div ref="echarts_4" style="height:300px;width:50%"></div>-->
+      <!--                <div ref="echarts_5" style="height:300px;width:50%"></div>-->
+      <!--            </div>-->
+      <!--            </el-card>-->
+                </el-card>
+                </el-dialog>
+              </div>
+
+                <div class='bar' style="width: 50%; float: left; overflow: hidden">
+                  <div ref="echarts_3" style="height:300px;width:100%"></div>
+                </div>
+
+            </div>
+
+
+            </el-card>
+
+
+          </div>
+   
+        </el-tab-pane>
+
+
+        <!-- 2、纵向对比 -->
+        <el-tab-pane label="纵向对比">
+          <!-- 搜索栏 -->
+          <div class="form">
+                                                          <!-- inline="true"表单域在一行 -->
+            <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+              <el-form-item label="市场">
+                <el-select   v-model="formInline1.market" placeholder="选择市场" size="mini">
+                  <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="主体类型">
+                <el-select   v-model="formInline1.industry" placeholder="选择行业" size="mini">
+                  <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="时间粒度">
+                <el-select   v-model="formInline1.timeType" placeholder="选择时间粒度" size="mini">
+                  <el-option v-for="item in optionsTime" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+
+              <el-form-item label="开始时间">
+
+                <el-date-picker
+                    v-if="formInline1.timeType==='month'"
+                    v-model="formInline1.start_pre"
+                    type="month"
+                    size="mini"
+                    placeholder="选择月">
+                </el-date-picker>
+                <quter-component  v-if="formInline1.timeType==='quarter'" v-model="formInline1.start_quarter"></quter-component>
+                <half-year v-if="formInline1.timeType==='half_year'" v-model="formInline1.start_pre"/>
+<!--                原始时间组件-->
+<!--                <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+              </el-form-item>
+              <el-form-item label="结束时间">
+
+                <el-date-picker
+                    v-if="formInline1.timeType==='month'"
+                    v-model="formInline1.end_pre"
+                    type="month"
+                    size="mini"
+                    placeholder="选择月">
+                </el-date-picker>
+                <quter-component  v-if="formInline1.timeType==='quarter'" v-model="formInline1.end_quarter"></quter-component>
+                <half-year v-if="formInline1.timeType==='half_year'" v-model="formInline1.end_pre"/>
+
+<!--                <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+              </el-form-item>
+              <el-form-item>
+                <el-button class="grayish_btn" @click="onSubmit4" icon="el-icon-search" size="mini">查询</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="table" style=" overflow: hidden">
+                  <el-table :data="historyData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                        border  
+                        height="400" 
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center">          <!-- style="width: 40%"               height="215"  -->
+                    <el-table-column v-for='(val,key) in timeLis' :prop="key" :label="val"  :key="key">
+<!--                      <el-table-column v-for='(val,key) in historyDataLabel' :prop="key" :label="val"  :key="key"/>&lt;!&ndash;插槽里面没有东西就可以用单标签  &ndash;&gt;-->
+                      <!--                      <el-table-column-->
+                      <!--                              prop="scale"-->
+                      <!--                              label="操作">-->
+                      <!--                              <template slot-scope="scope">-->
+                      <!--                                <span class="text"  v-on:click="detail(scope.row)">查看详情</span>-->
+                      <!--                              </template>-->
+                      <!--                          </el-table-column>-->
+
+                    </el-table-column>
+
+                  </el-table>
+          </div>
+
+              <div>
+                <!-- 详细信息弹窗，默认关闭 -->
+                <el-dialog  :visible.sync="detailsdialog" width="100%" @open="open()" >
+                  <!-- title="收货地址" -->
+                  <el-card >
+                  <!-- 详细信息 -->
+                  <el-card style=" height:600px;margin-bottom:10px ; " :body-style={padding:0} >    
+                    <span class="superscript" style="width: 20px; height: 40px;">详细信息</span>
+                    <el-table :data="detailData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border  
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center"
+                        style="margin:15px;">     
+                        <el-table-column
+                        prop="comp_name"
+                        label="主体名称"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column label="市场结构">
+                        <el-table-column
+                          prop="DC"
+                          label="度中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="BC"
+                          label="介数中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="CC"
+                          label="接近中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="weighted-PR"
+                          label="加权PageRank"
+                          width="120">
+                        </el-table-column>
+                      </el-table-column>
+                        <el-table-column label="个体规模">
+                          <el-table-column
+                            prop="region"
+                            label="所在区域"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                            prop="held_num"
+                            label="持股数量"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                              prop="asset"
+                              label="当前资金规模"
+                              width="120">
+                          </el-table-column>
+                        </el-table-column>
+      <!--                  <el-table-column-->
+      <!--                  prop="主体风险"-->
+      <!--                  label="主体风险"-->
+      <!--                  width="120">-->
+      <!--                </el-table-column>-->
+                      <el-table-column
+                        prop="Total_score"
+                        label="影响力综合分数"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column
+                        prop="grade"
+                        label="影响等级"
+                        width="120">
+                      </el-table-column>
+      <!--                <el-table-column-->
+      <!--                        prop="scale"-->
+      <!--                        label="操作">-->
+      <!--                        <template slot-scope="scope">-->
+      <!--                          <span class="text"  v-on:click="detail(scope.row)">查看风险指标详情</span>-->
+      <!--                        </template>-->
+      <!--                    </el-table-column>-->
+                    </el-table>
+                    <div style="display:flex;">
+                      <el-divider direction="vertical" class="sublabel"></el-divider>
+                      <span class='title'>个体规模分析</span>
+                    </div>
+      <!--              模型暂时不支持-->
+      <!--              <el-form :inline="true"  class="demo-form-inline" :model="formInline4" ref="formInline">-->
+      <!--                <el-form-item label="指标" style="margin: 0px;padding-left: 80px;padding-top: 5px">-->
+      <!--                  <el-select  v-model="formInline4.type"  size="mini">-->
+      <!--                    <el-option label="基金规模" value="基金规模"></el-option>-->
+      <!--                    <el-option label="持股数量" value="持股数量"></el-option>-->
+      <!--                  </el-select>-->
+      <!--                </el-form-item>-->
+      <!--              </el-form>-->
+                    <DifferentialChart :asset="asset" :datelis="datelis" :held_num="held_num"/>
+              
+
+
+                  </el-card>
+                          
+                  <!-- 关联主体 -->
+                  <el-card style=" height:300px;margin-bottom:10px " :body-style={padding:0} >
+                    <span class="superscript" style="width: 20px; height: 40px;">关联主体</span>
+                      
+                    <!-- 表单 -->
+                    <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                        <el-form :inline="true"  :model="formInline2" class="demo-form-inline" style="margin: 10px;">
+                          <template>
+                            <el-radio v-model="typeRela" label="key_node">关键节点</el-radio>
+                            <el-radio v-model="typeRela" label="other">相似节点</el-radio>
+                          </template>
+                          <el-form-item>
+                            <el-button class="grayish_btn" @click="onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
+                          </el-form-item>
+                        </el-form>
+                    </div>
+                    <!-- 关联主体点 -->
+                    <div style="display:flex;padding-left:130px" v-if="showRelated">
+                      <el-button  v-for='(val,key) in relatedRes'  :key="key"  round style=" height:100px; width:300px ;margin-right:50px">{{val}}</el-button>
+                    </div>
+                  </el-card>
+
+                </el-card>
+                </el-dialog>
+              </div>
+                     
+        </el-tab-pane>
+</el-tabs>
+  </el-row>
+</template>
+  
+<script>
+import * as echarts from "echarts"
+import http from '../utils/request'
+import DifferentialChart from "@/components/echarts/DifferentialChart.vue";
+import halfYear from "@/components/halfYear";
+import quterComponent from "@/components/quterComponent";
+import qs from "qs";
+  export default {
+    components:{
+      DifferentialChart,
+      halfYear,
+      quterComponent,
+},
+    data() {
+      return {
+        datelis:[],
+        asset:[],
+        held_num:[],
+        width:null,
+        result:{},
+        showRelated:false,
+        relatedRes:[],
+        seleced:'',
+        typeRela:null,
+        typeSpread:null,
+        totalRisk:Number,
+        totalType:Number,
+// 【详情页】
+        // 详情页是否打开的判断标签
+        detailsdialog: false,
+
+        detailData: [
+         {
+          主体名称:'主体1'
+         }
+        ],
+        
+// 【搜索栏】
+        // 选择框——1市场选项
+        options_market: [{
+          value: 'stock',
+          label: '股票'
+        }, {
+          value: '期货',
+          label: '期货'
+        }, {
+          value: '债券',
+          label: '债券'
+        }],
+        optionsTime:[
+          {label: '半年',value:'half_year'},
+          {label: '季度',value:'quarter'},
+          {label: '月',value:'month'},
+        ],
+        // 选择框——2行业选项
+        options_industry: [
+          {label:'公募',value:'PubFund'},
+          {label:'私募',value:'PrivFund'},
+          {label:'上市企业',value:'listedComp'},
+          {label:'海外机构',value:'ForeignComp'},
+          {label:'量化机构',value:'QuantFund'},
+        ],
+        // 整合收据进行接收（3个）
+        formInline1: {
+            timeType:'',
+            quarter_date:'',
+            pre_date:'',
+            market: '',
+            industry: '',
+            start_pre:'',
+            start_quarter:'',
+            end_pre:'',
+          end_quarter:'',
+          },
+        // 详情页
+        formInline2: {
+          key_nodes: false,
+          transmissibility_max: false,
+        },
+        formInline3: {
+          regional_selection: false,//地域选择
+          ndustry_selection: false,//行业选择
+        },
+        formInline4: {
+          type:'',
+        },
+
+
+        // 图表数据
+        pieDataIndus:[],
+        pieDataType:[],
+        tableData: [
+          { name: '主体1',
+            main_risk: '市场风险',
+            zhfs: 85,
+            leve: "中",},
+
+        ],
+        tableLabel: {
+          comp_name: '主体名称',
+          Total_score: '影响力综合分数',
+          grade: '影响等级',
+          spread_ability:'传播能力'
+        },
+        historyData:[],
+        timeLis:[],
+        historyDataLabel: {
+
+          // duration:'时间',
+          comp_name: '主体名称',
+          Total_score: '影响力综合分数',
+          // grade: '影响等级',
+          // spread_ability:'传播能力'
+        },
+                // 柱状图
+        barData: [
+          {
+            date: '周一',
+            new: 5,
+            active: 200
+          },
+          {
+            date: '周二',
+            new: 10,
+            active: 500
+          },
+          {
+            date: '周三',
+            new: 12,
+            active: 550
+          },
+          {
+            date: '周四',
+            new: 60,
+            active: 800
+          },
+          {
+            date: '周五',
+            new: 65,
+            active: 550
+          },
+          {
+            date: '周六',
+            new: 53,
+            active: 770
+          },
+          {
+            date: '周日',
+            new: 33,
+            active: 170
+          }
+        ],
+
+        
+        
+
+
+      }},
+    
+    mounted(){
+               // 饼状图
+              const echarts1 = echarts.init(this.$refs.echarts_1)
+              const echarts2 = echarts.init(this.$refs.echarts_2)
+              http.get('/risk_model/get_data/').then(response=>{
+                for (let key in response.data['行业分布']){
+                  this.pieDataIndus.push({name:key,value:response.data['行业分布'][key]})
+                }
+                for (let key in response.data['风险分布']){
+                  this.pieDataType.push({name:key,value:response.data['风险分布'][key]})
+                }
+                this.totalType=response.data['风险类型']
+                this.totalRisk=response.data['个体总数']
+                const option_1 = {
+                  // 右上角存图
+                  toolbox: {
+                    feature: {
+                      saveAsImage: {}
+                    }
+                  },
+                  tooltip: {
+                    trigger: "item",
+                  },
+                  title: {
+                    text: '风险行业分布',
+
+                    x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    y:'bottom',
+
+                    textStyle: {//主标题文本样式
+                      fontSize: 13,
+                      color:'#696969',
+                    },
+                    padding:[ 35,0,5,0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+                  },
+
+                  series: [
+                    {
+                      data: this.pieDataIndus,
+                      type: 'pie',
+                      avoidLabelOverlap: true,   //是否启用防止标签重叠策略
+                      minAngle: 5,               //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互
+
+                    }
+                  ],
+
+                }
+
+                const option_2 = {
+                  // 右上角存图
+                  toolbox: {
+                    feature: {
+                      saveAsImage: {}
+                    }
+                  },
+                  tooltip: {
+                    trigger: "item",
+                  },
+                  title: {
+                    text: '风险类型分布',
+                    x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    textStyle: {//主标题文本样式
+                      fontSize: 13,
+                      color:'#696969',
+                    },
+                    padding:[ 5,0,20,0],//[5,10] | [ 5,6, 7, 8] ,标题内边距
+                  },
+
+                  series: [
+                    {
+                      data: this.pieDataType,
+                      type: 'pie',
+                    }
+                  ],
+                }
+                this.$nextTick(()=>{
+                  echarts1.setOption(option_1)
+                  echarts2.setOption(option_2)
+                })
+              })
+
+  },
+    methods:{
+      // width(){
+      //   return '60px'
+      // },
+    // 影响力排名
+      onSubmit1(){
+        console.log("影响力排名")
+        console.log(this.formInline1.start_date)
+        // console.log(this.formInline1)
+        //时间格式不一样，所以要分参数quarter_date
+        if (this.formInline1.timeType!=='quarter') {
+          http.get(
+              "/rank/network/",
+              {
+                params: {
+                  market: this.formInline1.market,
+                  com_type: this.formInline1.industry,
+                  time: this.formInline1.pre_date,
+                  time_type: this.formInline1.timeType
+                },
+                //   防止带中括号
+                paramsSerializer: params => {
+                  return qs.stringify(params, {indices: false})
+                }
+              }).then(response => {
+            if (response.data.length === 0)
+              alert('没有结果')
+            else {
+              let dat = response.data
+              this.tableData = dat
+              this.barData = dat
+
+              console.log(this.tableData)
+              this.result = response.data
+              // 柱状图
+              const echarts3 = echarts.init(this.$refs.echarts_3)
+              const option_3 = {
+                // 右上角存图
+                toolbox: {
+                  feature: {
+                    saveAsImage: {}
+                  }
+                },
+                legend: {
+                  // 图例文字颜色
+                  textStyle: {
+                    color: "#333",
+                  },
+                },
+                grid: {
+                  left: "20%",
+                },
+                // 提示框
+                tooltip: {
+                  trigger: "axis",
+                  axisPointer: {
+                    type: 'shadow'
+                  }
+                },
+                xAxis: {
+                  type: "category", // 类目轴
+                  // xData太多显示不出来
+                  data: []
+                },
+                yAxis: [
+                  {
+                    type: "value",
+                  }
+                ],
+                title: {
+                  text: '中心性分析',
+                  x: 'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                  y: "bottom",
+                  textStyle: {//主标题文本样式
+                    fontSize: 13,
+                  },
+                  padding: [5, 0, 10, 0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+                },
+                series: [
+                  {
+                    name: '介接近中心性',
+                    data: this.barData.map(item => item.CC),
+                    type: 'bar'
+                  },
+                  {
+                    name: '介数中心性',
+                    data: this.barData.map(item => item.BC),
+                    type: 'bar'
+                  },
+                  {
+                    name: '加权PageRank',
+                    data: this.barData.map(item => item['weighted-PR']),
+                    type: 'bar'
+                  },
+                  {
+                    name: '度中心性',
+                    data: this.barData.map(item => item.DC),
+                    type: 'bar'
+                  },
+
+                ],
+              }
+              echarts3.setOption(option_3)
+            }
+          })
+        }
+        else {
+          {
+            http.get(
+                "/rank/network/",
+                {
+                  params: {
+                    market: this.formInline1.market,
+                    com_type: this.formInline1.industry,
+                    time: this.formInline1.quarter_date,
+                    time_type: this.formInline1.timeType
+                  },
+                  //   防止带中括号
+                  paramsSerializer: params => {
+                    return qs.stringify(params, {indices: false})
+                  }
+                }).then(response => {
+              if (response.data.length === 0)
+                alert('没有结果')
+              else {
+                let dat = response.data
+                this.tableData = dat
+                this.barData = dat
+
+                console.log(this.tableData)
+                this.result = response.data
+                // 柱状图
+                const echarts3 = echarts.init(this.$refs.echarts_3)
+                const option_3 = {
+                  // 右上角存图
+                  toolbox: {
+                    feature: {
+                      saveAsImage: {}
+                    }
+                  },
+                  legend: {
+                    // 图例文字颜色
+                    textStyle: {
+                      color: "#333",
+                    },
+                  },
+                  grid: {
+                    left: "20%",
+                  },
+                  // 提示框
+                  tooltip: {
+                    trigger: "axis",
+                    axisPointer: {
+                      type: 'shadow'
+                    }
+                  },
+                  xAxis: {
+                    type: "category", // 类目轴
+                    // xData太多显示不出来
+                    data: []
+                  },
+                  yAxis: [
+                    {
+                      type: "value",
+                    }
+                  ],
+                  title: {
+                    text: '中心性分析',
+                    x: 'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    y: "bottom",
+                    textStyle: {//主标题文本样式
+                      fontSize: 13,
+                    },
+                    padding: [5, 0, 10, 0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+                  },
+                  series: [
+                    {
+                      name: '介接近中心性',
+                      data: this.barData.map(item => item.CC),
+                      type: 'bar'
+                    },
+                    {
+                      name: '介数中心性',
+                      data: this.barData.map(item => item.BC),
+                      type: 'bar'
+                    },
+                    {
+                      name: '加权PageRank',
+                      data: this.barData.map(item => item['weighted-PR']),
+                      type: 'bar'
+                    },
+                    {
+                      name: '度中心性',
+                      data: this.barData.map(item => item.DC),
+                      type: 'bar'
+                    },
+
+                  ],
+                }
+                echarts3.setOption(option_3)
+              }
+            })
+          }
+        }
+      },
+
+    // 关联主体、影响范围
+    onSubmit2(){
+      this.relatedRes.length=0
+      http.get('/rank/relate/',
+      {params:{
+            name:this.seleced,
+            type: this.typeRela,
+            market:this.formInline1.market,
+            industry: this.formInline1.industry,
+            start_date:this.formInline1.start_date,
+            end_date:this.formInline1.end_date,
+      }}).then(res=>{
+        console.log(res.data)
+        for (let i in res.data)
+        {this.relatedRes.push(res.data[i])
+          }
+        console.log(this.relatedRes)
+        this.showRelated=true
+      })
+    },
+    // 按行业、地域
+      onSubmit3(){
+      // this.relatedRes.length=0
+        http.get('/rank/spread/',
+            {params:{
+                name:this.seleced,
+                type: this.typeSpread,
+                market:this.formInline1.market,
+                industry: this.formInline1.industry,
+                start_date:this.formInline1.start_date,
+                end_date:this.formInline1.end_date,
+              }}).then(res=>{
+          console.log(res.data.data)
+
+        })
+      },
+      // 纵向对比表单提交
+      onSubmit4() {
+        if (this.formInline1.timeType !== 'quarter') {
+          http.get('/rank/history/',
+              {
+                params: {
+                  market: this.formInline1.market,
+                  com_type: this.formInline1.industry,
+                  time_type: this.formInline1.timeType,
+                  start: this.formInline1.start_pre,
+                  end: this.formInline1.end_pre,
+                },
+                paramsSerializer: params => {
+                  return qs.stringify(params, {indices: false})
+                }
+              }).then(res => {
+            if (res.data.length === 0)
+              alert('没有结果')
+            else {
+              // let tmp = res.data
+              // this.getSpanArr(tmp)
+              this.historyData=res.data.data
+              this.timeLis=res.data.time
+            }
+
+
+          })
+        } else {
+          http.get('/rank/history/',
+              {
+                params: {
+                  market: this.formInline1.market,
+                  com_type: this.formInline1.industry,
+                  time_type: this.formInline1.timeType,
+                  start: this.formInline1.start_quarter,
+                  end: this.formInline1.end_quarter,
+                },
+                paramsSerializer: params => {
+                  return qs.stringify(params, {indices: false})
+                }
+              }).then(res => {
+            if (res.data.length === 0)
+              alert('没有结果')
+            else {
+              // let tmp = res.data.data
+              // this.getSpanArr(tmp)
+              this.historyData=res.data.data
+              this.timeLis=res.data.time
+
+            }
+          })
+        }
+      },
+      getSpanArr(list) {
+        // 先给所有的数据都加一个v.rowspan = 1
+        list.forEach(item => {
+          item.rowspan = 1;
+          // item.rowspan1 = 1;
+          // 有几列想合并就设置几个
+
+        });
+        // 双层循环
+        for (let i = 0; i < list.length; i++) {
+          for (let j = i + 1; j < list.length; j++) {
+            //此处可根据相同字段进行合并
+            if (list[i].duration=== list[j].duration) {
+              list[i].rowspan++;
+              list[j].rowspan--;
+            }
+            // if (list[i].duration=== list[j].duration  && list[i].Total_score === list[j].Total_score ) {
+            //   list[i].rowspan1++;
+            //   // list[j].rowspan1--;
+            // }
+          }
+          console.log(list[i].rowspan)
+          // 这里跳过已经重复的数据
+          i = i + list[i].rowspan - 1;
+          // i = i + list[i].rowspan1 - 1;
+        }
+        this.historyData.length=0
+        this.historyData = list;
+        console.log(this.historyData)
+      },
+
+      // 复杂表格合并相同列
+      ObjectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        // 第一列
+        if (columnIndex === 0) {
+          return {
+            rowspan: row.rowspan,
+            colspan: 1,
+          };
+        }
+        // 第二列
+        // if (columnIndex === 1) {
+        //   return {
+        //     rowspan: row.rowspan1,
+        //     colspan: 1,
+        //   };
+        // }
+        // row.XXX的值跟上述函数对应
+
+      },
+
+    detail(row){
+      this.seleced=row.comp_name
+      this.datelis.length=0
+      this.asset.length=0
+      this.held_num.length=0
+      http.get('/rank/asset/',
+          {params:{
+              comp_name:this.seleced,
+            }}).then(res=>{
+            for (let i in res.data)
+            {
+              this.datelis.push(res.data[i]['duration'].slice(0,11))
+              this.asset.push(res.data[i]['asset'])
+              this.held_num.push(res.data[i]['held_num'])
+            }
+
+      })
+      this.detailData.length=0
+      for (let i in this.tableData)
+      {
+        if (this.tableData[i]['comp_name']===this.seleced)
+          this.detailData=Array(this.tableData[i])
+      }
+      // let tmp
+      // for (let i in this.result.index)
+      // {
+      //   console.log(this.result.index[i].n)
+      //   if (this.result.index[i].n===this.seleced)
+      //     tmp=this.result.index[i]
+      //  }
+      // console.log(this.result.rank)
+      // for (let i in this.result.rank)
+      //   if (this.result.rank[i].name===this.seleced)
+      //     tmp=Object.assign(this.result.rank[i],tmp)
+      //     // tmp=[...this.result.rank[i],tmp]
+      // this.detailData=Array(tmp)
+        console.log(this.detailData)
+      // console.log(row.name)//返回这一行所有的内容
+
+      this.detailsdialog = true//打开弹窗
+    },
+    initEcharts() {
+       // 详情页的线形图
+        // 详情图的柱状图、饼图
+        // 1、柱状图
+        var echarts4 = echarts.init(this.$refs.echarts_4);
+        var option_4={
+              title: {
+                text: "影响范围统计-行业",
+                left:"center",
+                textStyle:{
+                fontSize:17,
+                lineHeight:60
+                }
+              },
+              tooltip: {},
+              xAxis: {
+                data: ["银行", "保险", "运输"],
+                name:"行业",
+                nameTextStyle:{
+                  padding:[0,0,-40,-260],
+                  verticalAlign:'bottom'
+                }
+              },
+              yAxis: {
+                name:'影响行业的数量',
+                axisTick:{
+                  show:true,
+                },
+                axisLine:{
+                  show:true,
+                },
+                nameTextStyle:{
+                  position: 'left',
+                  nameLocation: 'middle', 
+                  nameGap: 60, 
+                  nameRotate: 90 
+                } 
+              },
+              series: [
+                {
+                name: "数量",
+                type: "bar",
+                data: [45, 20, 30],
+                barWidth:60,
+                itemStyle:{
+                  normal: {
+                    color: function (params) {
+                      let colorList = [
+                      'blue',
+                      'green',
+                      'red',
+                      ];
+                      let colorItem = colorList[params.dataIndex];
+                      return colorItem;
+                    },
+                    label:{          
+                      show:true,
+                      position:'top',          
+                    }
+                  }
+                }
+                },
+              ],
+                }
+        echarts4.setOption(option_4)
+          // 2、饼图
+
+        const  echarts5 = echarts.init(this.$refs.echarts_5);
+        const option_5 = {
+        title: {
+          text: "影响行业占比份额",
+          left: "center",
+          textStyle:{
+          fontSize:17,
+          lineHeight:85
+          }
+        },
+        tooltip: {
+          trigger: "item",
+        },
+        legend: {
+          orient: "vertical",
+          left: "30",
+          top:"40"
+        },
+        series: [
+          {
+          name: "占比份额",
+          type: "pie",
+          radius: "55%",
+          LabelOverlap: true,
+          data: [
+            { value: 45, name: "银行" },
+            { value: 20, name: "保险" },
+            { value: 30, name: "运输" },
+          ],
+          itemStyle:{
+            emphasis: {
+              shadowBlur: 10,
+              shadowOffsetX: 0,
+              shadowColor: "rgba(0, 0, 0, 0.5)",
+            },
+            borderWidth:2,
+            borderColor:'#fff'
+          }
+          },
+        ],
+
+
+            }
+
+        echarts5.setOption(option_5)
+    } ,
+
+
+      open(){
+              this.$nextTick(() => {
+              //  执行echarts方法
+                this.initEcharts()
+              })
+            },
+
+  }
+
+
+  };
+  </script>
+  
+  <style lang="less" scoped>
+/deep/ .el-checkbox__label {//弹窗单选框的表单样式
+    padding-right: 40px;
+    padding-left: 40px;
+}
+.grayish_btn{//浅灰色按钮
+  color: #fff;//文字颜色
+  background-color: #aaaaaa;//背景颜色
+}
+/deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+      border-bottom: 1px solid rgba(242, 242, 242, 0.654901960784314) !important;
+      padding: 0px 0 !important;
+      min-width: 0 !important;
+    }
+    .el-table .el-table__cell {
+      padding: 12px 0; 
+      min-width: 0;
+    }
+    /deep/ .active_header{//表头
+      color: #333333;
+      // font-size: 9px;
+      text-align: center !important;
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      // font-size: 10px;
+    }
+.text{
+      color:rgba(2, 167, 240, 0.729411764705882);
+    }
+.form{//2、产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    // margin-top:5px; 
+    // height: 40px;
+    padding-left: 10px;
+    margin-bottom: 0px;
+    padding-bottom: 0px;
+
+  }
+  
+  // 第一层
+  .one_twins_card{
+    margin-top:0px;
+    margin-bottom:3px;
+    display:flex;
+    justify-content:space-between;//左右贴边
+    .el-card {
+      width:49.5%;
+    } 
+    .el-col-2 {
+     width: 2%;
+
+}
+    // 数据
+    .num_card{
+    margin-top: 40px;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-bottom: 20px;
+
+
+    .desc{
+      text-align: center;//居中
+      font-weight: bold;//字体加粗
+      font-size: 17px;
+      color:'#696969';
+
+    }
+    .desc_value{
+      text-align: center;//居中
+      font-size: 18px;
+      color:#02A7F0;;
+    }
+
+
+
+
+    .el-divider--horizontal {
+    display: flex;
+    justify-content:center;
+    height: 1px;
+    width: 80%;
+    margin: 24px 70px 24px 30px;//上 右 下 左
+  }
+    .el-statistic {
+        font-size: 13px;
+        color:#02A7F0;;//没改成，之后再改
+      }
+  }
+    .twins_pie{
+        display:flex;
+        justify-content:space-between;
+        // padding:10px;
+        // margin-top: 30px;
+        // margin-left: 20px;
+        // margin-right: 20px;
+        // margin-bottom: 20px;
+
+    }
+  }
+
+  
+  //第二层
+.two{
+
+  // 表格中操作
+  .content{
+    display:flex;
+    justify-content:space-between;
+    .table{
+    padding: 20px 2px 2px 20px;//返回表格添加间隙 上 右
+
+
+    // 调整表头间隔、设置表头下方边框颜色
+    /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+      border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
+      padding: 0px 0; 
+      min-width: 0;
+    }
+    .el-table .el-table__cell {
+      padding: 12px 0; 
+      min-width: 0;
+    }
+    /deep/ .active_header{//表头
+      color: #333333;
+      font-size: 13px;
+      text-align: center !important;
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      font-size: 13px;
+    }
+  
+
+    }
+    .bar{
+      padding: 20px 40px 2px 2px;//返回表格添加间隙 上 右
+    }
+
+  }
+  
+  .flex-charts{//并列图
+    // margin-top:20px; 
+    display:flex;
+    justify-content:space-between;
+    // padding:20px;
+}
+}
+
+.grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+    margin-bottom: 20px;
+  }
+  
+  
+
+ .sublabel{ // 小标签标识
+    // font-size: 13px;
+    // padding:2px;
+    margin-top:10px;
+    background-color: rgba(2, 167, 240, 0.5);
+    width: 5px; 
+    height: 35px;
+    
+  } 
+  .title{
+    padding-left: 4px;
+    margin-top:15px;
+    font-weight: bold;//字体加粗
+    display:flex;
+    justify-content:flex-start
+}
+  
+   
+   
+  
+  
+  
+  </style>
+  
+  
+  
\ No newline at end of file
diff --git a/src_old/App.vue b/src_old/App.vue
new file mode 100644
index 0000000..2f867e9
--- /dev/null
+++ b/src_old/App.vue
@@ -0,0 +1,51 @@
+<template>
+  <div>
+
+    <!-- 路由出口 -->
+    <!-- 路由匹配组建将渲染到这里 -->
+<!--    <router-view> </router-view>-->
+    <keep-alive exclude="test" include="">
+      <router-view />
+    </keep-alive>
+<!--    <router-view v-if="!$route.meta.keepAlive" />-->
+  </div>
+</template>
+
+<script>
+
+
+
+// import http from './utils/request'//导入接口？？
+// import {getData} from './api'
+
+// import DevicePixelRatio from './libs/rem'
+// export default{
+//   created(){
+//     new DevicePixelRatio().init()
+//   }
+// }
+
+</script>
+
+<style lang="less">//消除固定样式
+  html,body,h3{
+    margin: 0;
+    padding: 0;
+  }
+  .superscript{ // 1、上标
+    font-size: 13px;
+    padding:10px;
+    color:#fff;
+    background-color: rgba(2, 167, 240, 0.729411764705882);
+
+  }
+.text{
+color:rgba(2, 167, 240, 0.729411764705882);
+cursor: pointer;
+/* 将鼠标样式设为手型 */
+}
+  
+  
+
+
+</style>
diff --git a/src_old/assets/Logo.png b/src_old/assets/Logo.png
new file mode 100644
index 0000000..80f7f17
Binary files /dev/null and b/src_old/assets/Logo.png differ
diff --git a/src_old/assets/background.jpg b/src_old/assets/background.jpg
new file mode 100644
index 0000000..9f2a8fe
Binary files /dev/null and b/src_old/assets/background.jpg differ
diff --git a/src_old/assets/card.png b/src_old/assets/card.png
new file mode 100644
index 0000000..39750e4
Binary files /dev/null and b/src_old/assets/card.png differ
diff --git a/src_old/assets/r-c.png b/src_old/assets/r-c.png
new file mode 100644
index 0000000..06f58af
Binary files /dev/null and b/src_old/assets/r-c.png differ
diff --git a/src_old/assets/svg/card.svg b/src_old/assets/svg/card.svg
new file mode 100644
index 0000000..dd9e34e
--- /dev/null
+++ b/src_old/assets/svg/card.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="259px" height="170px" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <mask fill="white" id="clip336">
+      <path d="M 251 0  L 31.3118811881188 0  L 2 31.9661016949153  L 2 163.305084745763  L 251 163.305084745763  L 251 0  Z " fill-rule="evenodd" />
+    </mask>
+    <filter x="201px" y="107px" width="259px" height="170px" filterUnits="userSpaceOnUse" id="filter337">
+      <feOffset dx="3" dy="3" in="SourceAlpha" result="shadowOffsetInner" />
+      <feGaussianBlur stdDeviation="1.5" in="shadowOffsetInner" result="shadowGaussian" />
+      <feComposite in2="shadowGaussian" operator="atop" in="SourceAlpha" result="shadowComposite" />
+      <feColorMatrix type="matrix" values="0 0 0 0 0  0 0 0 0 0  0 0 0 0 0  0 0 0 0.349019607843137 0  " in="shadowComposite" />
+    </filter>
+    <g id="widget338">
+      <path d="M 251 0  L 31.3118811881188 0  L 2 31.9661016949153  L 2 163.305084745763  L 251 163.305084745763  L 251 0  Z " fill-rule="nonzero" fill="#ffffff" stroke="none" transform="matrix(1 0 0 1 201 107 )" />
+      <path d="M 251 0  L 31.3118811881188 0  L 2 31.9661016949153  L 2 163.305084745763  L 251 163.305084745763  L 251 0  Z " stroke-width="2" stroke="#555555" fill="none" transform="matrix(1 0 0 1 201 107 )" mask="url(#clip336)" />
+    </g>
+  </defs>
+  <g transform="matrix(1 0 0 1 -201 -107 )">
+    <use xlink:href="#widget338" filter="url(#filter337)" />
+    <use xlink:href="#widget338" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src_old/assets/数据显示old.png b/src_old/assets/数据显示old.png
new file mode 100644
index 0000000..ee9e101
Binary files /dev/null and b/src_old/assets/数据显示old.png differ
diff --git a/src_old/bigscreen/大屏.vue b/src_old/bigscreen/大屏.vue
new file mode 100644
index 0000000..655eaeb
--- /dev/null
+++ b/src_old/bigscreen/大屏.vue
@@ -0,0 +1,85 @@
+<template>
+  <div id="home">
+    <dv-full-screen-container>
+      <!--一行两等份-->
+      <div class="head">大规模泛金融知识图谱系统</div>
+      <div class="module-box">
+        
+        <div style="flex: 0 1 25%">
+          <dv-border-box-12 style="width: 100%; height: 180px">
+            <div style="color:white;padding:10px 10px;">类型统计</div>
+          </dv-border-box-12>
+          <dv-border-box-12 style="width: 100%; height: 180px">
+            <div style="color:white;padding:10px 10px;">健康指数</div>
+          </dv-border-box-12>
+        </div>
+
+        <div style="flex: 0 1 50%">
+          <dv-border-box-8 style="width: 100%; height: 360px"></dv-border-box-8>
+        </div>
+
+        <div style="flex: 0 1 25%">
+          <dv-border-box-12 style="width: 100%; height: 180px">
+            <div style="color:white;padding:10px 10px;">图谱统计</div>
+          </dv-border-box-12>
+          <dv-border-box-12 style="width: 100%; height: 180px">
+            <div style="color:white;padding:10px 10px;">区域分析</div>
+          </dv-border-box-12>
+        </div>
+      </div>
+
+      <div class="module-box">
+        <div style="flex: 0 1 25%">
+          <dv-border-box-12 style="width: 100%; height: 180px;">
+             <div style="color:white;padding:10px 10px;">当前事件统计</div>
+          </dv-border-box-12>
+        </div>
+
+        <div style="flex: 0 1 50%">
+          <dv-border-box-8 style="width: 100%; height: 180px;">
+             <div style="color:white;padding:10px 10px;">行业风险价值曲线图</div>
+          </dv-border-box-8>
+        </div>
+
+        <div style="flex: 0 1 25%">
+          <dv-border-box-12 style="width: 100%; height: 180px;">
+             <div style="color:white;padding:10px 10px;">行业价值评估</div>
+          </dv-border-box-12>
+        </div>
+      </div>
+    </dv-full-screen-container>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  data() {
+    return {};
+  },
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+.head{
+  color: aliceblue;
+  text-align:center;
+  padding-top:12px;
+  font-size: 18px;
+}
+#home {
+  width: 100%;
+  height: 100%;
+  background: url("../assets/background.jpg") center center no-repeat;
+  background-size: 100% 100%;
+  position: absolute; /*/绝对定位 */
+}
+.module-box {
+  display: flex;
+  justify-self: space-between;
+  margin: 1px;
+  padding-left:15px;
+}
+</style>
diff --git a/src_old/bigscreen/大屏10-27.vue b/src_old/bigscreen/大屏10-27.vue
new file mode 100644
index 0000000..08c777a
--- /dev/null
+++ b/src_old/bigscreen/大屏10-27.vue
@@ -0,0 +1,62 @@
+<!--  -->
+<template>
+  
+
+  <div id="home"> 
+
+    <!-- 全屏容器dv-full-screen-container -->
+    <dv-full-screen-container>
+        <!-- 边框dv-border-box -->
+
+          <div style="flex:0 1 50%;padding-bottom: 10px;">          <!-- flex-grow | flex-shrink | flex-basis */没懂 -->
+            <dv-border-box-7 style="width: 100%;height:60px;">
+              <div style="color: aliceblue;text-align: center;padding: 10px;">大规模泛金融知识图谱系统"</div>
+              <dv-decoration-10 style="width:100%;height:5px;" />
+            </dv-border-box-7>
+          </div>
+          <div style="flex:0 1 50%">          <!-- flex-grow | flex-shrink | flex-basis */没懂 -->
+            <dv-border-box-7 style="width: 100%;height: 200px;">
+              <region/>
+            </dv-border-box-7>
+          </div>
+
+
+
+
+
+
+
+    </dv-full-screen-container>
+  </div>
+</template>
+
+<script>
+import region from "../components/region.vue";
+export default {
+  components: {
+    region
+  },
+  data () {
+    return {
+    }
+  },
+  mounted(){
+  },
+  methods:{
+  },
+}
+</script>
+
+<style lang="less" scoped>
+
+
+#home {
+  width: 100%;
+  height: 100vh;
+  background: url("../assets/background.jpg") center center no-repeat;
+  background-size: 100% 100%;
+  position:absolute;/*/绝对定位 */
+}
+
+
+</style>
diff --git a/src_old/components/CommonAside.vue b/src_old/components/CommonAside.vue
new file mode 100644
index 0000000..14e43be
--- /dev/null
+++ b/src_old/components/CommonAside.vue
@@ -0,0 +1,269 @@
+<!-- 侧导航栏 -->
+<template>
+  <div style="display=flex;">
+    <!-- <el-radio-group v-model="isCollapse" style="margin-bottom: 20px;">
+      <el-radio-button :label="false">展开</el-radio-button>
+      <el-radio-button :label="true">收起</el-radio-button>
+    </el-radio-group> -->
+
+      <el-menu
+        :default-active="$route.path"
+        class="el-menu-vertical-demo"
+        :router="true"
+        :collapse="isCollapse"
+        background-color="#000000"
+        text-color="#fff"
+        active-text-color="#ffd04b"
+        style="height:1200px">
+        <!-- style="height:auto" -->
+        <!-- :default-active="$route.path"使得在没有点击左侧导航栏时，也能根据路由转变转化颜色 -->
+        <div style="display=flex;">
+          <!-- <img src="../assets/Logo.png" width="12%" style="display:inline-block;padding-right: 3px;" align="absmiddle"> -->
+          <img src="../assets/数据显示.png" width="20px" style="display:inline-block;padding-left: 1px;padding-right: 5px;" align="absmiddle">
+          <!-- align="absmiddle"让图像和文字一样高 -->
+          <h3 style="display:inline-block;" @click = "bigscreen">{{ isCollapse ? '' :  '资本市场系统性风险平台'}}</h3>
+          <!--  -->
+        </div>
+
+      <!-- <el-button @click="handleMenu" icon="el-icon-menu" size="mini">bibibi</el-button> -->
+
+
+
+        <!-- 循环遍历所有的单导航栏 -->
+        <!-- 没有子菜单 -->                                               <!-- index都是为了确保唯一性,但最好设置为path，有利于根据路由跳转页面 -->
+        <el-menu-item @click='clickMenu(item)' v-for="item in nochildren" :key='item.path' :index='item.path'>
+        <!-- : 是v-bind: -->
+          <i :class="`el-icon-${item.icon}`"></i> <!-- 图标，官网可选 -->
+          <span slot="title">{{ item.label }}</span>
+        </el-menu-item>
+
+        <!-- 有子菜单 -->
+        <el-submenu  v-for="item in hasChildren" :key='item.path' :index='item.path'><!-- index都是为了确保唯一性 -->
+            <template slot="title">
+              <i :class="`el-icon-${item.icon}`"></i>
+              <span slot="title">{{ item.label }}</span>
+            </template>
+            <el-menu-item-group v-for='subItem in item.children' :key='subItem.path'>
+              <el-menu-item @click='clickMenu(subItem)' :index="subItem.path" style="padding-left: 70px;">{{subItem.label}}</el-menu-item>
+            </el-menu-item-group>
+          </el-submenu>
+
+
+      </el-menu>
+
+
+
+
+
+
+</div>
+</template>
+
+
+
+<script>
+export default {
+  
+  data() {
+    return {
+      // isCollapse:false,
+      menuData: [
+        // {
+        //   path: "/",
+        //   name: "home",
+        //   label: "首页",
+        //   icon: "s-home",
+        // },
+        {
+          path: "/systematic_risk",//2-1
+          name: "systematic_risk",
+          label: "系统性风险分析",
+          icon: 's-marketing'
+        },
+        {
+          path: "/market_entities",//1
+          name: "market_entities",
+          label: "市场主体分析",
+          icon: "s-flag",
+        },
+
+          //2
+        {
+          path: "/influential_entities",//3
+          name: "influential_entities",
+          label: "高影响主体分析",
+          icon: "star-off",
+        },
+
+            {
+            path: "/individual_risk",//2-2
+            name: "individual_risk",
+            label: "个体风险分析",
+              icon: 'lightning'
+            },
+
+        {
+          path: "/diffus",//5
+          name: "diffus",
+          label: "风险传导",
+          icon: "aim",
+        },
+
+        {
+          // path: "/warning",//4
+          label: "预警服务",
+          icon: "bell",
+          children:[
+            {
+            path: "/warning",//4-1
+            name: "warning",
+            label: "预警服务",
+            },
+            {
+            path: "/risk_warning",//4-1
+            name: "risk_warning",
+            label: "风险预警",
+            },
+            {
+            path: "/abnormal_detection",//4-2
+            name: "abnormal_detection",
+            label: "异常检测",
+            },
+
+
+        ],
+          
+        },
+        {
+          // path: "/event",//8
+          label: "事件分析",
+          icon: "document",
+          children:[
+            {
+              path: "/event_analysis",//2
+              name: "event_analysis",
+              label: "事件分析",
+            },
+            {
+              path: "/event_graph",//2
+              name: "event_graph",
+              label: "事件图谱",
+            },]
+        },
+        {
+          path: "/health",//5
+          name: "health",
+          label: "健康指数",
+          icon: "umbrella",
+        },
+
+        {
+          path: "/quotation",//7
+          name: "quotation",
+          label: "行情分析",
+          icon: "s-data",
+        },
+
+        {
+          path: "/pressure",//6
+          name: "pressure",
+          label: "压力测试",
+          icon: "s-help",
+        },
+
+
+  
+      ],
+    };
+  },
+ 
+
+ 
+
+  methods: {
+    
+
+    bigscreen(){//点击标题跳转大屏
+      this.$router.push('/bigscreen');
+    },
+
+    //点击菜单
+    clickMenu(item){
+     // 当页面的路由this.$route.path 与 跳转的路由item.path 不一致才允许跳转
+     if (this.$route.path !== item.path && !(this.$route.path === '/market_entities' && (item.path === '/'))) {//$route是当前路径的路由
+        this.$router.push(item.path)//$router是整个的router实例
+      }
+      this.$store.commit('selectMenu', item)//点击获取新路由对象,store在这里不用import  
+    },
+
+  },
+  computed: {
+
+    hasChildren() {//有子菜单才需要用
+      return this.menuData.filter((item) => item.children);
+    },
+    nochildren() {
+      return this.menuData.filter((item) => !item.children);
+    },
+    isCollapse(){
+      return this.$store.state.tab.isCollapse
+
+    },
+  },
+};
+</script>
+
+
+<style lang="less" scoped>
+.el-menu-vertical-demo:not(.el-menu--collapse) {//背景？？
+  width: 220px;
+  min-height: 300px;
+  
+
+}
+.el-menu-item, .el-submenu__title {//导航选项间隔
+    height: 40px;//导航选项之间
+    line-height: 45px;//导航上边距
+
+}
+.el-dropdown-menu__item, .el-menu-item  {//导航字体大小
+  font-size: 13px;
+}
+
+.el-menu{
+  height:100vh;//背景布满
+  h3{
+    // color: #fff;
+    // text-align: center;
+    // line-height: normal;
+    // font-size: 13px;
+    font-family: 'Arial Normal', 'Arial', sans-serif;
+    font-weight: bold;//字体加粗
+    font-size: 16px;
+    color: #fff;
+    text-align: center;
+    line-height: 4;
+    
+  }
+}
+/deep/ .el-menu-item-group__title { // 有孩子的标题
+    padding: 0px 0 0px 0px;//去掉距离
+    line-height: normal;
+    font-size: 12px;
+    color: #909399;
+}
+
+/deep/ .el-submenu__title {
+    font-size: 13px;
+    height: 40px!important;
+    line-height: 50px!important;
+
+}
+/deep/ .el-submenu__icon-arrow {
+    position: absolute;
+    top: 70%;//和文字调整一致
+    color:#fff;
+
+}
+
+</style>
\ No newline at end of file
diff --git a/src_old/components/CommonHeader.vue b/src_old/components/CommonHeader.vue
new file mode 100644
index 0000000..647840f
--- /dev/null
+++ b/src_old/components/CommonHeader.vue
@@ -0,0 +1,210 @@
+<!-- 上导航栏 -->
+<template>
+    <div class="header-container">
+        
+        <div class="l-content">
+            <!-- tag -->
+            <div class="tags" >
+
+                <el-tag v-for="(item,index) in tags" 
+                :key="item.path" 
+                :closable="true" 
+                :effect="$route.name === item.name ? 'dark' : 'plain'"
+                @click="changeMenu(item)"
+                @close="handledClose(item,index)"
+                style="margin-left: 5px"><!-- 只有非首页才显示closable，点击该页颜色加深effect-->
+                {{ item.label }}
+                </el-tag>
+
+            </div>
+<!-- 
+            <el-breadcrumb separator="">
+                <el-breadcrumb-item :to="{ path: '/' }">
+                    <el-button size="small" >首页</el-button>
+                </el-breadcrumb-item>
+                <el-breadcrumb-item><a href="/">
+                    <el-button size="small" >风险主体总量<i class="el-icon-close" size="mini " ></i>
+
+                            </el-button>
+                    </a></el-breadcrumb-item>
+                </el-breadcrumb> -->
+
+           
+            <!-- <span class="text">首页</span> -->
+            
+        </div>
+        <!-- 用户信息 登录注册 -->
+        <div class="r-content">
+            <!--练习的弹出框 -->
+            <el-dialog
+                title="修改个人信息"
+                :visible.sync="dialogVisible"
+                width="30%">
+                <span></span>
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                </span>
+            </el-dialog>
+
+            <!-- 右侧登录页面设计 -->
+            <el-dropdown>
+                <span class="el-dropdown-link">
+                <el-button icon=el-icon-s-custom circle> </el-button>  <!--登录图表按钮-->
+                    <span class="text">请登录</span>
+                    <i class="el-icon-arrow-down el-icon--right"></i> <!--下拉-->
+                    </span>
+
+                <el-dropdown-menu slot="dropdown">
+<!--                    <el-dropdown-item>-->
+<!--                        &lt;!&ndash; 点击后改变弹出框生效情况 &ndash;&gt;-->
+<!--                        <el-button  style='width: 150px;' @click="dialogVisible = true">修改个人信息</el-button>-->
+<!--                    </el-dropdown-item>-->
+
+<!--                    <el-dropdown-item>-->
+<!--                        <el-button style='width: 150px;' @click = "logout">登出</el-button>-->
+<!--                   </el-dropdown-item>-->
+
+                   <el-dropdown-item>
+                        <el-button style='width: 150px;' @click="login">登录</el-button>
+                   </el-dropdown-item>
+                
+                </el-dropdown-menu>
+                </el-dropdown>
+            
+        </div>
+    </div>
+    
+</template>
+
+<script>
+import {mapState,mapMutations} from 'vuex'
+import http from "@/utils/request";
+  export default {
+    name: "CommonTag",
+    data(){
+        return{
+            dialogVisible:false,//用户登录页面
+
+        };
+    },
+    computed: {
+        ...mapState({//mapState返回一个对象，表示扩展运算符，起到解构的作用...
+            tags: state => state.tab.tabsList
+        })
+        
+    },
+    methods:{
+      login(){
+        this.$router.push('/login')
+      },
+      logout(){
+        this.$store.commit('logout')
+      },
+
+        //调用Mutations,获取closeTag，并添加到当前页面中（讲解34）
+        ...mapMutations(['closeTag']),
+        //点击tag跳转的功能
+        changeMenu(item){
+            // console.log(item)
+            this.$router.push({name: item.name})//点击一个，新增一个，面包屑tab增加一个
+        },
+        //点击tag x删除
+        handledClose(item,index){  //index是获取的索引
+            //点击tag删除 tabsList里面的数据
+            // 方法1
+            // this.$store.commit('closeTag')
+            // 方法2,调用store中的Mutations
+            this.closeTag(item)
+            const length=this.tags.length
+            // console.log("tags长度：",this.tags.length)
+            // console.log( this.$router)
+            
+            //删除之后的跳转逻辑
+            //一）当前页与删除页不同（item.name和当前展示路由不一致），直接删除路由列表里面的对于name，就不能再打开，没有人性化调整的必要
+            if(item.name!== this.$route.name){
+                return
+            }
+            //二）当前页=删除页——删除的是最后一页(页面转到路由列表中的前一个)
+            if(index===length){
+                if(length===0){
+                    item={
+                        path: "/market_entities",
+                        name: "market_entities",
+                        label: "市场主体分析",
+                    }
+                    this.$router.push(item)
+                    this.$store.commit('selectMenu', item)//点击获取新路由对象,store在这里不用import  
+                }
+                else{ 
+                    this.$router.push({
+                        name:this.tags[index-1].name
+                    })
+                }
+            }
+
+            //三）当前页=删除页——删除的是中间一页(跳转后一个，因为已经删除了，跳转的还是后面那个)
+            else{
+                this.$router.push({
+                    name:this.tags[index].name
+                })
+            }
+            
+
+        },
+
+        // 跳转用户管理
+        UserManagement(){//点击标题跳转大屏
+            this.$router.push('/UserManagement');
+        },
+
+    
+
+
+        
+
+
+    }
+  };
+</script>
+
+<style lang="less" scoped>
+
+.header-container{
+    padding: 0 30px;
+    background-color: #33333325;
+    height: 60px;
+    display: flex;//相邻的两个内容一行显示
+    justify-content: space-between;
+   
+   .text{
+    color:rgba(0, 0, 0, 0.719);
+    font-size: 13px;
+    margin-left: 5px;//左间距
+    margin-bottom: 10px;//下间距
+
+   }
+   .l-content{
+    display: flex;
+    justify-content: space-between;
+    align-items: end; // 中间
+   }
+   .r-content{
+    margin-top: 5px;//下间距
+    align-items: top; // 中间
+    .el-button.is-circle {
+        border-radius: 100%;
+        padding: 3px;//边框和内部距离
+    }
+
+    .el-button {//按钮边框
+        background: #ffffff00; 
+        border: 1px solid #00040e;
+        color: #000104; 
+        font-size: 16px;
+        border-radius: 20px;
+    }
+   }
+  
+}
+</style>
\ No newline at end of file
diff --git a/src_old/components/CommonHeaderAdmin.vue b/src_old/components/CommonHeaderAdmin.vue
new file mode 100644
index 0000000..e279195
--- /dev/null
+++ b/src_old/components/CommonHeaderAdmin.vue
@@ -0,0 +1,227 @@
+<!-- 上导航栏 -->
+<template>
+    <div class="header-container">
+
+
+        <div class="l-content">
+
+            <el-button  @click="handleMenu"  :icon=" icon" size="medium" style="padding: 5px;width: 30px;height: 60px;background-color:transparent;"></el-button>
+
+            <!-- tag -->
+            <div class="tags" >
+
+                <el-tag v-for="(item,index) in tags" 
+                :key="item.path" 
+                :closable="true" 
+                :effect="$route.name === item.name ? 'dark' : 'plain'"
+                @click="changeMenu(item)"
+                @close="handledClose(item,index)"
+                style="margin-left: 5px"><!-- 只有非首页才显示closable，点击该页颜色加深effect-->
+                {{ item.label }}
+                </el-tag>
+
+            </div>
+<!-- 
+            <el-breadcrumb separator="">
+                <el-breadcrumb-item :to="{ path: '/' }">
+                    <el-button size="small" >首页</el-button>
+                </el-breadcrumb-item>
+                <el-breadcrumb-item><a href="/">
+                    <el-button size="small" >风险主体总量<i class="el-icon-close" size="mini " ></i>
+
+                            </el-button>
+                    </a></el-breadcrumb-item>
+                </el-breadcrumb> -->
+
+           
+            <!-- <span class="text">首页</span> -->
+            
+        </div>
+        <!-- 用户信息 登录注册 -->
+        <div class="r-content">
+            <!--练习的弹出框 -->
+            <el-dialog
+                title="修改个人信息"
+                :visible.sync="dialogVisible"
+                width="30%">
+                <span></span>
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                </span>
+            </el-dialog>
+
+            <!-- 右侧登录页面设计 -->
+            <el-dropdown>
+                <span class="el-dropdown-link">
+                <el-button icon=el-icon-s-custom circle> </el-button>  <!--登录图表按钮-->
+                    <span class="text">用户信息</span>
+                    <i class="el-icon-arrow-down el-icon--right"></i> <!--下拉-->
+                    </span>
+
+                <el-dropdown-menu slot="dropdown">
+<!--                    <el-dropdown-item>-->
+<!--                        &lt;!&ndash; 点击后改变弹出框生效情况 &ndash;&gt;-->
+<!--                        <el-button  style='width: 150px;' @click="dialogVisible = true">修改个人信息</el-button>-->
+<!--                    </el-dropdown-item>-->
+
+                    <el-dropdown-item> 
+                        <el-button style='width: 150px;' @click = "UserManagement">用户管理</el-button>
+                   </el-dropdown-item>
+
+                   <el-dropdown-item>
+                        <el-button style='width: 150px;' @click="logout">退出登录</el-button>
+                   </el-dropdown-item>
+                
+                </el-dropdown-menu>
+                </el-dropdown>
+            
+        </div>
+    </div>
+    
+</template>
+
+<script>
+import {mapState,mapMutations} from 'vuex'
+import http from "@/utils/request";
+  export default {
+    name: "CommonTag",
+    data(){
+        return{
+            dialogVisible:false,//用户登录页面
+            // 折叠按钮
+            icon:"el-icon-arrow-left",
+
+        };
+    },
+    computed: {
+        ...mapState({//mapState返回一个对象，表示扩展运算符，起到解构的作用...
+            tags: state => state.tab.tabsList
+        })
+        
+    },
+    methods:{
+
+        // 折叠方法
+        handleMenu(){
+        this.$store.commit('collapseMenu')
+        this.icon = this.icon === 'el-icon-arrow-left' ? 'el-icon-arrow-right' : 'el-icon-arrow-left';
+        },
+
+      logout(){
+        this.$store.commit('logout')
+        this.$notify.info({
+          title: '注意',
+          message: '已退出'
+        })
+          this.$router.push('/login')
+          location.reload();
+      },
+
+        //调用Mutations,获取closeTag，并添加到当前页面中（讲解34）
+        ...mapMutations(['closeTag']),
+        //点击tag跳转的功能
+        changeMenu(item){
+            // console.log(item)
+            this.$router.push({name: item.name})//点击一个，新增一个，面包屑tab增加一个
+        },
+        //点击tag x删除
+        handledClose(item,index){  //index是获取的索引
+            //点击tag删除 tabsList里面的数据
+            // 方法1
+            // this.$store.commit('closeTag')
+            // 方法2,调用store中的Mutations
+            this.closeTag(item)
+            const length=this.tags.length
+            // console.log("tags长度：",this.tags.length)
+            // console.log( this.$router)
+            
+            //删除之后的跳转逻辑
+            //一）当前页与删除页不同（item.name和当前展示路由不一致），直接删除路由列表里面的对于name，就不能再打开，没有人性化调整的必要
+            if(item.name!== this.$route.name){
+                return
+            }
+            //二）当前页=删除页——删除的是最后一页(页面转到路由列表中的前一个)
+            if(index===length){
+                if(length===0){
+                    item={
+                        path: "/market_entities",
+                        name: "market_entities",
+                        label: "市场主体分析",
+                    }
+                    this.$router.push(item)
+                    this.$store.commit('selectMenu', item)//点击获取新路由对象,store在这里不用import  
+                }
+                else{ 
+                    this.$router.push({
+                        name:this.tags[index-1].name
+                    })
+                }
+            }
+
+            //三）当前页=删除页——删除的是中间一页(跳转后一个，因为已经删除了，跳转的还是后面那个)
+            else{
+                this.$router.push({
+                    name:this.tags[index].name
+                })
+            }
+            
+
+        },
+
+        // 跳转用户管理
+        UserManagement(){//点击标题跳转大屏
+            this.$router.push('/UserManagement');
+        },
+
+    
+
+
+        
+
+
+    }
+  };
+</script>
+
+<style lang="less" scoped>
+
+.header-container{
+    // padding: 0 30px;
+    padding: 0 0px;
+    background-color: #33333325;
+    height: 60px;
+    display: flex;//相邻的两个内容一行显示
+    justify-content: space-between;
+   
+   .text{
+    color:rgba(0, 0, 0, 0.719);
+    font-size: 13px;
+    margin-left: 5px;//左间距
+    margin-bottom: 10px;//下间距
+
+   }
+   .l-content{
+    display: flex;
+    justify-content: space-between;
+    align-items: end; // 中间
+   }
+   .r-content{
+    margin-top: 5px;//下间距
+    align-items: top; // 中间
+    .el-button.is-circle {
+        border-radius: 100%;
+        padding: 3px;//边框和内部距离
+    }
+
+    .el-button {//按钮边框
+        background: #ffffff00; 
+        border: 1px solid #00040e;
+        color: #000104; 
+        font-size: 16px;
+        border-radius: 20px;
+    }
+   }
+  
+}
+</style>
\ No newline at end of file
diff --git a/src_old/components/CommonHeaderUser.vue b/src_old/components/CommonHeaderUser.vue
new file mode 100644
index 0000000..2d51aa7
--- /dev/null
+++ b/src_old/components/CommonHeaderUser.vue
@@ -0,0 +1,225 @@
+<!-- 上导航栏 -->
+<template>
+    <div class="header-container">
+        
+        <div class="l-content">
+
+            <el-button  @click="handleMenu"  :icon=" icon" size="medium" style="padding: 5px;width: 30px;height: 60px;background-color:transparent;"></el-button>
+
+            <!-- tag -->
+            <div class="tags" >
+
+                <el-tag v-for="(item,index) in tags" 
+                :key="item.path" 
+                :closable="true" 
+                :effect="$route.name === item.name ? 'dark' : 'plain'"
+                @click="changeMenu(item)"
+                @close="handledClose(item,index)"
+                style="margin-left: 5px"><!-- 只有非首页才显示closable，点击该页颜色加深effect-->
+                {{ item.label }}
+                </el-tag>
+
+            </div>
+<!-- 
+            <el-breadcrumb separator="">
+                <el-breadcrumb-item :to="{ path: '/' }">
+                    <el-button size="small" >首页</el-button>
+                </el-breadcrumb-item>
+                <el-breadcrumb-item><a href="/">
+                    <el-button size="small" >风险主体总量<i class="el-icon-close" size="mini " ></i>
+
+                            </el-button>
+                    </a></el-breadcrumb-item>
+                </el-breadcrumb> -->
+
+           
+            <!-- <span class="text">首页</span> -->
+            
+        </div>
+        <!-- 用户信息 登录注册 -->
+        <div class="r-content">
+            <!--练习的弹出框 -->
+            <el-dialog
+                title="修改个人信息"
+                :visible.sync="dialogVisible"
+                width="30%">
+                <span></span>
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                </span>
+            </el-dialog>
+
+            <!-- 右侧登录页面设计 -->
+            <el-dropdown>
+                <span class="el-dropdown-link">
+                <el-button icon=el-icon-s-custom circle> </el-button>  <!--登录图表按钮-->
+                    <span class="text">用户信息</span>
+                    <i class="el-icon-arrow-down el-icon--right"></i> <!--下拉-->
+                    </span>
+
+                <el-dropdown-menu slot="dropdown">
+<!--                    <el-dropdown-item>-->
+<!--                        &lt;!&ndash; 点击后改变弹出框生效情况 &ndash;&gt;-->
+<!--                        <el-button  style='width: 150px;' @click="dialogVisible = true">修改个人信息</el-button>-->
+<!--                    </el-dropdown-item>-->
+
+<!--                    <el-dropdown-item> -->
+<!--                        <el-button style='width: 150px;' @click = "UserManagement">用户管理</el-button>-->
+<!--                   </el-dropdown-item>-->
+
+                   <el-dropdown-item>
+                        <el-button style='width: 150px;' @click="logout">退出登录</el-button>
+                   </el-dropdown-item>
+                
+                </el-dropdown-menu>
+                </el-dropdown>
+            
+        </div>
+    </div>
+    
+</template>
+
+<script>
+import {mapState,mapMutations} from 'vuex'
+import http from "@/utils/request";
+  export default {
+    name: "CommonTag",
+    data(){
+        return{
+            dialogVisible:false,//用户登录页面
+            // 折叠按钮
+            icon:"el-icon-arrow-left",
+
+        };
+    },
+    computed: {
+        ...mapState({//mapState返回一个对象，表示扩展运算符，起到解构的作用...
+            tags: state => state.tab.tabsList
+        })
+        
+    },
+    methods:{
+
+         // 折叠方法
+         handleMenu(){
+        this.$store.commit('collapseMenu')
+        this.icon = this.icon === 'el-icon-arrow-left' ? 'el-icon-arrow-right' : 'el-icon-arrow-left';
+        },
+
+      logout(){
+        this.$store.commit('logout')
+        this.$notify.info({
+          title: '注意',
+          message: '已退出'
+        })
+        this.$router.push('/login')
+        location.reload();
+      },
+
+        //调用Mutations,获取closeTag，并添加到当前页面中（讲解34）
+        ...mapMutations(['closeTag']),
+        //点击tag跳转的功能
+        changeMenu(item){
+            // console.log(item)
+            this.$router.push({name: item.name})//点击一个，新增一个，面包屑tab增加一个
+        },
+        //点击tag x删除
+        handledClose(item,index){  //index是获取的索引
+            //点击tag删除 tabsList里面的数据
+            // 方法1
+            // this.$store.commit('closeTag')
+            // 方法2,调用store中的Mutations
+            this.closeTag(item)
+            const length=this.tags.length
+            // console.log("tags长度：",this.tags.length)
+            // console.log( this.$router)
+            
+            //删除之后的跳转逻辑
+            //一）当前页与删除页不同（item.name和当前展示路由不一致），直接删除路由列表里面的对于name，就不能再打开，没有人性化调整的必要
+            if(item.name!== this.$route.name){
+                return
+            }
+            //二）当前页=删除页——删除的是最后一页(页面转到路由列表中的前一个)
+            if(index===length){
+                if(length===0){
+                    item={
+                        path: "/market_entities",
+                        name: "market_entities",
+                        label: "市场主体分析",
+                    }
+                    this.$router.push(item)
+                    this.$store.commit('selectMenu', item)//点击获取新路由对象,store在这里不用import  
+                }
+                else{ 
+                    this.$router.push({
+                        name:this.tags[index-1].name
+                    })
+                }
+            }
+
+            //三）当前页=删除页——删除的是中间一页(跳转后一个，因为已经删除了，跳转的还是后面那个)
+            else{
+                this.$router.push({
+                    name:this.tags[index].name
+                })
+            }
+            
+
+        },
+
+        // 跳转用户管理
+        UserManagement(){//点击标题跳转大屏
+            this.$router.push('/UserManagement');
+        },
+
+    
+
+
+        
+
+
+    }
+  };
+</script>
+
+<style lang="less" scoped>
+
+.header-container{
+    padding: 0 30px;
+    background-color: #33333325;
+    height: 60px;
+    display: flex;//相邻的两个内容一行显示
+    justify-content: space-between;
+   
+   .text{
+    color:rgba(0, 0, 0, 0.719);
+    font-size: 13px;
+    margin-left: 5px;//左间距
+    margin-bottom: 10px;//下间距
+
+   }
+   .l-content{
+    display: flex;
+    justify-content: space-between;
+    align-items: end; // 中间
+   }
+   .r-content{
+    margin-top: 5px;//下间距
+    align-items: top; // 中间
+    .el-button.is-circle {
+        border-radius: 100%;
+        padding: 3px;//边框和内部距离
+    }
+
+    .el-button {//按钮边框
+        background: #ffffff00; 
+        border: 1px solid #00040e;
+        color: #000104; 
+        font-size: 16px;
+        border-radius: 20px;
+    }
+   }
+  
+}
+</style>
\ No newline at end of file
diff --git a/src_old/components/QiPao.vue b/src_old/components/QiPao.vue
new file mode 100644
index 0000000..a432fba
--- /dev/null
+++ b/src_old/components/QiPao.vue
@@ -0,0 +1,189 @@
+<template>
+  <div ref="QiPao" style="width: 1000px; height: 800px"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import * as d3 from 'd3';
+export default {
+  data() {
+    return {
+        option: {},
+        colorList: ['#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
+    };
+  },
+  mounted() {
+    let that = this
+    let seriesData = [
+      {
+        depth: 0,
+        id: 'option',
+        index: 0,
+        value: 0
+      },
+      {
+        depth: 1,
+        id: 'option.大连商品交易所',
+        index: 1,
+        value: 1
+      },
+      {
+        depth: 1,
+        id: 'option.上海期货交易所',
+        index: 2,
+        value: 1
+      },
+      {
+        depth: 1,
+        id: 'option.郑州商品交易所',
+        index: 3,
+        value: 2
+      },
+      {
+        depth: 0,
+        id: 'option.广州期货交易所',
+        index: 4,
+        value: 1
+      },
+      {
+        depth: 1,
+        id: 'option.上海国际能源交易中心',
+        index: 5,
+        value: 1
+      },
+    ];
+    let displayRoot = stratify1();
+
+    function stratify1() {
+      return d3
+        .stratify()
+        .parentId(function (d) {
+
+          return d.id.substring(0, d.id.lastIndexOf('.'));
+        })(seriesData)
+        .sum(function (d) {
+
+          return d.value || 0;
+        })
+        .sort(function (a, b) {
+          return b.value - a.value;
+        });
+    }
+
+    function overallLayout(params, api) {
+      let context = params.context;
+      d3
+        .pack()
+        .size([api.getWidth() - 2, api.getHeight() - 2])
+        .padding(0)(displayRoot);
+      context.nodes = {};
+
+      displayRoot.descendants().forEach(function (node) {
+
+        context.nodes[node.id] = node;
+      });
+    }
+
+    function renderItem(params, api) {
+      let context = params.context;
+      let idx = params.dataIndex;
+      
+      // Only do that layout once in each time `setOption` called.
+      // 每次调用“setOption”时，只能进行一次布局。
+      if (!context.layout) {
+        context.layout = true;
+
+        overallLayout(params, api);
+      }
+      let nodePath = api.value('id');
+      let nodeName = nodePath
+        .slice(nodePath.lastIndexOf('.') + 1)
+        .split(/(?=[A-Z][^A-Z])/g)
+        .join('')
+      let node = context.nodes[nodePath];
+      if (node.id === 'option') {
+        node.r = 0
+      }
+      if (!node) {
+        // Reder nothing.
+        return;
+      }
+
+      let z2 = api.value('depth') * 2;
+      return {
+        type: 'circle',
+        shape: {
+          cx: node.x,
+          cy: node.y,
+          r: node.r
+        },
+        // transition: ['shape'],
+        z2: z2,
+        textContent: {
+          type: 'text',
+          style: {
+            // transition: isLeaf ? 'fontSize' : null,
+            text: nodeName,
+            fill: '#fff',
+            fontFamily: 'Arial',
+            width: node.r,
+            overflow: 'truncate',
+            fontSize: 13
+          },
+          emphasis: {
+            style: {
+              overflow: null,
+              fontSize: Math.max(node.r / 3, 12)
+            }
+          }
+        },
+        textConfig: {
+          position: 'inside'
+        },
+        style: {
+          fill: that.colorList[idx % that.colorList.length]
+        },
+        emphasis: {
+          style: {
+            fontFamily: 'Arial',
+            fontSize: 6,
+            shadowBlur: 20,
+            shadowOffsetX: 3,
+            shadowOffsetY: 5,
+            shadowColor: 'rgba(0,0,0,0.3)'
+          }
+        }
+      };
+    }
+
+    this.option = {
+      dataset: {
+        source: seriesData
+      },
+      tooltip: {},
+      hoverLayerThreshold: Infinity,
+      series: [{
+        type: 'custom',
+        colorBy: 'data',
+        renderItem: renderItem,
+        progressive: 0,
+        coordinateSystem: 'none',
+        encode: {
+          tooltip: 'value',
+          itemName: 'id'
+        },
+      }]
+    }
+    this.initEcharts()
+  },
+  methods: {
+      initEcharts() {
+        let myChart = echarts.init(this.$refs.QiPao)
+        myChart.setOption(this.option)
+      }
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src_old/components/addline.vue b/src_old/components/addline.vue
new file mode 100644
index 0000000..0861ad1
--- /dev/null
+++ b/src_old/components/addline.vue
@@ -0,0 +1,154 @@
+<template>
+    <div>
+      <div class="form">
+                                                          <!-- inline="true"表单域在一行 -->
+            <el-form :inline="true"  :model="formInline" class="demo-form-inline">
+              <el-form-item label="公司名称">
+                <el-input  v-model="formInline.company_str" placeholder="公司名称：" size="mini"></el-input>
+              </el-form-item>
+  
+              <el-form-item>
+                <el-button type="primary" @click="onSubmit" icon="el-icon-search" size="mini">查询</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+      <div id='echarts' ref="echarts_1" style="height:300px;width:600px;margin-left: 200px;"></div>
+    </div>
+  </template>
+  <script>
+  
+  import * as echarts from "echarts"
+  export default {
+    data() {
+        return {
+          // 新数据
+          x:['2000/6/5','2000/6/6','2000/6/7','2000/6/8','2000/6/9','2000/6/10','2000/6/11','2000/6/12','2000/6/13','2000/6/14','2000/6/15','2000/6/16','2000/6/17','2000/6/18','2000/6/19','2000/6/20','2000/6/21','2000/6/22','2000/6/23','2000/6/24','2000/6/25','2000/6/26','2000/6/27','2000/6/28','2000/6/29','2000/6/30','2000/7/1','2000/7/2','2000/7/3','2000/7/4','2000/7/5','2000/7/6','2000/7/7','2000/7/8','2000/7/9','2000/7/10','2000/7/11','2000/7/12','2000/7/13','2000/7/14','2000/7/15','2000/7/16','2000/7/17','2000/7/18','2000/7/19','2000/7/20','2000/7/21','2000/7/22','2000/7/23','2000/7/24'],
+          y1:[200,269,286,153,297,243,184,178,292,298,283,282,228,251,320,316,131,173,138,329,197,246,257,232,271,161,212,147,200,348,251,119,190,132,147,211,255,323,190,157,123,269,106,183,237,296,156,61,101,301],
+          y2:[319,162,213,69,167,337,171,283,285,203,322,81,185,259,212,305,206,236,70,224,309,254,86,107,334,153,243,141,251,306,306,317,271,290,254,220,154,156,54,70,133,223,265,51,339,270,184,332,163,197],
+          y3:[329,113,251,118,324,328,140,284,231,189,192,275,73,311,313,299,199,300,249,160,263,272,159,245,222,104,203,283,332,147,278,339,207,159,66,106,338,63,258,191,246,141,243,90,290,330,93,76,134,86],
+          y4:[284,265,335,75,234,121,66,258,104,291,197,248,56,340,120,327,328,81,179,282,211,90,147,320,150,200,236,210,205,192,318,184,98,228,55,66,231,151,63,149,329,127,111,57,64,55,119,137,247,270],
+          
+          formInline: {
+            company_str: '',
+          },
+          legend_1:['银行'],
+          series_1:[{
+                name: '银行',
+                type: 'line',
+                data: [200,269,286,153,297,243,184,178,292,298,283,282,228,251,320,316,131,173,138,329,197,246,257,232,271,161,212,147,200,348,251,119,190,132,147,211,255,323,190,157,123,269,106,183,237,296,156,61,101,301],
+              }],
+
+  
+          option_1 : {
+            title: [{
+              x :'center',
+              y:'bottom',
+                
+                text: '各行业风险价值（机构处于极端困难情况时）的时序变化'
+              },
+            ],
+            tooltip: {
+              trigger: 'axis'
+            },
+            legend:  {data:
+              this.series_1
+            },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            toolbox: {
+              feature: {
+                saveAsImage: {}
+              }
+            },
+            xAxis: {
+              type: 'category',
+              boundaryGap: false,
+              data:  this.x,//其中的一个数据
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series: [{
+                name: '银行',
+                type: 'line',
+                // stack: 'Total',
+                data: [200,269,286,153,297,243,184,178,292,298,283,282,228,251,320,316,131,173,138,329,197,246,257,232,271,161,212,147,200,348,251,119,190,132,147,211,255,323,190,157,123,269,106,183,237,296,156,61,101,301],
+              }],
+             
+        },
+  
+        linedata_1:[
+              {
+                name: '银行',
+                type: 'line',
+                data: [200,269,286,153,297,243,184,178,292,298,283,282,228,251,320,316,131,173,138,329,197,246,257,232,271,161,212,147,200,348,251,119,190,132,147,211,255,323,190,157,123,269,106,183,237,296,156,61,101,301],
+              },
+              {
+                name: '北京银行',
+                type: 'line',
+                data: [319,162,213,69,167,337,171,283,285,203,322,81,185,259,212,305,206,236,70,224,309,254,86,107,334,153,243,141,251,306,306,317,271,290,254,220,154,156,54,70,133,223,265,51,339,270,184,332,163,197],
+
+              },
+              {
+                name: '中国银行',
+                type: 'line',
+                data: [329,113,251,118,324,328,140,284,231,189,192,275,73,311,313,299,199,300,249,160,263,272,159,245,222,104,203,283,332,147,278,339,207,159,66,106,338,63,258,191,246,141,243,90,290,330,93,76,134,86],
+              },
+              {
+                name: 'Direct',
+                type: 'line',
+                data: [284,265,335,75,234,121,66,258,104,291,197,248,56,340,120,327,328,81,179,282,211,90,147,320,150,200,236,210,205,192,318,184,98,228,55,66,231,151,63,149,329,127,111,57,64,55,119,137,247,270],
+              },
+              {
+                name: 'Search Engine',
+                type: 'line',
+                data: [820, 932, 901, 934, 1290, 1330, 1320]
+              }
+            ],
+        
+        }
+      },
+      mounted(){
+        //  风险价值动态变化
+        this.onSubmit()
+  
+      },
+  
+      methods: {
+        onSubmit() {
+            if (this.formInline.company_str!==''){
+              console.log(this.formInline.company_str)
+              let tmp=this.linedata_1.find(item => item.name === this.formInline.company_str)  //es6
+              this.option_1.series.push(tmp)
+              console.log(this.option_1.series)
+  
+            }
+            let echarts1 = echarts.init(this.$refs.echarts_1)
+            echarts1.setOption(this.option_1)
+  
+        },
+  
+  
+  
+      }
+  
+  
+  
+  
+  };
+  </script>
+  
+  <style lang="less" scoped>
+  
+  
+  // 第一层
+  
+  </style>
+  
+  
+  
+  
\ No newline at end of file
diff --git a/src_old/components/dimensionComponent.vue b/src_old/components/dimensionComponent.vue
new file mode 100644
index 0000000..b860614
--- /dev/null
+++ b/src_old/components/dimensionComponent.vue
@@ -0,0 +1,315 @@
+<template>
+  <div>
+    <div ref="dimension"  style="width: 1200px; height: 450px;margin-left: 0px;margin-top: 0px;"></div>
+    <div class="warning-component">
+      <div class="warning-dates">
+        <button class="button" @click="changeState">
+          <span class="text">{{ state }}</span>
+          <svg class="arrow" viewBox="0 0 448 512" height="1em" xmlns="http://www.w3.org/2000/svg"><path d="M438.6 278.6c12.5-12.5 12.5-32.8 0-45.3l-160-160c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3L338.8 224 32 224c-17.7 0-32 14.3-32 32s14.3 32 32 32l306.7 0L233.4 393.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0l160-160z"></path></svg>
+        </button>
+        <div class="date-item">前日：<span>{{ prevDayDim }}</span></div>
+        <div class="date-item">昨日：<span>{{ yesterdayDim }}</span></div>
+        <div class="date-item">今日：<span>{{ todayDim }}</span></div>
+        <div class="date-item">明日：<span>{{ tomorrowDim }}</span></div>
+
+      </div>
+    </div>
+  </div>
+
+
+
+</template>
+
+<script>
+import * as echarts from "echarts";
+import http from "@/utils/request";
+
+export default {
+  props: {
+    // xData:[],
+    // yData: [],
+    // legend:String,
+    title:String,
+    zoom:{
+      type:Array,
+      default: function () {
+        return []
+      }
+    }
+  },
+  data(){
+    return {
+      datazoom:[],
+      state:'个体风险状态',
+      individualRisk:[],
+      structureRisk:[],
+      spillRisk:[],
+      volatilityRisk:[],
+      markArea:[],
+      date:[],
+      detail:'',
+      prevDayDim:'',
+      yesterdayDim:'',
+      todayDim:'',
+      tomorrowDim:'',
+    }
+  },
+
+  mounted: function () {
+
+    http.get('/risk/dimension/').then((res)=>{
+      this.date=res.data.date
+      this.individualRisk=res.data.individual
+      this.structureRisk=res.data.structure
+      this.spillRisk=res.data.spill
+      this.volatilityRisk=res.data.volatility
+      this.detail=res.data.detail
+      this.markArea=res.data.markarea
+      this.prevDayDim=res.data.detail[this.state][0]
+      this.yesterdayDim=res.data.detail[this.state][1]
+      this.todayDim=res.data.detail[this.state][2]
+      this.tomorrowDim=res.data.detail[this.state][3]
+      this.initChart()
+
+        }
+    )
+
+
+  },
+  watch:{
+    // prevDayDim(){
+    //   return this.detail[this.state][0]
+    // },
+    // yesterdayDim(){
+    //   return this.detail[this.state][1]
+    // },
+    // todayDim(){
+    //   return this.detail[this.state][2]
+    // },
+    // tomorrowDim(){
+    //   return this.detail[this.state][3]
+    // },
+    zoom(newVal){
+      this.datazoom=newVal
+
+    },
+    state(){
+
+      this.prevDayDim=this.detail[this.state][0]
+      this.yesterdayDim=this.detail[this.state][1]
+      this.todayDim=this.detail[this.state][2]
+      this.tomorrowDim=this.detail[this.state][3]
+
+    }
+
+  },
+  methods:{
+    changeState(){
+      let lis=['个体风险状态','风险关联与溢出','市场系统结构','市场波动和趋势']
+      this.state=lis.indexOf(this.state)+1>3? '个体风险状态':lis[lis.indexOf(this.state)+1]
+    },
+    initChart(){
+      /*
+      示例参考如下
+      * https://echarts.apache.org/v4/examples/zh/editor.html?c=line-aqi
+      *
+      * https://cdn.jsdelivr.net/gh/apache/echarts-website@asf-site/examples/data/asset/data/aqi-beijing.json
+      *
+      * */
+      var myChart = echarts.init(this.$refs["dimension"])
+      let option = {
+        title: {
+          text: '系统性风险指数维度分析',
+          left: 'center',
+        },
+        // grid:{
+        //   show:true,
+        //   backgroundColor:'#eee'
+        // },
+        tooltip: {
+          trigger: 'axis'
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: this.date
+        },
+        legend: {
+          top:30,
+          data: ['个体风险状态', '风险关联与溢出', '市场系统结构', '市场波动和趋势']
+        },
+        yAxis: {
+          scale: true,
+          splitLine: {
+            show: false
+          }
+        },
+
+        toolbox: {
+          right: 80,
+          feature: {
+            // dataZoom: {
+            //   yAxisIndex: 'none'
+            // },
+            dataView: {
+              show: true,
+              title: '查看数据',
+            },
+            restore: {},
+            saveAsImage: {}
+          }
+        },
+        //以下是时间轴
+        dataZoom: [{
+          //也应该是动态的
+          start:80,
+          end:100
+        }, {
+          type: 'inside'
+        }],
+        //以上是时间轴
+
+        series: [{
+          name: '个体风险状态',
+          type: 'line',
+          smooth:0.8,
+          data: this.individualRisk
+        },
+          {
+            name: '风险关联与溢出',
+            type: 'line',
+            smooth:0.8,
+            data: this.spillRisk
+          },
+          {
+            name: '市场系统结构',
+            type: 'line',
+            smooth:0.8,
+            data: this.structureRisk
+          },
+          {
+            name: '市场波动和趋势',
+            type: 'line',
+            smooth:0.8,
+            data: this.volatilityRisk,
+            markArea:{
+              label: { // 分界线上的文字标签
+                // position: 'end',
+                formatter: '预测值'
+              },
+              data:[[{
+                xAxis:this.markArea[0]},
+                {
+                  xAxis:this.markArea[1]},
+              ]]
+
+
+
+            }
+          },
+        ],
+
+
+
+
+      }
+      myChart.setOption(option);
+      // this.$nextTick(()=>{
+      //   myChart.dispatchAction({
+      //     type: 'dataZoom',
+      //     batch: [{
+      //       // 第一个 dataZoom 组件
+      //       start: this.datazoom[0],
+      //       end: this.datazoom[1]
+      //     }]
+      //   })
+      // })
+
+    }
+
+  },
+
+}
+</script>
+
+<style scoped>
+
+.button {
+  border-radius: 7px;
+  width: 160px;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  gap: 12px;
+  cursor: pointer;
+  border: 3px solid rgb(94, 255, 209);
+  background-color: rgb(94, 255, 209);
+  box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.137);
+}
+
+.text {
+
+  width: 70%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+//background-color: rgb(255, 255, 255);
+  color: black;
+}
+
+.arrow path {
+  fill: rgb(19, 19, 19);
+}
+
+.button:hover .arrow {
+  animation: slide-in-left 0.6s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+}
+
+@keyframes slide-in-left {
+  0% {
+    transform: translateX(-8px);
+    opacity: 0;
+  }
+
+  100% {
+    transform: translateX(0px);
+    opacity: 1;
+  }
+}
+
+.button:active {
+  transform: scale(0.97);
+}
+.warning-component {
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  padding: 10px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  max-width: 100%;
+  text-align: center;
+
+  margin: auto;
+}
+
+.warning-dates {
+  display: flex;
+  justify-content: space-between;
+//margin-bottom: 10px;
+}
+
+.date-item {
+  margin: 0 10px;
+  font-weight: bold;
+}
+
+.warning-recent {
+  color: #ff4d4f;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+
+</style>
\ No newline at end of file
diff --git a/src_old/components/echarts/AreaChart.vue b/src_old/components/echarts/AreaChart.vue
new file mode 100644
index 0000000..2d687ad
--- /dev/null
+++ b/src_old/components/echarts/AreaChart.vue
@@ -0,0 +1,124 @@
+<!-- 直方图和折线图的结合图 -->
+<template>
+     <div ref="AreaChart" style="height:300px;width:1000px; border: 1px solid #e0e0e0;margin:20px"></div>
+
+  </template>
+  
+<script>
+import * as echarts from "echarts";
+
+  export default {
+    props:['myHalfData'],
+    data () {
+    return {
+        myData:this.myHalfData
+    }
+  },
+    mounted() {
+        const echarts2 = echarts.init(this.$refs.AreaChart)
+        const option_2={
+            // 右上角存图
+            toolbox: {
+              feature: {
+                saveAsImage: {}
+              }
+            },
+              title: {
+                text: '事件热度分析'
+              },
+              tooltip: {
+                trigger: 'axis',
+                axisPointer: {
+                  type: 'cross',
+                  label: {
+                    backgroundColor: '#6a7985'
+                  }
+                }
+              },
+              legend: {
+                data: ['渠道1', '渠道2', '渠道3']
+              },
+              grid: {
+                left: '3%',
+                right: '4%',
+                bottom: '3%',
+                containLabel: true
+              },
+              xAxis: [
+                {
+                  type: 'category',
+                  boundaryGap: false,
+                  data: ['0', '1', '2', '3', '4', '5', '6'],
+                  name: '天'
+                }
+              ],
+              yAxis: [
+                {
+                  type: 'value'
+                }
+              ],
+              series: [
+                {
+                  name: '渠道1',
+                  type: 'line',
+                  stack: 'Total',
+                  areaStyle: {},
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  data: [120, 132, 101, 134, 90, 230, 210]
+                },
+                {
+                  name: '渠道2',
+                  type: 'line',
+                  stack: 'Total',
+                  areaStyle: {},
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  data: [220, 182, 191, 234, 290, 330, 310]
+                },
+                {
+                  name: '渠道3',
+                  type: 'line',
+                  stack: 'Total',
+                  areaStyle: {},
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  data: [150, 232, 201, 154, 190, 330, 410]
+                },
+                {
+                  name: 'Direct',
+                  type: 'line',
+                  stack: 'Total',
+                  areaStyle: {},
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  data: [320, 332, 301, 334, 390, 330, 320]
+                },
+                {
+                  name: 'Search Engine',
+                  type: 'line',
+                  stack: 'Total',
+                  label: {
+                    show: true,
+                    position: 'top'
+                  },
+                  areaStyle: {},
+                  emphasis: {
+                    focus: 'series'
+                  },
+                  data: [820, 932, 901, 934, 1290, 1330, 1200]
+                }
+              ]
+            }
+          echarts2.setOption(option_2)
+     
+    },
+  };
+  </script>
+  
+  <style>
+  </style>
\ No newline at end of file
diff --git a/src_old/components/echarts/DifferentialChart.vue b/src_old/components/echarts/DifferentialChart.vue
new file mode 100644
index 0000000..10a971a
--- /dev/null
+++ b/src_old/components/echarts/DifferentialChart.vue
@@ -0,0 +1,104 @@
+<!-- line chart动态数据变化趋势图 -->
+<template>
+  <div>
+  <el-empty description="暂无数据" v-show="!show"></el-empty>
+  <div ref="lines" style="width: 800px; height: 300px;padding-left:250px" v-show="show"></div>
+  </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+export default {
+  props:{
+    datelis:[],
+    asset:[],
+    held_num:[],
+  },
+  data() {
+    return {
+      show:false
+
+    };
+  },
+  watch:{
+    datelis(){
+      //不为空字符串列表
+      console.log(this.held_num)
+      if (this.asset.findIndex((value) => value!=='' )!== -1 || this.held_num.findIndex((value) => value!=='')!== -1) {
+        console.log(1)
+        this.show = true
+        this.initChart()
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    initChart(){
+      var myChart = echarts.init(this.$refs.lines);
+      // 绘制图表
+      var option = {
+        title: {
+          text: "资产和持股规模",
+          left: "center",
+          textStyle: {
+            fontSize: 17,
+            lineHeight: 10,
+          },
+        },
+        tooltip: {
+          trigger: "axis",
+        },
+        legend: {
+          data: ["资产","持股"],
+          padding:[25,0,0,0],
+          //orient: 'vertical',
+        },
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          containLabel: true,
+        },
+        toolbox: {
+          feature: {
+            saveAsImage: {},
+          },
+        },
+        xAxis: {
+          type: "category",
+          boundaryGap: false,
+          data: this.datelis,
+        },
+        yAxis: {
+          type: "value",
+        },
+        series: [
+          {
+            name: "资产",
+            type: "line",
+            stack: "Total",
+            data: this.asset,
+          },
+          {
+            name: "持股",
+            type: "line",
+            stack: "Total",
+            data: this.held_num,
+            // [4500, 5000, 5020, 4900, 4300, 6000, 6600,6200,7000,5500,4900,6100,
+            //     6700,7050,8000,9000,11000,12000,8600,8200,9500
+            //   ],
+          },
+        ],
+      }
+      myChart.setOption(option);
+
+    }
+
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src_old/components/echarts/DynamicLine.vue b/src_old/components/echarts/DynamicLine.vue
new file mode 100644
index 0000000..7b3b278
--- /dev/null
+++ b/src_old/components/echarts/DynamicLine.vue
@@ -0,0 +1,155 @@
+<template>
+  <div ref="changetrend" style="width: 800px; height: 320px;margin-left: 100px;margin-top: 0px;"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import http from "@/utils/request";
+export default {
+  data() {
+    return {
+      time:[],
+      riskData:[],
+      len:Number,
+    };
+  },
+  mounted() {
+    http.get('/warning/get_warning_count/?need=1').then((res)=>{
+
+      for (let i in res.data) {
+        this.time.push(res.data[i]["time"].replace('_','-'))
+        this.riskData.push(res.data[i]["综合风险水平"])
+      }
+      this.len=this.time.length
+      let selectedTime=this.time.slice(0,40)
+      let selectedRisk=this.riskData.slice(0,40)
+      var myChart = echarts.init(this.$refs.changetrend);
+      // 绘制图表
+      // function randomData() {
+      //   now = new Date(+now + oneDay);
+      //   value = value + Math.random() * 21 - 10;
+      //   return {
+      //     name: now.toString(),
+      //     value: [
+      //       [now.getFullYear(), now.getMonth() + 1, now.getDate()].join("/"),
+      //       Math.round(value),
+      //     ],
+      //   };
+      // }
+      // let data = [];
+      // let now = new Date(1997, 9, 3);
+      // let oneDay = 24 * 3600 * 1000;
+      // let value = Math.random() * 1000;
+      // for (var i = 0; i < 1000; i++) {
+      //   data.push(randomData());
+      // }
+      // console.log(data)
+      var option = {
+        title: {
+          text: "系统性风险整体变化趋势",
+          left:'center',
+          textStyle: {//主标题文本样式
+            fontSize: 15,
+            color:'#696969',
+          },
+          padding:[ 5,0,5,0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+
+        },
+
+        grid: {
+          left: '20%',//离左边远一点
+          right: '4%',
+          // bottom: '10%',
+          top:'5%',//如果不填，会默认一个特别大的值，导致图的上面留白特别大
+          // containLabel: true
+        },
+
+        tooltip: {
+          trigger: "axis",
+          // formatter:
+          //     function (params) {
+          //   params = params[0];
+          //   var date = new Date(params.name);
+          //   return (
+          //     date.getDate() +
+          //     "/" +
+          //     (date.getMonth() + 1) +
+          //     "/" +
+          //     date.getFullYear() +
+          //     " : " +
+          //     params.value[1]
+          //   );
+          // },
+          axisPointer: {
+            animation: false,
+          },
+        },
+        xAxis: {
+          type: "category",
+          splitLine: {
+            show: false,
+          },
+          data:selectedTime
+        },
+        yAxis: {
+          type: "value",
+          boundaryGap: [0, "100%"],
+          splitLine: {
+            show: false,
+          },
+        },
+        series: [
+          {
+            name: "综合风险",
+            type: "line",
+            showSymbol: true,
+            data: selectedRisk
+            // data,
+          },
+        ],
+      };
+      myChart.setOption(option);
+      var that=this
+      let i =0
+      setInterval(function () {
+        // for (var i = 0; i < 5; i++) {
+        //   data.shift();
+        //   data.push(randomData());
+        // }
+          if (i===that.time.length-50)
+            i=0
+          selectedRisk=that.riskData.slice(i,50+i)
+          selectedTime=that.time.slice(i,50+i)
+          i++
+        myChart.setOption({
+          series: [
+            {
+              name: "综合风险",
+              type: "line",
+              showSymbol: true,
+              data: selectedRisk,
+            },
+          ],
+          xAxis: {
+
+            type: "category",
+            splitLine: {
+              show: false,
+            },
+            data:selectedTime
+          },
+        });
+      }, 1500);
+
+    })
+
+  },
+  methods: {
+
+
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src_old/components/echarts/HalfDoughnut.vue b/src_old/components/echarts/HalfDoughnut.vue
new file mode 100644
index 0000000..3677b29
--- /dev/null
+++ b/src_old/components/echarts/HalfDoughnut.vue
@@ -0,0 +1,98 @@
+<template>
+  <!-- 半圆饼图-Half Doughnut Chart -->
+  <!-- 用于预警服务-异常检测的三个数据 -->
+  <div ref="echarts" style="width: 800px; height: 400px;padding-left:250px"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+export default {
+  props:{myHalfData:{
+    type:Array,
+
+    }},
+  data () {
+    return {
+        myData:this.myHalfData
+    }
+  },
+
+  watch:{
+    myHalfData(){
+      this.initCharts()
+    }
+  },
+    methods:{
+
+        initCharts(){
+          var myChart = echarts.init(this.$refs.echarts)
+          var option = {
+            tooltip: {
+              trigger: "item",
+            },
+            title: {
+              text: "异常类型占比",
+              left: "center",
+              textStyle: {
+                fontSize: 17,
+                lineHeight: 85,
+              },
+            },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '0%',
+              top: '0%',
+
+            },
+            legend: {
+              top: "15%",
+              left: "center",
+            },
+            series: [
+              {
+                name: "proportion of abnormal risk",
+                type: "pie",
+                radius: ["40%", "80%"],
+                center: ["50%", "70%"],
+                // adjust the start angle
+                startAngle: 180,
+                label: {
+                  show: true,
+                  formatter(param) {
+                    // correct the percentage
+                    return param.name + " (" + param.percent * 2 + "%)";
+                  },
+                },
+                // data: [
+                //   { value: 300, name: "股价波动异常" },
+                //   { value: 350, name: "高频交易" },
+                //   { value: 200, name: "资产泡沫" },
+                //   { value: 120, name: "事件风险波及" },
+                //   { value: 110, name: "风险事件时长" },
+                //   { value: 280, name: "事件热度异常" },
+                //   {
+                //     // make an record to fill the bottom 50%
+                //     value: 300+350+200+120+110+280,
+                //     itemStyle: {
+                //       color: "none",
+                //     },
+                //   },
+                // ],
+                data: this.myHalfData
+
+              },
+            ],
+          };
+          myChart.setOption(option);
+        }
+      },
+
+  mounted() {
+    this.initCharts()
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src_old/components/echarts/Histogram.vue b/src_old/components/echarts/Histogram.vue
new file mode 100644
index 0000000..07545ff
--- /dev/null
+++ b/src_old/components/echarts/Histogram.vue
@@ -0,0 +1,130 @@
+<!-- 直方图和折线图的结合图 -->
+<template>
+  <div id="zhifang" style="width: 85%; height: 400px;margin-left: 100px;"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+export default {
+  props: {
+    xData:[],
+    yData: [],
+    legend:String,
+    title:String,
+  },
+  data(){
+    return{
+      x:this.xData,
+      y:this.yData,
+
+    }
+  },
+  watch:{
+    xData(newV){
+      console.log(newV)
+      this.initGraph()
+      console.log(this.legend)
+    }
+  },
+  methods:{
+    initGraph()
+    {
+      var myChart = echarts.init(document.getElementById("zhifang"));
+      var option = {
+        title: {
+          text: this.title,
+          left: "center",
+          textStyle: {
+            fontSize: 17,
+            lineHeight: 30,
+          },
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+        },
+        grid: {
+          right: "20%",
+        },
+        legend: {
+          data: this.legend,
+          padding: [70, 0, 0, 100],
+          orient: 'vertical',
+        },
+        xAxis: [
+          {
+            type: "category",
+            axisTick: {
+              alignWithLabel: true,
+              show: false
+            },
+            axisLabel: {
+              // interval: 0,
+              rotate: 30
+            },
+            data: this.xData
+          },
+        ],
+        yAxis: [
+          {
+            type: "value",
+            name: this.legend,
+            position: "right",
+            alignTicks: true,
+            axisLine: {
+              show: true,
+            },
+            axisLabel: {
+              formatter: "{value}",
+              textStyle: {
+                color: 'blue'
+              }
+            },
+          },
+          // {
+          //   type: "value",
+          //   name: "收盘价",
+          //   position: "left",
+          //   alignTicks: true,
+          //   axisLine: {
+          //     show: true,
+          //   },
+          //   axisLabel: {
+          //     formatter: "{value}元",
+          //     textStyle: {
+          //       color: 'green'
+          //     }
+          //   },
+          // },
+        ],
+        series: [
+          {
+            name: this.legend,
+            type: "line",
+            smooth:true,
+            markPoint: {
+              symbol: 'circle', // 设置拐点小圆点
+              // symbolSize:8, // 设置拐点小圆点大小
+            },
+            data: this.yData
+          },
+          // {
+          //   name: "收盘价",
+          //   type: "line",
+          //   yAxisIndex: 1,
+          //   data: [
+          //     10, 25, 30, 19, 12, 16, 26, 23, 20, 17, 21, 15,
+          //   ],
+          // },
+        ],
+      };
+      myChart.setOption(option);
+    }
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src_old/components/echarts/ZhiFang(1).vue b/src_old/components/echarts/ZhiFang(1).vue
new file mode 100644
index 0000000..8641b2d
--- /dev/null
+++ b/src_old/components/echarts/ZhiFang(1).vue
@@ -0,0 +1,103 @@
+<template>
+  <div id="zhifang" style="width: 85%; height: 400px"></div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+export default {
+  mounted() {
+    var myChart = echarts.init(document.getElementById("zhifang"));
+    var option = {
+      title:{
+        text: "交易量/频次及股票变换趋势",
+        left: "center",
+        textStyle: {
+          fontSize: 17,
+          lineHeight: 30,
+        },
+      },
+      tooltip: {
+        trigger: "axis",
+        axisPointer: {
+          type: "cross",
+        },
+      },
+      grid: {
+        right: "20%",
+      },
+      legend: {
+        data: ["交易量","收盘价"],
+        padding:[70,0,0,100],
+        orient: 'vertical',
+      },
+      xAxis: [
+        {
+          type: "category",
+          axisTick: {
+            alignWithLabel: true,
+            show:false
+          },
+          axisLabel:{
+            interval:0,
+            rotate:30
+          },
+          data: ['2021-1-1', '2021-1-2', '2021-1-3', '2021-1-4', '2021-1-5', '2021-1-6', '2021-1-7', '2021-1-8', '2021-1-9', '2021-1-10', '2021-1-11', '2021-1-12'],
+        },
+      ],
+      yAxis: [
+        {
+          type: "value",
+          name: "交易量",
+          position: "right",
+          alignTicks: true,
+          axisLine: {
+            show: true,
+          },
+          axisLabel: {
+            formatter: "{value}支",
+            textStyle:{
+               color:'blue'
+            }           
+          },
+        },
+        {
+          type: "value",
+          name: "收盘价",
+          position: "left",
+          alignTicks: true,
+          axisLine: {
+            show: true,
+          },
+          axisLabel: {
+            formatter: "{value}元",
+            textStyle:{
+               color:'green'
+            } 
+          },
+        },
+      ],
+      series: [
+        {
+          name: "交易量",
+          type: "bar",
+          data: [
+            100, 120, 80, 230, 150,90, 170, 162, 250, 110, 60, 200,
+          ],
+        },
+        {
+          name: "收盘价",
+          type: "line",
+          yAxisIndex: 1,
+          data: [
+            10, 25, 30, 19, 12, 16, 26, 23, 20, 17, 21, 15,
+          ],
+        },
+      ],
+    };
+    myChart.setOption(option);
+  },
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src_old/components/halfYear.vue b/src_old/components/halfYear.vue
new file mode 100644
index 0000000..f2e1f2d
--- /dev/null
+++ b/src_old/components/halfYear.vue
@@ -0,0 +1,208 @@
+<template>
+  <div class="el-quarter-picker">
+    <el-popover v-model="visible" placement="bottom-start" transition="el-zoom-in-top" trigger="click">
+      <div class="content">
+        <p>
+          <button type="button" aria-label="前一年" class="el-picker-panel__icon-btn el-date-picker__prev-btn el-icon-d-arrow-left" @click="prev" />
+          <span role="button" class="span-year">{{ year }}年</span>
+          <button type="button" aria-label="后一年" class="el-picker-panel__icon-btn el-date-picker__next-btn el-icon-d-arrow-right" @click="next" />
+        </p>
+        <div class="choose-item">
+          <button :class="classStyle1" :disabled="disabled1" @click="selectHalfYear('上半年')">上半年</button>
+          <button :class="classStyle2" :disabled="disabled2" @click="selectHalfYear('下半年')">下半年</button>
+        </div>
+      </div>
+
+      <el-input slot="reference" v-model="text" :placeholder="'选择半年'" size="small" @change="iptchange">
+        <i slot="prefix" class="el-input__icon el-icon-date" />
+      </el-input>
+    </el-popover>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'HalfYearPicker',
+  model: {
+    prop: 'value',
+    event: 'change'
+  },
+  props: ['value', 'disabledTime', 'indexkey'], // disabledTime 格式为 YYYY-MM
+  data() {
+    return {
+      visible: false,
+      text: '',
+      year: new Date().getFullYear(),
+      nowmonth: new Date().getMonth(),
+      nowyear: new Date().getFullYear(),
+      emit_value: [],
+      clickyear: '',
+      clickmonth: '',
+      disabled1: false, // 禁止，开始时间之前
+      disabled2: false // 禁止，开始时间之前
+    }
+  },
+  computed: {
+    classStyle1: function() {
+      return {
+        today: (this.nowyear === this.year) && (this.nowmonth < 6 || this.nowmonth) === 6,
+        clickcell: (this.year === this.clickyear) && (this.clickmonth === '上半年'),
+        selectMonth: true,
+        'is-disabled': (this.year > this.nowyear) || this.disabled1
+      }
+    },
+    classStyle2: function() {
+      return {
+        today: (this.nowyear === this.year) && (this.nowmonth > 6),
+        clickcell: (this.year === this.clickyear) && (this.clickmonth === '下半年'),
+        selectMonth: true,
+        'is-disabled': (this.year > this.nowyear) || ((this.year === this.nowyear) && this.nowmonth < 7) || this.disabled2
+      }
+    }
+  },
+  watch: {
+    indexkey() {
+      if (this.disabledTime) {
+        this.aviod(this.disabledTime)
+      }
+    }
+  },
+  mounted() {
+    if (this.disabledTime) {
+      this.aviod(this.disabledTime)
+    }
+  },
+  methods: {
+    // 上一年
+    prev() {
+      this.year = this.year * 1 - 1
+      this.aviod(this.disabledTime)
+    },
+    // 下一年
+    next() {
+      this.year = this.year * 1 + 1
+      this.aviod(this.disabledTime)
+    },
+    // 点击选项事件
+    selectHalfYear(item) {
+      this.text = this.year + item
+      this.clickyear = this.year
+      this.clickmonth = item
+      if (item === '上半年') {
+        const data1 = this.year + '-01-01'
+        const data2 = this.year + '-06-30'
+        this.emit_value = [data1, data2]
+      } else {
+        const data1 = this.year + '-07-01'
+        const data2 = this.year + '-12-31'
+        this.emit_value = [data1, data2]
+      }
+      this.visible = false
+      this.$emit('change', this.emit_value)
+    },
+    // 自主输入判断
+    iptchange(val) {
+      if (val !== '') {
+        const year = val.slice(0, 4)
+        const text = val.slice(5, 8)
+        const reg = /^[0-9]{4}$/
+        if (reg.test(year)) {
+          if (text === '上半年' || text === '下半年') {
+            this.text = val
+            this.clickyear = year
+            this.clickmonth = text
+            const data1 = this.year + '-01-01'
+            const data2 = this.year + '-06-30'
+            this.emit_value = [data1, data2]
+            this.$emit('change', this.emit_value)
+          } else {
+            this.text = ''
+          }
+        } else {
+          this.text = ''
+        }
+      } else {
+        this.$emit('change', ['', ''])
+      }
+    },
+    aviod(timeA) {
+      const time = timeA.date
+      if (time) {
+        const year = time.slice(0, 4)
+        const month = time.slice(5, 7)
+        if (timeA.type === 2) {
+          if (this.year < year) {
+            this.disabled1 = true
+            this.disabled2 = true
+          } else if (Number(this.year) === Number(year) && Number(month) > 6) {
+            this.disabled1 = true
+            this.disabled2 = false
+          } else {
+            this.disabled1 = false
+            this.disabled2 = false
+          }
+        } else {
+          if (this.year > year) {
+            this.disabled1 = true
+            this.disabled2 = true
+          } else if (Number(this.year) === Number(year) && Number(month) <= 6) {
+            this.disabled1 = false
+            this.disabled2 = true
+          } else {
+            this.disabled1 = false
+            this.disabled2 = false
+          }
+        }
+      } else {
+        this.disabled1 = false
+        this.disabled2 = false
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  width: 220px;
+  min-width: 220px;
+  p {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: solid 1px #ebeef5;
+    padding-bottom: 12px;
+    font-size: 16px;
+    button {
+      margin-top: 0;
+    }
+  }
+  .choose-item {
+    display: flex;
+    justify-content: space-around;
+    .selectMonth {
+      margin: 14px 10px;
+      font-size: 12px;
+      background: transparent;
+    }
+    .selectMonth:hover {
+      color: #409eff;
+      cursor: pointer;
+    }
+    .today {
+      color: #409eff;
+      font-weight: 700;
+    }
+    .clickcell {
+      color: #409eff;
+    }
+    .is-disabled {
+      color: #c0c4cc !important;
+      cursor: not-allowed !important;
+      background-color: #fff;
+      border-color: #ebeef5;
+    }
+  }
+}
+</style>
+
diff --git a/src_old/components/industryComponent.vue b/src_old/components/industryComponent.vue
new file mode 100644
index 0000000..6002bb9
--- /dev/null
+++ b/src_old/components/industryComponent.vue
@@ -0,0 +1,213 @@
+<template>
+  <el-select   v-model="industry" placeholder="选择行业" size="mini">
+    <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+  </el-select>
+</template>
+
+<script>
+export default {
+  name: "industryComponent",
+  data(){
+    return{
+      industry:'',
+      options_industry: [{
+        value: "新闻和出版业",
+        label: "新闻和出版业"}, {
+        value: "保险业",
+        label: "保险业"}, {
+        value: "铁路运输业",
+        label: "铁路运输业"}, {
+        value: "电力、热力生产和供应业",
+        label: "电力、热力生产和供应业"}, {
+        value: "专业技术服务业",
+        label: "专业技术服务业"}, {
+        value: "汽车制造业",
+        label: "汽车制造业"}, {
+        value: "零售业",
+        label: "零售业"}, {
+        value: "医药制造业",
+        label: "医药制造业"}, {
+        value: "电气机械和器材制造业",
+        label: "电气机械和器材制造业"}, {
+        value: "科技推广和应用服务业",
+        label: "科技推广和应用服务业"}, {
+        value: "金属制品业",
+        label: "金属制品业"}, {
+        value: "非金属矿物制品业",
+        label: "非金属矿物制品业"}, {
+        value: "软件和信息技术服务业",
+        label: "软件和信息技术服务业"}, {
+        value: "计算机、通信和其他电子设备制造业",
+        label: "计算机、通信和其他电子设备制造业"}, {
+        value: "化学原料和化学制品制造业",
+        label: "化学原料和化学制品制造业"}, {
+        value: "航空运输业",
+        label: "航空运输业"}, {
+        value: "石油、煤炭及其他燃料加工业",
+        label: "石油、煤炭及其他燃料加工业"}, {
+        value: "石油和天然气开采业",
+        label: "石油和天然气开采业"}, {
+        value: "电信、广播电视和卫星传输服务",
+        label: "电信、广播电视和卫星传输服务"}, {
+        value: "土木工程建筑业",
+        label: "土木工程建筑业"}, {
+        value: "互联网和相关服务",
+        label: "互联网和相关服务"}, {
+        value: "有色金属冶炼和压延加工业",
+        label: "有色金属冶炼和压延加工业"}, {
+        value: "商务服务业",
+        label: "商务服务业"}, {
+        value: "资本市场服务",
+        label: "资本市场服务"}, {
+        value: "铁路、船舶、航空航天和其他运输设备制造业",
+        label: "铁路、船舶、航空航天和其他运输设备制造业"}, {
+        value: "多式联运和运输代理业",
+        label: "多式联运和运输代理业"}, {
+        value: "装卸搬运和仓储业",
+        label: "装卸搬运和仓储业"}, {
+        value: "水的生产和供应业",
+        label: "水的生产和供应业"}, {
+        value: "批发业",
+        label: "批发业"}, {
+        value: "文教、工美、体育和娱乐用品制造业",
+        label: "文教、工美、体育和娱乐用品制造业"}, {
+        value: "房地产业",
+        label: "房地产业"}, {
+        value: "开采专业及辅助性活动",
+        label: "开采专业及辅助性活动"}, {
+        value: "通用设备制造业",
+        label: "通用设备制造业"}, {
+        value: "煤炭开采和洗选业",
+        label: "煤炭开采和洗选业"}, {
+        value: "食品制造业",
+        label: "食品制造业"}, {
+        value: "农副食品加工业",
+        label: "农副食品加工业"}, {
+        value: "有色金属矿采选业",
+        label: "有色金属矿采选业"}, {
+        value: "研究和试验发展",
+        label: "研究和试验发展"}, {
+        value: "酒、饮料和精制茶制造业",
+        label: "酒、饮料和精制茶制造业"}, {
+        value: "教育",
+        label: "教育"}, {
+        value: "专用设备制造业",
+        label: "专用设备制造业"}, {
+        value: "房屋建筑业",
+        label: "房屋建筑业"}, {
+        value: "纺织服装、服饰业",
+        label: "纺织服装、服饰业"}, {
+        value: "橡胶和塑料制品业",
+        label: "橡胶和塑料制品业"}, {
+        value: "水上运输业",
+        label: "水上运输业"}, {
+        value: "货币金融服务",
+        label: "货币金融服务"}, {
+        value: "黑色金属冶炼和压延加工业",
+        label: "黑色金属冶炼和压延加工业"}, {
+        value: "住宿业",
+        label: "住宿业"}, {
+        value: "燃气生产和供应业",
+        label: "燃气生产和供应业"}, {
+        value: "道路运输业",
+        label: "道路运输业"}, {
+        value: "生态保护和环境治理业",
+        label: "生态保护和环境治理业"}, {
+        value: "纺织业",
+        label: "纺织业"}, {
+        value: "化学纤维制造业",
+        label: "化学纤维制造业"}, {
+        value: "其他制造业",
+        label: "其他制造业"}, {
+        value: "广播、电视、电影和录音制作业",
+        label: "广播、电视、电影和录音制作业"}, {
+        value: "仪器仪表制造业",
+        label: "仪器仪表制造业"}, {
+        value: "皮革、毛皮、羽毛及其制品和制鞋业",
+        label: "皮革、毛皮、羽毛及其制品和制鞋业"}, {
+        value: "造纸和纸制品业",
+        label: "造纸和纸制品业"}, {
+        value: "印刷和记录媒介复制业",
+        label: "印刷和记录媒介复制业"}, {
+        value: "餐饮业",
+        label: "餐饮业"}, {
+        value: "公共设施管理业",
+        label: "公共设施管理业"}, {
+        value: "其他金融业",
+        label: "其他金融业"}, {
+        value: "土地管理业",
+        label: "土地管理业"}, {
+        value: "林业",
+        label: "林业"}, {
+        value: "农业",
+        label: "农业"}, {
+        value: "废弃资源综合利用业",
+        label: "废弃资源综合利用业"}, {
+        value: "畜牧业",
+        label: "畜牧业"}, {
+        value: "文化艺术业",
+        label: "文化艺术业"}, {
+        value: "建筑装饰、装修和其他建筑业",
+        label: "建筑装饰、装修和其他建筑业"}, {
+        value: "黑色金属矿采选业",
+        label: "黑色金属矿采选业"}, {
+        value: "其他采矿业",
+        label: "其他采矿业"}, {
+        value: "机动车、电子产品和日用产品修理业",
+        label: "机动车、电子产品和日用产品修理业"}, {
+        value: "家具制造业",
+        label: "家具制造业"}, {
+        value: "建筑安装业",
+        label: "建筑安装业"}, {
+        value: "其他服务业",
+        label: "其他服务业"}, {
+        value: "社会工作",
+        label: "社会工作"}, {
+        value: "渔业",
+        label: "渔业"}, {
+        value: "体育",
+        label: "体育"}, {
+        value: "居民服务业",
+        label: "居民服务业"}, {
+        value: "邮政业",
+        label: "邮政业"}, {
+        value: "金属制品、机械和设备修理业",
+        label: "金属制品、机械和设备修理业"}, {
+        value: "卫生",
+        label: "卫生"}, {
+        value: "木材加工和木、竹、藤、棕、草制品业",
+        label: "木材加工和木、竹、藤、棕、草制品业"}, {
+        value: "农、林、牧、渔专业及辅助性活动",
+        label: "农、林、牧、渔专业及辅助性活动"}, {
+        value: "非金属矿采选业",
+        label: "非金属矿采选业"}, {
+        value: "租赁业",
+        label: "租赁业"}, {
+        value: "水利管理业",
+        label: "水利管理业"},
+
+
+      ],
+    }
+  },
+  props: {
+    value: {
+      type: String,
+      default: ''
+    },
+  },
+  model: {
+    prop: 'value',
+    event: 'change'
+  },
+  watch:{
+    value(newValue){
+      this.industry=newValue
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src_old/components/pagination.vue b/src_old/components/pagination.vue
new file mode 100644
index 0000000..d90d21b
--- /dev/null
+++ b/src_old/components/pagination.vue
@@ -0,0 +1,74 @@
+<!-- 分页 -->
+<template>
+    <div class="pagination">
+      <el-button type="button" @click="jumpFirstPage" size="mini">首页</el-button>
+          <!-- layout="total,  prev, pager, next, jumper" -->
+          <!-- layout="prev, next"就只显示上一页、下一页 -->
+        <el-pagination
+            background prev-text="上一页" next-text="下一页"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size=page_size
+            layout="prev, next"
+            :total="total"
+            style="display: inline-block;padding-left: 0px;">
+        </el-pagination>
+        <el-button type="button" @click="jumpLastPage"  size="mini">尾页</el-button>
+    </div>
+
+
+
+
+</template>
+
+<script>
+  export default {
+    // 接收外部数据
+    props:{
+        total:{
+            type:Number,
+            default:100 
+        },
+        page_size:{
+            type:Number,
+            default:10
+        },
+    },
+    methods: {
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+      },
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+        // 将页码传给父组件
+        this.$emit('CurrentChange',val)
+      },
+      
+      // 添加首页、尾页跳转方法
+      jumpFirstPage () {
+        this.$refs.pagination.handleCurrentChange(1);
+        this.$emit('handleCurrentChange', 1);
+      },
+      jumpLastPage () {
+          let font = this.$refs.pagination
+          let cpage = Math.ceil(font.total / font.pageSize);
+          font.handleCurrentChange(cpage);
+      },
+    },
+    data() {
+      return {
+        currentPage: 5,
+      };
+    }
+  }
+</script>
+
+
+<style lang="less" scoped>
+.pagination{
+    display:flex;
+    justify-content:center;//左右贴边
+    padding: 40px;
+}
+</style>
\ No newline at end of file
diff --git a/src_old/components/quterComponent.vue b/src_old/components/quterComponent.vue
new file mode 100644
index 0000000..11f0cd4
--- /dev/null
+++ b/src_old/components/quterComponent.vue
@@ -0,0 +1,396 @@
+<template>
+  <div class="el-quarter-picker">
+    <el-popover
+        v-model="visible"
+        :disabled="!canPopover"
+        :tabindex="null"
+        placement="bottom-start"
+        transition="el-zoom-in-top"
+        trigger="click">
+
+      <div class="el-date-picker">
+        <div class="el-picker-panel__body">
+          <div class="el-date-picker__header el-date-picker__header--bordered" style="margin:0px; line-height:30px">
+            <button
+                type="button"
+                @click="clickLast"
+                aria-label="前一年"
+                class="el-picker-panel__icon-btn el-date-picker__prev-btn el-icon-d-arrow-left"></button>
+            <span role="button" class="el-date-picker__header-label" @click="clickYear">{{ title }}</span>
+            <button
+                type="button"
+                @click="clickNext"
+                aria-label="后一年"
+                class="el-picker-panel__icon-btn el-date-picker__next-btn el-icon-d-arrow-right"></button>
+          </div>
+          <div class="el-picker-panel__content" style="margin:0px; width:100%">
+            <table class="el-month-table" style="">
+              <tbody>
+              <tr v-for="line in lineCount" :key="line">
+                <td v-for="index in (line * 4 <= viewList.length ? 4 : viewList.length - (line - 1) * 4)" :key="index" :class="{ today: viewList[(line - 1) * 4 + index - 1].current, current: viewList[(line - 1) * 4 + index - 1].active }">
+                  <div><a class="cell" @click="clickItem(viewList[(line - 1) * 4 + index - 1])">{{ viewList[(line - 1) * 4 + index - 1].label }}</a></div>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+
+      <el-input
+          slot="reference"
+          @change="changeText"
+          @mouseenter.native="mouseEnter"
+          @mouseleave.native="mouseLeave"
+          :placeholder="placeholder"
+          v-model="text"
+          :size="size"
+          :readonly="!canEdit"
+          :disabled="disabled"
+          size="mini">
+        <i slot="prefix" class="el-input__icon el-icon-date"></i>
+        <i slot="suffix" class="el-input__icon el-icon-circle-close" v-show="showClear" style="cursor:pointer" @click.stop="clear"></i>
+      </el-input>
+    </el-popover>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ElQuarterPicker',
+  props: {
+    placeholder: {
+      type: String,
+      default: ''
+    },
+    size: {
+      type: String,
+      default: ''
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    clearable: {
+      type: Boolean,
+      default: true
+    },
+    editable: {
+      type: Boolean,
+      default: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    format: {
+      type: String,
+      default: 'yyyy年第Q季度'
+    },
+    valueFormat: {
+      type: String,
+      default: 'yyyy-qq'
+    },
+    value: {
+      type: String,
+      default: ''
+    }
+  },
+  model: {
+    prop: 'value',
+    event: 'change'
+  },
+  watch: {
+    value(val) {
+      // console.log('change-------', val)
+      this.changeValue(val)
+    },
+    readonly(val) {
+      this.canEdit = !val && this.editable
+      this.canPopover = !this.disabled && !val
+    },
+    editable(val) {
+      this.canEdit = !this.readonly && val
+    },
+    disabled(val) {
+      this.canPopover = !val && !this.readonly
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      showClear: false, // 控制清空按钮展示
+      canEdit: true, // 是否可编辑
+      canPopover: true, // 选择器弹出是否可用
+      text: '', // 文本框值
+      viewType: 1, // 视图类型，1季度，2年度
+      viewYear: 0, // 当前年份
+      viewList: [], // 数据列表
+      lineCount: 0, // 数据行数
+      title: '', // 选择器标题
+      data: [0, 0] // 当前选择年度-季度
+    }
+  },
+  mounted() {
+    // console.log('mounted--------', this.value)
+    this.changeValue(this.value)
+
+    // 设置文本框是否可编辑
+    this.canEdit = !this.readonly && this.editable
+    this.canPopover = !this.disabled && !this.readonly
+
+    // 监听按键(上下左右键可以切换季度)
+    document.onkeydown = (event) => {
+      if (this.visible) {
+        const data = [this.data[0], this.data[1]]
+        if (data[0] < 1 || data[1] < 1) {
+          // 以当前季度为标准
+          const curDate = new Date()
+          data[0] = curDate.getFullYear()
+          data[1] = parseInt(curDate.getMonth() / 3) + 1
+        }
+        if (event.code === 'ArrowLeft') {
+          // 上一个季度
+          if (data[1] === 1) {
+            data[0] = data[0] - 1
+            data[1] = 4
+          } else {
+            data[1] = data[1] - 1
+          }
+        } else if (event.code === 'ArrowRight') {
+          // 下一个季度
+          if (data[1] === 4) {
+            data[0] = data[0] + 1
+            data[1] = 1
+          } else {
+            data[1] = data[1] + 1
+          }
+        } else if (event.code === 'ArrowUp') {
+          // 上一年季度
+          data[0] = data[0] - 1
+        } else if (event.code === 'ArrowDown') {
+          // 下一年季度
+          data[0] = data[0] + 1
+        } else {
+          return
+        }
+
+        // 超过年限的不处理
+        if (data[0] < 1000 || data[0] > 9999) {
+          return
+        }
+        this.data = data
+        this.viewType = 1
+        this.viewYear = data[0]
+        this.$emit('change', this.formatTo(data, this.valueFormat))
+      }
+    }
+  },
+  destroyed() {
+    document.onkeydown = null
+  },
+  methods: {
+    // 季度文本变更
+    changeText() {
+      if (this.checkFormat(this.format, this.text)) {
+        // 设置值
+        this.formatFrom(this.text, this.format)
+        this.$emit('change', this.formatTo(this.data, this.valueFormat))
+      } else {
+        // 输入了无效的格式，还原回原来的值
+        if (this.data[0] < 1 || this.data[1] < 1) {
+          this.text = ''
+        } else {
+          this.text = this.formatTo(this.data, this.format)
+        }
+      }
+      this.visible = false
+    },
+    // 鼠标进入
+    mouseEnter() {
+      if (!this.disabled && !this.readonly && this.clearable && this.text !== '') {
+        this.showClear = true
+      }
+    },
+    // 鼠标离开
+    mouseLeave() {
+      if (!this.disabled && this.clearable) {
+        this.showClear = false
+      }
+    },
+    // 清除季度
+    clear() {
+      this.showClear = false
+      this.visible = false
+      this.$emit('change', '')
+    },
+    // 季度值变更
+    changeValue(val) {
+      this.viewType = 1
+      if (val) {
+        // 反向格式化
+        this.formatFrom(val, this.valueFormat)
+        this.text = this.formatTo(this.data, this.format)
+        this.viewYear = this.data[0]
+      } else {
+        this.text = ''
+        this.data = [0, 0]
+        this.viewYear = new Date().getFullYear()
+      }
+      this.initView()
+    },
+    // 初始化视图数据
+    initView() {
+      const list = []
+      const curDate = new Date()
+      const curYear = curDate.getFullYear()
+      const curQuarter = parseInt(curDate.getMonth() / 3) + 1
+      if (this.viewType === 1) {
+        let index = 0
+        for (const i of '一二三四') {
+          index++
+          const item = { label: '第' + i + '季度', year: this.viewYear, quarter: index, current: false, active: false }
+          if (this.viewYear === curYear && index === curQuarter) {
+            item.current = true
+          } else if (this.viewYear === this.data[0] && index === this.data[1]) {
+            item.active = true
+          }
+          list.push(item)
+        }
+        this.title = this.viewYear + ' 年'
+      } else {
+        const start = parseInt(this.viewYear / 10) * 10
+        this.viewYear = start
+        for (let i = 0; i < 10; i++) {
+          const year = start + i
+          const item = { label: year + '', year: year, current: false, active: false }
+          if (year === curYear) {
+            item.current = true
+          } else if (year === this.data[0]) {
+            item.active = true
+          }
+          list.push(item)
+        }
+        this.title = start + ' 年 - ' + (start + 9) + ' 年'
+      }
+      this.viewList = list
+      this.lineCount = parseInt(list.length / 4)
+      if (list.length % 4 > 0) {
+        this.lineCount++
+      }
+    },
+    // 校验季度格式是否正确
+    checkFormat(pattern, val) {
+      // 格式转成正则表达式
+      let text = ''
+      for (const char of pattern) {
+        const dict = '\\^$.+?*[]{}!'
+        if (dict.indexOf(char) === -1) {
+          text += char
+        } else {
+          text += '\\' + char
+        }
+      }
+      text = text.replace('yyyy', '[1-9]\\d{3}')
+      text = text.replace('qq', '0[1-4]')
+      text = text.replace('q', '[1-4]')
+      text = text.replace('Q', '[一二三四]')
+      text = '^' + text + '$'
+      const patt = new RegExp(text)
+      return patt.test(val)
+    },
+    // 格式化季度到指定格式
+    formatTo(data, pattern) {
+      let text = pattern.replace('yyyy', '' + data[0])
+      text = text.replace('qq', '0' + data[1])
+      text = text.replace('q', '' + data[1])
+      text = text.replace('Q', '一二三四'.substr(data[1] - 1, 1))
+      return text
+    },
+    // 以指定格式解析季度
+    formatFrom(str, pattern) {
+      const year = this.findText(str, pattern, 'yyyy')
+      const quarter = this.findText(str, pattern, ['qq', 'q', 'Q'])
+      this.data = [year, quarter]
+    },
+    // 查找文本数值
+    findText(str, pattern, find) {
+      if (find instanceof Array) {
+        for (const f of find) {
+          const val = this.findText(str, pattern, f)
+          if (val !== -1) {
+            return val
+          }
+        }
+        return -1
+      }
+      const index = pattern.indexOf(find)
+      if (index === -1) {
+        return index
+      }
+      const val = str.substr(index, find.length)
+      if (find === 'Q') {
+        return '一二三四'.indexOf(val) + 1
+      } else {
+        return parseInt(val)
+      }
+    },
+    // 年份点击
+    clickYear() {
+      if (this.viewType !== 1) {
+        return
+      }
+      // 切换年度选择器
+      this.viewType = 2
+      this.initView()
+    },
+    // 季度选择
+    clickItem(item) {
+      // console.log('select--------', item)
+      if (this.viewType === 1) {
+        // 选择季度
+        this.$emit('change', this.formatTo([item.year, item.quarter], this.valueFormat))
+        this.visible = false
+      } else {
+        // 选择年度
+        this.viewType = 1
+        this.viewYear = item.year
+        this.initView()
+      }
+    },
+    // 上一年
+    clickLast() {
+      if (this.viewYear > 1000) {
+        if (this.viewType === 1) {
+          this.viewYear--
+          this.initView()
+        } else {
+          this.viewYear = this.viewYear - 10
+          this.initView()
+        }
+      }
+    },
+    // 下一年
+    clickNext() {
+      if (this.viewYear < 9999) {
+        if (this.viewType === 1) {
+          this.viewYear++
+          this.initView()
+        } else {
+          this.viewYear = this.viewYear + 10
+          this.initView()
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.el-quarter-picker {
+  width: 220px;
+  /* display:flex; */
+  display: inline-block;
+  margin-right: 5px;
+}
+</style>
\ No newline at end of file
diff --git a/src_old/components/region.vue b/src_old/components/region.vue
new file mode 100644
index 0000000..115a8e3
--- /dev/null
+++ b/src_old/components/region.vue
@@ -0,0 +1,348 @@
+<!--目前数据没有详细到市区，所以两点改动：1 chinaMapHidden注释掉了点击事件，2 echarts里的数据切换改为接口固定数据-->
+<template>
+  <div>
+    <div class="echartsGroup">
+      <!-- 返回中国地图 -->
+      <div class="button" v-show="isReturnChina" @click="returnChinaFn()">返回中国地图</div>
+      <!-- echarts 图表 -->
+      <div ref="china_map" style="height: 450px;width:800px"></div>
+    </div>
+  </div>
+</template>
+<script>
+import tmpJson from 'echarts/map/json/china.json'
+import * as echarts from "echarts"
+import 'echarts/map/js/china.js' // 核心文件
+// require('echarts/theme/macarons') 
+export default {
+  props: {
+    newMapData:[]
+  },
+  data() {
+    return {
+      mapData: [//自己做的模拟数据 后续根据业务展示
+        {name: '湖北',value:88},
+        {name: '广东',value:11024},
+        {name: '上海',value:5},
+        {name: '山东',value:15},
+        {name: '湖南',value:14},
+        {name: '重庆',value:0},
+        {name: '四川',value:65},
+        {name: '新疆',value:36},
+        {name: '黑龙江',value:12},
+        {name: '西藏',value:68},
+        {name: '青海',value:31},
+        {name: '内蒙古',value:28},
+        {name: '陕西',value:12},
+        {name: '辽宁',value:88},
+        {name: '云南',value:23},
+      ],
+      provData:[
+        {name:'深圳市',value:99},
+        {name:'深圳市',value:1005},
+        {name:'佛山市',value: 55564}
+      ],
+      guangdong:[  //省份公司的数据
+        {name: '深圳市',value:23,children:['福田','南山','龙华']},
+      ],
+      provinces:{   //数据
+        台湾: 'taiwan',
+        河北: 'hebei',
+        山西: 'shanxi',
+        辽宁: 'liaoning',
+        吉林: 'jilin',
+        黑龙江: 'heilongjiang',
+        江苏: 'jiangsu',
+        浙江: 'zhejiang',
+        安徽: 'anhui',
+        福建: 'fujian',
+        江西: 'jiangxi',
+        山东: 'shandong',
+        河南: 'henan',
+        湖北: 'hubei',
+        湖南: 'hunan',
+        广东: 'guangdong',
+        海南: 'hainan',
+        四川: 'sichuan',
+        贵州: 'guizhou',
+        云南: 'yunnan',
+        陕西: 'shanxi1',
+        甘肃: 'gansu',
+        青海: 'qinghai',
+        新疆: 'xinjiang',
+        广西: 'guangxi',
+        内蒙古: 'neimenggu',
+        宁夏: 'ningxia',
+        西藏: 'xizang',
+        北京: 'beijing',
+        天津: 'tianjin',
+        上海: 'shanghai',
+        重庆: 'chongqing',
+        香港: 'xianggang',
+        澳门: 'aomen'
+      },
+      isReturnChina:true, //是否显示返回中国地图
+      options:null,   //echarts 存数据
+    };
+  },
+  watch:{
+    newMapData(newValue){
+      console.log(1)
+      this.chinaMaprsult('china',newValue)
+    }
+  },
+  mounted() {
+    window.clickRoute= this.clickRoute;
+
+    // this.$nextTick(_=>{
+    //   this.chinaMaprsult('china')
+    //   console.log("mounted调用成功")
+    // })
+        this.chinaMaprsult('china',null)
+  },
+  methods: {
+    // 中国地图点击省份 显示当前省份的详细的地区。
+    chinaMapHidden(chinaMap) {//（调用）
+      console.log("chinaMapHidden调用成功")
+      // let that = this
+      // chinaMap.off('click')//这里解决多次触发点击事件 但是还会执行2次  引用echarts地图，点击各个省份时，点击一个调用两次接口，再点击一次，调用四次接口，再点击调用八次。。。。依次叠加，问题在于，没有将地图上的点击事件清空
+      // chinaMap.on('click',async function(params){
+      //   if (params.name in that.provinces) {
+      //     var tmp=that.provinces[params.name]
+      //     let s = await import('echarts/map/js/province/'+tmp+'.js')
+      //     console.log(s)
+      //     if (s){
+      //       // chinaMap.clear
+      //       let tmpData=[
+      //   {name:'深圳市',value:99},
+      //   {name:'深圳市',value:1005},
+      //   {name:'佛山市',value: 55564}
+      // ]
+      //       that.chinaMaprsult(params.name,tmpData)
+      //     }
+      //   }
+      // })
+    },
+    // 渲染地图
+       chinaMaprsult(name=null,tmpData){
+      console.log("chinaMaprsult调用成功")
+      let _this = this;
+      // console.log(name)
+      name=='china'?this.isReturnChina=false:this.isReturnChina=true;     //省份地图就显示返回按钮
+      let chinaMap = echarts.init(this.$refs.china_map)  //获取dom元素，初始化
+      // let tmpJson=import('echarts/map/json/china.json')
+      console.log(tmpJson)
+      echarts.registerMap('china',tmpJson)
+      var data=this.data
+      this.options = {
+        // tooltip: { // 鼠标移到图里面的浮动提示框
+        //     formatter:function (params) {
+        //         return params.name
+        //     }
+        // },
+        
+        visualMap:  //图例
+            {
+          min: 800,
+          max: 3000,
+          text: ['High', 'Low'],
+          realtime: false,
+          calculable: true,
+          inRange: {
+            color: [ 'lightgreen', 'yellow']
+          }},
+        tooltip: { // 鼠标移到图里面的浮动提示框
+          trigger: 'item',  //数据项图形触发
+          // triggerOn: 'click', //这里根据业务需要给点击事件做跳转,所以不能做悬浮了,如果做悬浮 点击不了文字跳转
+          formatter:
+              '风险数量: {c0}<br />'
+          // function(params){
+          //   console.log(params)
+          //   let dat=params.data
+          //     return params.data
+          //
+          // }
+          //     function(params) {
+          //   var name = params.name
+          //   var toolipData = []
+          //   _this.provinceData.forEach(item=>{
+          //     if(name == item.name){
+          //       toolipData = item.children
+          //     }
+          //   })
+          //   var htmlStr = ''
+          //   toolipData.forEach(item=>{
+          //     htmlStr += `<li class="list-li" name="${item}"><div οnclick="clickRoute()" >${item}</div></li>`
+          //   })
+          //       console.log(toolipData)
+          //       console.log(params.name)
+          //   return `<div class="list-wrap"><div class="list-title">${name}</div><ul class="list-ul">${htmlStr}</ul></div>`
+          // },
+        },
+
+        geo: {
+          map: name , // 拿到对应的地图
+          roam: false,
+          nameProperty:'NAME',
+          label: { // 页面初始化加载的文字
+            normal: {
+              show: true,
+              textStyle: {
+                color: "#ccc", // 页面初始化的地图文字颜色
+                fontSize:10// // 页面初始化的地图文字大小
+              },
+            },
+            // formatter:'{b}: {@score}{c}'
+          },
+
+          itemStyle: { //设置样式
+            // normal:
+            //     {
+            //   borderWidth: .5, //区域边框宽度
+            //   borderColor: 'rgba(119, 156, 255, 1)',
+            //   areaColor: {
+            //     x: 0,
+            //     y: 0,
+            //     x2: 0,
+            //     y2: 1,
+            //     colorStops: [{
+            //       offset: 0,
+            //       color: '#073684' // 0% 处的颜色
+            //     }, {
+            //       offset: 1,
+            //       color: '#061E3D' // 100% 处的颜色
+            //     }],
+            //   },
+            // },
+            // emphasis: { // 移入背景颜色
+            //   // areaColor: '#ff00ff',
+            //   areaColor: '#F9D92E',
+            //   show: true,
+            //   textStyle: {
+            //     color: '#000',
+            //     fontSize: "12px"
+            //   }
+            // },
+          },
+        },
+        dataset:{
+          //老的逻辑，为了根据点击切换市区数据
+          // source: name==='china'?this.mapData:tmpData
+          source:tmpData
+        },
+        series: [
+          {
+            type: "map",
+            geoIndex: 0,
+            itemStyle: {//地图区域的多边形 图形样式
+              normal: {//是图形在默认状态下的样式
+                label: {
+                  show: true,//是否显示标签
+                  textStyle: {
+                    color: "black"
+                  }
+                }
+              },
+              zoom: 5,  //地图缩放比例,默认为1
+              emphasis: {//是图形在高亮状态下的样式,比如在鼠标悬浮或者图例联动高亮时
+                label: { show: true }
+              }
+            },
+            label: {
+              normal: {
+                show: true, //显示省份标签
+                textStyle:{color:"#696969"},//省份标签字体颜色
+              },
+              emphasis: {
+                show: true,
+                textStyle: {
+                }
+              }
+            },
+
+          },
+          {
+            type: 'effectScatter',
+            coordinateSystem: 'geo',
+            rippleEffect: {
+              brushType: 'fill',
+              scale:0
+            },
+            showEffectOn: 'render',
+            label: {
+              lineHeight: 30,
+              normal: {
+                show: true,
+                color: '#081727',
+                position: 'inside',
+                padding:[5,0,0,0],
+                verticalAlign: 'middle',
+                formatter: function(para) {
+                  return '{cnNum|' + para.data.value[2] + '}'
+                  // return para.data.value[2]
+                },
+                rich: {
+                  cnNum: {
+                    fontSize: 16,
+                    color: '#081727',
+                    lineHeight:28,
+                  }
+                }
+              },
+            },
+            symbol: 'roundRect',
+            // symbolRotate: 20,
+            symbolSize: [40,28],
+            data: [],
+            zlevel: 1,
+          }
+        ],
+      }
+      chinaMap.setOption(this.options)
+      console.log(chinaMap.getOption())
+      console.log(echarts.getMap('china'))
+      this.chinaMapHidden(chinaMap)
+    },
+    // 返回中国地图（调用）
+    returnChinaFn(){
+      console.log("returnChinaFn调用成功")
+      this.chinaMaprsult('china');
+    },
+    // 点击跳转页面
+    clickRoute(){
+      console.log("clickRoute调用成功")
+      alert("点击了,做其他操作!")
+      // this.$router.push('/')
+    },
+  }
+}
+</script>
+<style scoped>
+.echartsGroup{
+  width: 500px;
+  height: 500px;
+  position:relative;
+
+}
+.echartsGroup .button{
+  width:100px;
+  height:40px;
+  line-height:40px;
+  text-align:center;
+  border:1px solid #ccc;
+  border-radius: 10px;
+  cursor: pointer;
+  position:absolute;
+  top:10px;
+  left:10px;
+  z-index:99;
+}
+
+.list-ul{
+  list-style: none;
+}
+.list-li{
+  pointer-events: all;
+  cursor: pointer;
+}
+</style>
diff --git a/src_old/components/riskIndexComponent.vue b/src_old/components/riskIndexComponent.vue
new file mode 100644
index 0000000..af05f2c
--- /dev/null
+++ b/src_old/components/riskIndexComponent.vue
@@ -0,0 +1,152 @@
+<template>
+  <div>
+    <div ref="index"  style="width: 1200px; height: 400px;margin-left: 0px;margin-top: 0px;"></div>
+
+  </div>
+
+
+
+</template>
+
+<script>
+import * as echarts from "echarts";
+import http from "@/utils/request";
+
+export default {
+  props: {
+    date:[],
+    result:[],
+    title:String,
+    zoom:{
+      type:Array,
+      default: function () {
+        return []
+      }
+    }
+  },
+  data(){
+    return {
+      //数据库结构映射
+    mapTable:{'个体风险状态':["经营风险","信用风险","流动性风险","市场风险","非流动性"],'风险关联与溢出':["条件在险价值差额","Coplua","协整关系","吸收率"],'市场系统结构':['聚类系数','密度变化','同配性'],
+      '市场波动和趋势':['vixPlus指数','市场受损性']},
+      datazoom:[],
+    state:'个体风险状态'
+    }
+  },
+watch:{
+    title(newValue){
+    this.state=newValue
+    },
+  zoom(newVal){
+    this.datazoom=newVal
+  }
+},
+  mounted() {
+    var that=this
+  http.get('/risk/index/?table='+this.title).then((res)=>{
+    that.date=res.data.date
+    that.result=res.data.result
+    var series=[]
+    let nameLis=[]
+    for (let yaxis in this.result){
+      nameLis.push(this.result[yaxis].name)
+      series.push({
+        data:this.result[yaxis].data,
+        type:'line',
+        name:this.result[yaxis].name
+      })
+    }
+
+    this.initChart(nameLis,series)
+
+  })
+
+
+  },
+
+  methods:{
+    initChart(nameLis,series){
+      /*
+      示例参考如下
+      * https://echarts.apache.org/v4/examples/zh/editor.html?c=line-aqi
+      *
+      * https://cdn.jsdelivr.net/gh/apache/echarts-website@asf-site/examples/data/asset/data/aqi-beijing.json
+      *
+      * */
+      var myChart = echarts.init(this.$refs["index"])
+      let option = {
+        title: {
+          text: this.title,
+          left:'center'
+        },
+        grid:{
+          show:true,
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true,
+          backgroundColor:'#eee'
+        },
+        legend: {
+          top:30,
+          data: nameLis
+        }
+        ,
+        tooltip: {
+          trigger: 'axis'
+        },
+        xAxis: {
+          data: this.date
+        },
+        yAxis: {
+          scale:true,
+          splitLine: {
+            show: false
+          }
+        },
+
+        toolbox: {
+          right: 120,
+          feature: {
+            // dataZoom: {
+            //   yAxisIndex: 'none'
+            // },
+            dataView:{
+              show:true,
+              title: '查看数据',
+            },
+            restore: {},
+            saveAsImage: {}
+          }
+        },
+        //以下是时间轴
+        dataZoom: [{
+          //也应该是动态的
+          startValue: '2022-07-01'
+        }, {
+          type: 'inside'
+        }],
+        //以上是时间轴
+
+        series: series,
+
+      }
+      myChart.setOption(option);
+      myChart.dispatchAction({
+        type: 'dataZoom',
+        batch: [{
+          // 第一个 dataZoom 组件
+          start: this.datazoom[0],
+          end: this.datazoom[1]
+        }]
+      })
+    }
+
+  },
+
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src_old/components/systemRiskComponent.vue b/src_old/components/systemRiskComponent.vue
new file mode 100644
index 0000000..c3a3aa7
--- /dev/null
+++ b/src_old/components/systemRiskComponent.vue
@@ -0,0 +1,389 @@
+<template>
+<div>
+  <div style="display: flex;">
+    <div  ref="whole risk"  style=" float: left;width: 1200px; height: 350px;margin-left: 15px;margin-top: 0px;margin-right: 0px"></div>
+    <div  ref="future"  style=" float: left; width: 50px; height: 350px;margin-left: -127px;margin-top: 0px;"></div>
+
+  </div>
+  <div class="warning-component">
+    <div class="warning-dates">
+      <div class="date-item">前日：<span>{{ prevDayRisk }}</span></div>
+      <div class="date-item">昨日：<span>{{ yesterdayRisk }}</span></div>
+      <div class="date-item">今日：<span>{{ todayRisk }}</span></div>
+      <div class="date-item">明日：<span>{{ tomorrowRisk }}</span></div>
+      <div class="warning-recent">
+        最近预警：<span>{{ warningRisk }}</span>
+
+      </div>
+    </div>
+  </div>
+</div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import http from "@/utils/request";
+
+export default {
+
+  data(){
+    return {
+      yMax:2,
+      yMin:0,
+      prevDayRisk:'',
+      yesterdayRisk:'',
+      todayRisk:'',
+      tomorrowRisk:'',
+      warningRisk:'',
+      riskData:[],
+      markLine: [],
+      markPoint: [],
+      markArea:[],
+      future:[],
+      datazoom:[]
+    }
+  },
+props:{
+    zoom:{
+      type:Array,
+      default: function () {
+        return []
+      }
+    }
+},
+  watch:{
+    zoom(newVal){
+      this.datazoom=newVal
+    },
+    yMax(newVal){
+      console.log(newVal)
+    }
+
+  },
+  mounted() {
+    http.get('/risk/whole/').then((res)=>{
+      this.riskData=res.data.wholerisk
+      this.markPoint=res.data.markpoint
+      this.markLine=res.data.markline
+      this.markArea=res.data.markarea
+      this.prevDayRisk=res.data.detail[0]
+      this.yesterdayRisk=res.data.detail[1]
+      this.todayRisk=res.data.detail[2]
+      this.tomorrowRisk=res.data.detail[3]
+      this.warningRisk=res.data.detail[4]
+      this.future=res.data.future
+      // console.log(this.riskData,this.markLine,this.markPoint[0])
+      this.initChart()
+    })
+
+    // this.initChart(this.dat)
+
+  },
+
+  methods:{
+    initChart(){
+      /*
+      示例参考如下
+      * https://echarts.apache.org/v4/examples/zh/editor.html?c=line-aqi
+      *
+      * https://cdn.jsdelivr.net/gh/apache/echarts-website@asf-site/examples/data/asset/data/aqi-beijing.json
+      *
+      * */
+      let data=this.riskData
+      const future=this.future
+      var myChart = echarts.init(this.$refs["whole risk"])
+      var myChartFuture= echarts.init(this.$refs["future"])
+      let option = {
+        title: {
+          text: '系统性风险指数',
+          left:'center'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        xAxis: {
+          axisLabel:{
+            fontSize:5
+          },
+          data: data.map(function (item) {
+            return item[0];
+          })
+        },
+        yAxis: {
+          scale:true,
+          splitLine: {
+            show: false
+          }
+        },
+
+        toolbox: {
+          right: 120,
+          feature: {
+            // dataZoom: {
+            //   yAxisIndex: 'none'
+            // },
+            dataView:{
+              show:true,
+              title: '查看数据',
+            },
+            restore: {},
+            saveAsImage: {}
+          }
+        },
+        //以下是时间轴
+        dataZoom: [{
+          //也应该是动态的
+          startValue: '2022-07-01'
+        }, {
+          type: 'inside'
+        }],
+        //以上是时间轴
+        visualMap: {
+          top: 10,
+          right: 0,
+          precision:2,
+          pieces: [
+            {
+              gt: 0,
+              lte: parseFloat(this.markLine[0]),
+              color: '#096'
+            },
+            {
+              gt: parseFloat(this.markLine[0]),
+              lte: parseFloat(this.markLine[1]),
+              color: '#ffde33'
+            },
+            //   {
+            //   gt: 100,
+            //   lte: 150,
+            //   color: '#ff9933'
+            // },
+            //   {
+            //   gt: 150,
+            //   lte: 200,
+            //   color: '#cc0033'
+            // },
+            //   {
+            //   gt: 200,
+            //   lte: 300,
+            //   color: '#660099'
+            // },
+            //   {
+            //   gt: 300,
+            //   color: '#7e0023'
+            // }
+          ],
+          outOfRange: {
+            color: '#fa0744'
+          }
+        },
+        series: {
+          name: '系统性风险指数',
+          type: 'line',
+          data: data.map(function (item) {
+            return item[1];
+          }),
+
+          //标记极端值
+          markPoint:{
+            symbol:'circle',
+            symbolSize:10,
+            data: [{
+              itemStyle:{
+                //标注的颜色
+                color: {
+                  type: 'radial',
+                  x: 0.5,
+                  y: 0.5,
+                  r: 0.5,
+                  colorStops: [{
+                    offset: 0, color: 'purple' // 0% 处的颜色
+                  }, {
+                    offset: 1, color: '#258ddc' // 100% 处的颜色
+                  }],
+                  global: false // 缺省为 false
+                }
+              },
+              //x轴的index和y值
+              coord: this.markPoint[0] // 其中 5 表示 xAxis.data[5]，即 '33' 这个元素。
+              // coord: ['5', 33.4] // 其中 '5' 表示 xAxis.data中的 '5' 这个元素。
+              // 注意，使用这种方式时，xAxis.data 不能写成 [number, number, ...]
+              // 而只能写成 [string, string, ...]
+            }]
+
+          },
+          markLine: {
+            //阈值标记线  这里应该是动态的
+            silent: true,
+            symbol:'none',
+            label:{ position:'middle',},
+
+            lineStyle:{
+              color:'black'
+
+            },
+            data: [{
+              yAxis: this.markLine[0]
+            }, {
+              yAxis:this.markLine[1]
+            },
+
+              //   {
+              //   yAxis: 200
+              // }, {
+              //   yAxis: 300
+              // }
+            ]
+          },
+          markArea:{
+            label: { // 分界线上的文字标签
+              // position: 'end',
+              formatter: '预测值'
+            },
+            data:[[{
+              xAxis:this.markArea[0]},
+              {
+                xAxis:this.markArea[1]
+                // x:'100%'
+              },
+            ]]
+
+          }
+        }
+      }
+      let opt2={
+        tooltip: {
+          trigger: 'item',
+        },
+        grid:
+
+          {backgroundColor: '#eeb0ae',
+            left:'0%',
+            show:true,
+            zlevel:0,
+          }
+        ,
+        xAxis:
+          {
+            data:[{value:'未来一个月'}],
+            axisLabel:{
+              fontSize:5
+            }
+            // gridIndex: 0,
+          },
+        yAxis: {
+          min:0.8,
+          max:2,
+          type: 'value',
+          show:false,
+
+          // gridIndex: 1
+        },
+        series: {
+          type: 'boxplot',
+          boxWidth : [2, 10],
+          data:[{value: this.future,} ],
+          // 确保箱型图显示在折线图之后
+          // zlevel: 3,
+          // 箱型图的x轴数据应对应未来一个月的日期，由于这些日期没有具体值，我们使用null，ECharts会自动处
+          // ... 箱型图其他配置，如颜色、样式等
+          markArea:{
+            label: { // 分界线上的文字标签
+              // position: 'end',
+              formatter: '预测值'
+            },
+            itemStyle:{
+              color:'yellow'
+            }
+            // data: [[  {
+            //   name: '平均值到最大值',
+            //   type: 'average'
+            // },
+            //   {
+            //     type: 'max'
+            //   }]]
+          },
+          tooltip: {
+            formatter: function (param) {
+              return [
+                // 'Experiment ' + param.name + ': ',
+                '最大值: ' + future[4],
+                '均值+标准差: ' + future[3],
+                '中位数: ' +future[2],
+                '均值-标准差: ' + future[1],
+                '最小值: ' + future[0]
+              ].join('<br/>');
+            }
+          }
+        }
+      }
+      myChart.setOption(option);
+      myChartFuture.setOption(opt2)
+      const that=this
+      myChart.on('datazoom', function (params) {
+        // Y轴最大值
+        this.yMax = myChart.getModel().getComponent('yAxis').axis.scale._extent[1];
+        // Y轴最小值
+        this.yMin = myChart.getModel().getComponent('yAxis').axis.scale._extent[0];
+
+        that.$nextTick(() => {
+          // 设置 myChartFuture 的 y 轴值
+          myChartFuture.setOption({
+            yAxis: {
+              min: this.yMin,
+              max: this.yMax
+            }
+          });
+        });
+
+        // that.$emit("datazoom",[params.start,params.end])
+
+      });
+
+      // myChart.dispatchAction({
+      //   type: 'dataZoom',
+      //   batch: [{
+      //     // 第一个 dataZoom 组件
+      //     start: this.datazoom[0],
+      //     end: this.datazoom[1]
+      //   }]
+      // })
+
+    }
+
+  },
+
+}
+</script>
+
+<style scoped>
+.warning-component {
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  padding: 10px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  max-width: 100%;
+  text-align: center;
+
+  margin: auto;
+}
+
+.warning-dates {
+  display: flex;
+  justify-content: space-between;
+//margin-bottom: 10px;
+}
+
+.date-item {
+  margin: 0 10px;
+  font-weight: bold;
+}
+
+.warning-recent {
+  color: #ff4d4f;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src_old/components/systemRiskFuture.vue b/src_old/components/systemRiskFuture.vue
new file mode 100644
index 0000000..5155002
--- /dev/null
+++ b/src_old/components/systemRiskFuture.vue
@@ -0,0 +1,112 @@
+<template>
+<div>
+  <el-carousel :interval="5000" arrow="always" height="380px" :autoplay="false" indicator-position="outside" style="margin-top: 9px">
+    <el-carousel-item v-for="item in 8" :key="item">
+<!--      <h3 class="medium">{{ item }}</h3>-->
+<!--      <el-button type="mini" icon="el-icon-arrow-left" circle style="margin: 3px" @click="sendMessage"> </el-button>-->
+      <div ref="chartContainer" style="width:1150px; height: 330px;margin: 1px"></div>
+    </el-carousel-item>
+  </el-carousel>
+</div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import http from "@/utils/request";
+export default {
+  name: "systemRiskFuture",
+  data(){
+    return{
+      date:[],
+      rate:[],
+      macro:[],
+      montary:[],
+      income:[],
+      investment:[],
+      loan:[],
+      lever:[],
+      other:[],
+      whole:[],
+      title:['利率','宏观指标','货币','收入和融资','银行理财','信贷','整体杠杆','其他']
+    }
+  },
+  mounted() {
+    this.initGraph()
+
+  },
+  methods:{
+    sendMessage(){
+      this.$emit('transmit', 'systemRiskComponent')
+
+    },
+    initGraph(){
+      http.get('/risk/future_risk/').then((res)=>{
+        this.date=res.data.date
+        this.rate=res.data.rate
+        this.macro=res.data.macro
+        this.montary=res.data.montary
+        this.income=res.data.income
+        this.investment=res.data.investment
+        this.loan=res.data.loan
+        this.lever=res.data.lever
+        this.other=res.data.other
+        this.whole.push(this.rate)
+        this.whole.push(this.macro)
+        this.whole.push(this.montary)
+        this.whole.push(this.income)
+        this.whole.push(this.investment)
+        this.whole.push(this.loan)
+        this.whole.push(this.lever)
+        this.whole.push(this.other)
+      }).then(()=>{
+        for(let i = 0; i < 8; i++) {
+        let echart = echarts.init(this.$refs.chartContainer[i])
+
+        const option = {
+          title:{text:this.title[i],
+          left:'center'
+          },
+          tooltip: {
+            trigger: 'axis'
+          },
+            legend: {
+              top:30,
+
+            },
+          xAxis: {
+            type: 'category',
+            data: this.date
+          },
+          yAxis: {
+            type: 'value'
+          },
+          series: this.whole[i]
+        };
+        echart.setOption(option)
+      }}
+
+      )
+
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+.el-carousel__item h3 {
+  color: #475669;
+  font-size: 18px;
+  opacity: 0.75;
+  line-height: 300px;
+  margin: 0;
+}
+
+.el-carousel__item:nth-child(2n) {
+  background-color: #d3dce6;
+}
+
+.el-carousel__item:nth-child(2n+1) {
+  background-color: #d3dce6;
+}
+</style>
\ No newline at end of file
diff --git a/src_old/config/drag.js b/src_old/config/drag.js
new file mode 100644
index 0000000..2e9f20b
--- /dev/null
+++ b/src_old/config/drag.js
@@ -0,0 +1,54 @@
+import Vue from 'vue';
+//使用Vue.directive()定义一个全局指令
+//1.参数一：指令的名称，定义时指令前面不需要写v-
+//2.参数二：是一个对象，该对象中有相关的操作函数
+//3.在调用的时候必须写v-
+const drag = Vue.directive('drag', {
+  //1.指令绑定到元素上回立刻执行bind函数，只执行一次
+  //2.每个函数中第一个参数永远是el，表示绑定指令的元素，el参数是原生js对象
+  //3.通过el.focus()是无法获取焦点的，因为只有插入DOM后才生效
+  bind: function (el) {
+    el.style.cursor = "move"; //鼠标样式变move样式
+  },
+  //inserted表示一个元素，插入到DOM中会执行inserted函数，只触发一次
+  inserted: function (el) {
+    el.onmousedown = function (e) {
+      var distX = e.pageX - el.offsetLeft;
+      var distY = e.pageY - el.offsetTop;
+      console.log("元素本身的高：" + el.clientHeight + ",元素本身的宽：" + el.clientWidth)
+      
+      if (e.preventDefault) {
+        e.preventDefault();
+       } else{
+        e.returnValue=false;
+       };//解决快速拖动滞后问题
+
+      document.onmousemove = function (e) {
+
+        // 用鼠标的位置减去鼠标相对元素的位置，得到元素的位置
+        let left = e.clientX - distX;
+        let top = e.clientY - distY;
+
+        if (left <= 0) {
+          left = 5; //设置成5是为了不离边缘太近
+        } else if (left > document.documentElement.clientWidth - el.clientWidth) {
+          //document.documentElement.clientWidth 屏幕的可视宽度
+          left = document.documentElement.clientWidth - el.clientWidth - 5
+        }
+        if (top <= 0) {
+          top = 5;
+        } else if (top > document.documentElement.clientHeight - el.clientHeight) {
+          top = document.documentElement.clientHeight - el.clientHeight - 5
+        }
+        el.style.left = left + 'px';
+        el.style.top = top + 'px';
+      }
+      document.onmouseup = function () {
+        document.onmousemove = document.onmouseup = null;
+      }
+    }
+  },
+  //当VNode更新的时候会执行updated，可以触发多次
+  updated: function (el) {}
+})
+export default drag;
diff --git a/src_old/libs/rem.js b/src_old/libs/rem.js
new file mode 100644
index 0000000..9058a86
--- /dev/null
+++ b/src_old/libs/rem.js
@@ -0,0 +1,58 @@
+class DevicePixelRatio {
+    constructor() {
+      // this.flag = false;
+    }
+    // 获取系统类型
+    _getSystem() {
+      // let flag = false;
+      var agent = navigator.userAgent.toLowerCase();
+      //		var isMac = /macintosh|mac os x/i.test(navigator.userAgent);
+      //		if(isMac) {
+      //			return false;
+      //		}
+      // 现只针对windows处理，其它系统暂无该情况，如有，继续在此添加
+      if (agent.indexOf('windows') >= 0) {
+        return true;
+      }
+    }
+    // 获取页面缩放比例
+    //	_getDevicePixelRatio() {
+    //		let t = this;
+    //	}
+    // 监听方法兼容写法
+    _addHandler(element, type, handler) {
+      if (element.addEventListener) {
+        element.addEventListener(type, handler, false);
+      } else if (element.attachEvent) {
+        element.attachEvent('on' + type, handler);
+      } else {
+        element['on' + type] = handler;
+      }
+    }
+    // 校正浏览器缩放比例
+    _correct() {
+      let t = this;
+      // 页面devicePixelRatio（设备像素比例）变化后，计算页面body标签zoom修改其大小，来抵消devicePixelRatio带来的变化。
+      document.getElementsByTagName('body')[0].style.zoom = 1.2 / window.devicePixelRatio;
+    //   修改这个代码可以调整显示大小：参考代码是1/……style.zoom = 1.2 / window.devicePixelRatio; 参考链接：https://blog.csdn.net/qq_39548550/article/details/127664450
+    }
+    // 监听页面缩放
+    _watch() {
+      let t = this;
+      t._addHandler(window, 'resize', function() { // 注意这个方法是解决全局有两个window.resize
+        // 重新校正
+        t._correct()
+      })
+    }
+    // 初始化页面比例
+    init() {
+      let t = this;
+      if (t._getSystem()) { // 判断设备，目前只在windows系统下校正浏览器缩放比例
+        // 初始化页面校正浏览器缩放比例
+        t._correct();
+        // 开启监听页面缩放
+        t._watch();
+      }
+    }
+  }
+  export default DevicePixelRatio;
\ No newline at end of file
diff --git a/src_old/main.js b/src_old/main.js
new file mode 100644
index 0000000..47687b2
--- /dev/null
+++ b/src_old/main.js
@@ -0,0 +1,37 @@
+import Vue from 'vue'
+import App from './App.vue'
+import ElementUI from 'element-ui';//全局引入
+// import {Row,Button} from 'element-ui';//按需引入
+import 'element-ui/lib/theme-chalk/index.css';
+import router from './router'
+import store from './store'
+// import axios from 'axios'
+import drag from '@/config/drag';//弹窗可以拖拽
+
+Vue.config.productionTip = false
+Vue.use(ElementUI);//全局引入
+// axios.defaults.baseURL = 'http://61.240.140.173:8000/proxy_url'
+
+//  Vue.use(Row)//按需引入
+//  Vue.use(Button)//按需引入
+
+// 5以上的echarts不用引入，4要引入
+// import * as echarts from 'echarts'
+
+import   *  as echarts from "echarts";
+Vue.prototype.$echarts = echarts;
+
+
+// 将自动注册所有组件为全局组件
+import dataV from '@jiaminghi/data-view'
+Vue.use(dataV)
+
+
+
+new Vue({
+  router,
+  store,
+  render: h => h(App),
+}).$mount('#app')
+
+
diff --git a/src_old/plugins/debug/debug.js b/src_old/plugins/debug/debug.js
new file mode 100644
index 0000000..57d37c1
--- /dev/null
+++ b/src_old/plugins/debug/debug.js
@@ -0,0 +1,171 @@
+// use this to isolate the scope
+(function () {
+
+    if(!$axure.document.configuration.showConsole) { return; }
+
+    $(document).ready(function () {
+        $axure.player.createPluginHost({
+            id: 'debugHost',
+            context: 'inspect',
+            title: 'Console',
+            gid: 3
+        });
+
+        generateDebug();
+
+        $('#variablesClearLink').click(clearvars_click);
+        $('#traceClear').click(cleartrace_click);
+        $('#traceToggle').click(stoptrace_click);
+        $('#traceStart').click(starttrace_click);
+        $('#traceClear').hide();
+        $('#traceToggle').hide();
+
+        $('#closeConsole').click(close);
+
+        var currentStack= [];
+        var finishedStack = [];
+
+        $axure.messageCenter.addMessageListener(function (message, data) {
+            if(message == 'axCompositeEventMessage') {
+                for(var i = 0; i < data.length; i++) {
+                    processMessages(data[i].message, data[i].data);
+                }
+            } else processMessages(message, data);
+        });
+
+        var processMessages = function(message, data) {
+            if(message == 'globalVariableValues') {
+                $('#variablesDiv').empty();
+                for(var key in data) {
+                    var value = data[key] == '' ? '(blank)' : data[key];
+                    $('#variablesDiv').append('<div class="variableList"><div class="variableName">' + key + '</div><div class="variableValue">' + value + '</div></div>');
+                }
+            } else if(message == 'axEvent') {
+                var addToStack = "<div class='axEventBlock'>";
+                addToStack += "<div class='axEventContainer'>";
+                addToStack += "    <div class='axTime'>" + new Date().toLocaleTimeString() + "</div>";
+                addToStack += "    <div class='axEvent'>" + data.event.description + ": </div>";
+                addToStack += "    <div class='axLabel'>" + data.label + " (" + data.type + ")</div>";
+                addToStack += "</div>";
+
+                currentStack.push(addToStack);
+            } else if (message == 'axEventComplete') {
+                currentStack[currentStack.length - 1] += "</div>";
+                finishedStack.push(currentStack.pop());
+                if(currentStack.length == 0) {
+                    $('#traceEmptyState').hide();
+                    $('#traceClear').show();
+                    $('#traceToggle').show();
+
+                    for(var i = finishedStack.length - 1; i >= 0; i--) {
+                        if($('#traceDiv').children().length > 99) $('#traceDiv').children().last().remove();
+                        $('#traceDiv').prepend(finishedStack[i]);
+                    }
+                    finishedStack = [];
+                }
+            } else if (message == 'axCase') {
+                //var addToStack = "<div class='axCaseContainer' style='background-color: #" + data.color + "'>";
+                var addToStack = "<div class='axCaseContainer'>";
+                addToStack += "    <div class='axCaseItem'>" + data.item + "</div>";
+                if (data.description) { addToStack += "    <div class='axCaseDescription' title='" + data.description + "'>" + data.description + "</div>" };
+                addToStack += "</div>";
+
+                currentStack[currentStack.length - 1] += addToStack;
+            } else if (message == 'axAction') {
+                var addToStack = "<div class='axActionContainer'>";
+                addToStack += "    <div class='axActionItem'>" + data.name + "</div>";
+                //addToStack += "    <div class='axActionItem'>" + data.item + "</div>";
+                //if (data.description) { addToStack += "    <div class='axActionDescription' title='" + data.description + "'>" + data.description + "</div>" };
+                addToStack += "</div>";
+
+                currentStack[currentStack.length - 1] += addToStack;
+            } else if (message == 'axInfo') {
+                var addToStack = "<div class='axInfoContainer'>";
+                addToStack += "    <div class='axInfoItem'>" + data.item + "</div>";
+                if (data.description) { addToStack += "    <div class='axInfoDescription' title='" + data.longDescription + "'>" + data.description + "</div>" };
+                addToStack += "</div>";
+
+                currentStack[currentStack.length - 1] += addToStack;
+            }
+        }
+
+        // bind to the page load
+        $axure.page.bind('load.debug', function () {
+            var traceStr = $axure.player.getHashStringVar(TRACE_VAR_NAME);
+            if (traceStr.length > 0) $axure.messageCenter.setState("isTracing", true);
+            else $axure.messageCenter.setState("isTracing", false);
+            $axure.messageCenter.postMessage('getGlobalVariables', '');
+
+            return false;
+        });
+
+        function clearvars_click(event) {
+            $axure.messageCenter.postMessage('resetGlobalVariables', '');
+        }
+
+        function close() {
+            $axure.player.pluginClose("debugHost");
+        }
+
+        function cleartrace_click(event) {
+            $('#traceDiv').html('');
+        }
+
+        function starttrace_click(event) {
+            $axure.messageCenter.setState("isTracing", true);
+            //$('#traceDiv').html('');
+            $('#traceEmptyState').hide();
+            $('#traceClear').show();
+            $('#traceToggle').text('Stop Trace');
+            $('#traceToggle').off("click");
+            $('#traceToggle').click(stoptrace_click);
+            $('#traceToggle').show();
+            console.log("starting trace");
+            $axure.player.setVarInCurrentUrlHash(TRACE_VAR_NAME, 1);
+        }
+
+        function stoptrace_click(event) {
+            $axure.messageCenter.setState("isTracing", false);
+            $('#traceDiv').prepend('<div class="tracePausedNotification">Trace Paused<div>');
+            $('#traceToggle').text('Restart Trace');
+            $('#traceToggle').off("click");
+            $('#traceToggle').click(starttrace_click);
+            console.log("stopping trace");
+            $axure.player.deleteVarFromCurrentUrlHash(TRACE_VAR_NAME);
+        }
+    });
+
+    function generateDebug() {
+        var pageNotesUi = "<div id='debugHeader'>";
+        pageNotesUi += "<div id='debugToolbar'>";
+        pageNotesUi += "<div id='consoleTitle' class='pluginNameHeader'>Console</div>";
+
+        pageNotesUi += "</div>";
+        pageNotesUi += "</div>";
+
+        pageNotesUi += "<div id='variablesContainer' style='max-height:300px; overflow-y:auto'>";
+        pageNotesUi += "<div id='variablesTitle' class='sectionTitle'>Variables</div>";
+        pageNotesUi += "<a id='variablesClearLink' class='traceOption'>Reset Variables</a>";
+        pageNotesUi += "<div id='variablesDiv'></div></div>";
+        pageNotesUi += "<div id='traceContainer'>";
+
+        pageNotesUi += "<div id='traceHeader'>";
+        pageNotesUi += "<span class='sectionTitle'>Trace</span><a id='traceClear' class='traceOption'>Clear Trace</a><a id='traceToggle' class='traceOption'>Stop Trace</a>";
+        pageNotesUi += "</div>";
+        pageNotesUi += "</div>";
+        pageNotesUi += "<div id='debugScrollContainer'>";
+        pageNotesUi += "<div id='debugContainer'>";
+
+
+        pageNotesUi += "<div id='traceEmptyState'>";
+        pageNotesUi += "<div class='startInstructions'>Click the button below to start recording interactions as you click through the prototype.</div>";
+        pageNotesUi += "<div id='traceStart' class='startButton'>Start Trace</div>";
+        pageNotesUi += "</div>";
+        pageNotesUi += "<div id='traceDiv'></div></div>";
+        pageNotesUi += "</div></div>";
+
+        $('#debugHost').html(pageNotesUi);
+        $('#traceEmptyState').show();
+    }
+
+})();   
\ No newline at end of file
diff --git a/src_old/plugins/debug/styles/debug.css b/src_old/plugins/debug/styles/debug.css
new file mode 100644
index 0000000..a478293
--- /dev/null
+++ b/src_old/plugins/debug/styles/debug.css
@@ -0,0 +1,265 @@
+#debugHost {
+    display: flex;
+    flex-direction: column;
+    font-size: 13px;
+    color: #4a4a4a;
+    height: 100%;
+}
+
+#debugHostBtn {
+    order: 4;
+}
+
+#debugHostBtn a {
+    background: url('images/console_panel_on.svg') no-repeat center center, linear-gradient(transparent, transparent);
+}
+
+#debugHostBtn a.selected, #debugHostBtn a.selected:hover {
+    background: url('images/console_panel_off.svg') no-repeat center center, linear-gradient(transparent, transparent);
+}
+
+#debugToolbar {
+    margin-left: 8px;
+}
+
+#variablesClearLink {
+    display: inline-block;
+    margin-bottom: 15px;
+}
+
+#variablesClearLink:hover {
+    color: #0a6cd6;
+}
+
+#traceClearLink {
+    display: inline-block;
+    margin-bottom: 15px;
+}
+
+#traceClearLink:hover {
+    color: #0a6cd6;
+}
+
+#debugScrollContainer 
+{
+    overflow: auto;
+    width: 100%;
+    -webkit-overflow-scrolling: touch;
+    flex: 1;
+}
+
+#debugContainer {
+    padding: 10px 0px 10px 0px;
+}
+
+#consoleTitle {
+    clear: right;
+    margin: 12px 0px;
+}
+
+.variableName
+{
+	font-weight: bold;
+}
+
+.variableDiv
+{
+    margin-bottom: 20px;
+    line-height: 16px;
+
+}
+
+#variablesDiv
+{
+    clear: right;
+}
+
+#variablesContainer {
+    border-bottom: solid 1px #e7e7e7;
+    padding: 0px 10px 12px 10px;
+}
+
+#traceContainer {
+    margin-bottom: 5px;
+    padding: 15px 10px 0px 10px;
+}
+
+#variablesTitle {
+    margin-bottom: 9px;
+}
+
+.sectionTitle {
+    font-size: 11px;
+    color: #2c2c2c;
+    display: inline-block;
+}
+
+.debugToolbarButton 
+{
+	font-size: 1em;
+	color: #069;
+}
+
+.axEventBlock {
+    display: inline-block;
+    width: 100%;
+    margin: 5px 0px 5px 0px;
+    line-height: 21px;
+    border-bottom: solid 5px #e7e7e7;
+}
+
+.axEventContainer {
+    background-color: #e7e7e7;
+    padding: 0px 10px 0px 10px;
+}
+
+.axTime {
+    margin: 0px 0px 0px 5px;
+    font-size: 10px;
+    color: #575757;
+    display: inline-block;
+    float: right;
+}
+
+.axLabel {
+    display: inline-block;
+}
+
+.axEvent {
+    margin: 0px 0px 2px 0px;    
+    font-size: 15px;
+    font-weight: bold;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.axCaseContainer, .axActionContainer, .axInfoContainer {
+    justify-content: space-between;
+    padding: 0px 10px 0px 10px;
+}
+    .axCaseContainer {
+        border-top: solid 2px #e7e7e7;
+        /*background-color: #47b6b5;*/
+        background-color: #e7e7e7;
+        /*color: #ffffff;*/
+    }
+    .axActionContainer {
+        border-top: solid 3px #e7e7e7;
+    }
+    .axInfoContainer {
+        border-top: solid 1px #e7e7e7;
+    }
+
+.axCaseItem, .axActionItem, .axInfoItem {
+    overflow: hidden;
+    text-overflow: ellipsis; 
+}
+    .axCaseItem {
+        font-size: 15px;
+        font-weight: bold;
+    }
+    .axActionItem {
+        font-weight: bold;
+    }
+    .axInfoItem {
+        color: #8c8c8c;
+    }
+
+.axCaseDescription {
+    flex: 5 0 33%;
+    margin-left: 10px;
+    text-align: right;
+}
+/*.axActionDescription, .axInfoDescription {
+    flex: 5 0 33%;
+    margin-left: 10px;
+    text-align: right;
+}*/
+    .axCaseDescription, .axActionDescription {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    .axInfoDescription, .axActionDescription {
+        color: #8c8c8c;
+        font-size: 11px;
+    }
+
+.variableName {
+    width: 55%;
+    line-height: 0.92;
+    text-align: left;
+    color: #0891b3;
+    display: inline-block;
+    word-wrap: break-word;
+    vertical-align: top;
+}
+
+.variableValue {
+    width: 45%;
+    line-height: 0.92;
+    text-align: right;
+    color: #373d48;
+    display: inline-block;
+    word-wrap: break-word;
+}
+
+.traceEvent {
+    border-bottom: solid 1px #e7e7e7;
+}
+
+.tracePausedNotification {
+    height: 25px;
+    /*background-color: #e7e7e7;*/
+    border-radius: 5px;
+    line-height: 25px;
+    margin: 5px 10px;
+    text-align: center
+}
+
+#traceEmptyState.emptyStateContainer {
+    margin-top: 0px;
+}
+
+.variableList{
+    width: 100%;
+    margin-bottom: 4px;
+}
+
+.traceOption {
+    margin-left: 11px;
+    height: 16px;
+    float: right;
+    font-size: 12px;
+    font-style: italic;
+    line-height: 1.45;
+    text-align: right;
+    color: #8c8c8c;
+    text-decoration: underline;
+    display: inline-block;
+}
+
+.startInstructions {
+    margin: auto;
+    width: 179px;
+    font-size: 11px;
+    text-align: center;
+    color: #666666;
+}
+
+.startButton {
+    margin: auto;
+    margin-top: 10px;
+    width: 181px;
+    height: 24px;
+    border-radius: 2px;
+    border: solid 1px #008fe0;
+    text-align: center;
+    line-height: 24px;
+    color: #008fe0;
+    cursor: pointer;
+}
+
+.debugLinksContainer {
+    text-align: right;
+}
\ No newline at end of file
diff --git a/src_old/plugins/debug/styles/images/console_panel_off.svg b/src_old/plugins/debug/styles/images/console_panel_off.svg
new file mode 100644
index 0000000..904e7b2
--- /dev/null
+++ b/src_old/plugins/debug/styles/images/console_panel_off.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+    <path fill="#008DCB" fill-rule="evenodd" d="M14 2.5l-2 1V2H2v12h12v1a1 1 0 0 1-1 1H1a1 1 0 0 1-1-1V1a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v1.5zm-2.981 3.702c.78-1.06 1.407-1.803 1.882-2.23.475-.428.938-.641 1.389-.641.54 0 .913.184 1.118.553.11.192.164.424.164.698 0 .28-.113.536-.339.769a1.1 1.1 0 0 1-.82.348c-.198 0-.422-.075-.672-.225-.25-.15-.439-.226-.569-.226-.253 0-.494.13-.723.39-.229.26-.623.81-1.184 1.65l.195 1.026c.102.526.188.959.256 1.297.069.338.144.651.226.938.11.397.219.684.328.862.11.177.27.266.482.266.191 0 .424-.14.697-.42.15-.15.38-.427.687-.83l.43.297a8.113 8.113 0 0 1-1.409 1.733c-.578.546-1.143.82-1.697.82-.465 0-.848-.192-1.148-.574-.171-.205-.322-.486-.452-.841a11.32 11.32 0 0 1-.282-.98 24.82 24.82 0 0 0-.23-.866l-.144.246c-.677 1.162-1.172 1.918-1.487 2.266-.471.52-1.018.78-1.64.78-.356 0-.665-.122-.928-.364a1.172 1.172 0 0 1-.395-.898c0-.294.097-.565.292-.815.195-.25.467-.374.815-.374.212 0 .474.075.785.226.31.15.514.225.61.225.212 0 .395-.094.548-.282.154-.188.457-.654.908-1.4l.41-.676c-.068-.287-.142-.64-.22-1.056-.079-.417-.16-.845-.241-1.282l-.164-.872c-.117-.629-.301-1.042-.554-1.24-.144-.117-.38-.175-.708-.175a14.992 14.992 0 0 0-.636.051v-.564c.616-.075 1.29-.17 2.026-.287a52.738 52.738 0 0 0 1.471-.246c.205.274.374.605.508.995.133.39.234.803.302 1.24l.113.688z"/>
+</svg>
diff --git a/src_old/plugins/debug/styles/images/console_panel_on.svg b/src_old/plugins/debug/styles/images/console_panel_on.svg
new file mode 100644
index 0000000..1eeec2e
--- /dev/null
+++ b/src_old/plugins/debug/styles/images/console_panel_on.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+    <path fill="#6D6D6D" fill-rule="evenodd" d="M14 2.5l-2 1V2H2v12h12v1a1 1 0 0 1-1 1H1a1 1 0 0 1-1-1V1a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v1.5zm-2.981 3.702c.78-1.06 1.407-1.803 1.882-2.23.475-.428.938-.641 1.389-.641.54 0 .913.184 1.118.553.11.192.164.424.164.698 0 .28-.113.536-.339.769a1.1 1.1 0 0 1-.82.348c-.198 0-.422-.075-.672-.225-.25-.15-.439-.226-.569-.226-.253 0-.494.13-.723.39-.229.26-.623.81-1.184 1.65l.195 1.026c.102.526.188.959.256 1.297.069.338.144.651.226.938.11.397.219.684.328.862.11.177.27.266.482.266.191 0 .424-.14.697-.42.15-.15.38-.427.687-.83l.43.297a8.113 8.113 0 0 1-1.409 1.733c-.578.546-1.143.82-1.697.82-.465 0-.848-.192-1.148-.574-.171-.205-.322-.486-.452-.841a11.32 11.32 0 0 1-.282-.98 24.82 24.82 0 0 0-.23-.866l-.144.246c-.677 1.162-1.172 1.918-1.487 2.266-.471.52-1.018.78-1.64.78-.356 0-.665-.122-.928-.364a1.172 1.172 0 0 1-.395-.898c0-.294.097-.565.292-.815.195-.25.467-.374.815-.374.212 0 .474.075.785.226.31.15.514.225.61.225.212 0 .395-.094.548-.282.154-.188.457-.654.908-1.4l.41-.676c-.068-.287-.142-.64-.22-1.056-.079-.417-.16-.845-.241-1.282l-.164-.872c-.117-.629-.301-1.042-.554-1.24-.144-.117-.38-.175-.708-.175a14.992 14.992 0 0 0-.636.051v-.564c.616-.075 1.29-.17 2.026-.287a52.738 52.738 0 0 0 1.471-.246c.205.274.374.605.508.995.133.39.234.803.302 1.24l.113.688z"/>
+</svg>
diff --git a/src_old/plugins/page_notes/page_notes.js b/src_old/plugins/page_notes/page_notes.js
new file mode 100644
index 0000000..b0bee8c
--- /dev/null
+++ b/src_old/plugins/page_notes/page_notes.js
@@ -0,0 +1,474 @@
+// use this to isolate the scope
+(function () {
+    // No notes shown specified by generation config
+    if (!$axure.document.configuration.showPageNotes && !$axure.document.configuration.showAnnotationsSidebar && !$axure.document.configuration.showAnnotations) { return; }
+
+    $(window.document).ready(function () {
+        // Load right panel for Page Notes
+        if ($axure.document.configuration.showPageNotes || $axure.document.configuration.showAnnotationsSidebar) {
+            $axure.player.createPluginHost({
+                id: 'pageNotesHost',
+                context: 'inspect',
+                title: 'Documentation',
+                gid: 2,
+            });
+        }
+
+        // Load footnotes on widgets
+        if ($axure.document.configuration.showAnnotations) {
+            $('#overflowMenuContainer').prepend('<div id="showNotesOption" class="showOption" style="order: 3"><div class="overflowOptionCheckbox"></div>Show Note Markers</div>');
+        }
+
+        createNotesOverlay();
+        generatePageNotes();
+
+        if ($axure.player.isMobileMode()) {
+            $('#showNotesOption').hide();
+        } else {
+            $('#showNotesOption').click(footnotes_click);
+            $('#showNotesOption').find('.overflowOptionCheckbox').addClass('selected');
+        }
+
+        function populateNotes(pageForNotes) {
+            var hasNotes = false;
+            if ($axure.document.configuration.showPageNotes) {
+                var pageNoteUi = '';
+
+                function populatePageNotes(pageOrMaster) {
+                    //populate the page notes
+                    var notes = pageOrMaster.notes;
+                    if (notes && !$.isEmptyObject(notes)) {
+                        pageNoteUi += "<div class='notesPageNameHeader'>" + pageOrMaster.pageName + "</div>";
+
+                        var showNames = $axure.document.configuration.showPageNoteNames;
+                        for(var noteName in notes) {
+                            pageNoteUi += "<div class='pageNoteContainer'>";
+                            if(showNames) {
+                                pageNoteUi += "<div class='pageNoteName'>" + noteName + "</div>";
+                            }
+                            pageNoteUi += "<div class='pageNote'>" + linkify(notes[noteName]) + "</div>";
+                            pageNoteUi += "</div>";
+                            //$('#pageNotesContent').append(pageNoteUi);
+
+                            hasNotes = true;
+                        }
+                    }
+                }
+
+                populatePageNotes(pageForNotes);
+                if (pageForNotes.masterNotes) {
+                    for (var i = 0; i < pageForNotes.masterNotes.length; i++) {
+                        populatePageNotes(pageForNotes.masterNotes[i]);
+                    }
+                }
+
+                if (pageNoteUi.length > 0) {
+                    pageNoteUi += "<div class='lineDivider'></div>";
+                    var pageNotesHeader = "<div id='pageNotesSectionHeader' class='notesSectionHeader pluginNameHeader'>Page Notes</div>";
+                    $('#pageNotesContent').append(pageNotesHeader + pageNoteUi);
+                }
+            }
+
+            if ($axure.document.configuration.showAnnotationsSidebar) {
+                var widgetNoteUi = '';
+                //var widgetNotes = pageForNotes.widgetNotes;
+                function populateWidgetNotes(widgetNotes){
+                    if (widgetNotes) {
+                        for (var i = 0; i < widgetNotes.length; i++) {
+                            var widgetNote = widgetNotes[i];
+                            widgetNoteUi += "<div class='widgetNoteContainer' data-id='" + widgetNote["ownerId"] + "'>";
+                            widgetNoteUi += "<div class='widgetNoteFootnote'>" + widgetNote["fn"] + "</div>";
+                            widgetNoteUi += "<div class='widgetNoteLabel'>" + widgetNote["label"] + "</div>";
+
+                            for (var widgetNoteName in widgetNote) {
+                                if (widgetNoteName != "label" && widgetNoteName != "fn" && widgetNoteName != "ownerId") {
+                                    widgetNoteUi += "<div class='pageNoteName'>" + widgetNoteName + "</div>";
+                                    widgetNoteUi += "<div class='pageNote'>" + linkify(widgetNote[widgetNoteName]) + "</div>";
+                                    //widgetNoteUi += "<div class='nondottedDivider'></div>";
+                                }
+                            }
+                            widgetNoteUi += "</div>";
+                            //widgetNoteUi += "<div class='nondottedDivider'></div>";
+                            //$('#pageNotesContent').append(widgetNoteUi);
+                            hasNotes = true;
+                        }
+                    }
+                }
+
+                populateWidgetNotes(pageForNotes.widgetNotes);
+                if (pageForNotes.masterNotes) {
+                    for (var i = 0; i < pageForNotes.masterNotes.length; i++) {
+                        populateWidgetNotes(pageForNotes.masterNotes[i].widgetNotes);
+                    }
+                }
+
+                if (widgetNoteUi.length > 0) {
+                    var widgetNotesHeader = "<div id='widgetNotesSectionHeader' class='notesSectionHeader pluginNameHeader'>Widget Notes</div>";
+                    $('#pageNotesContent').append(widgetNotesHeader + widgetNoteUi);
+
+                    //$('.widgetNoteContainer').children(':last-child').remove();
+                    //$('.widgetNoteFootnote').append("<div class='annnoteline'></div><div class='annnoteline'></div><div class='annnoteline'></div>");
+                    $('.widgetNoteContainer').click(function () {
+                        var wasSelected = $(this).hasClass('widgetNoteContainerSelected');
+                        $('.widgetNoteContainerSelected').removeClass('widgetNoteContainerSelected');
+                        if (!wasSelected) $(this).addClass('widgetNoteContainerSelected');
+
+                        var dimStr = $('.currentAdaptiveView').attr('data-dim');
+                        var h = dimStr ? dimStr.split('x')[1] : '0';
+                        var $leftPanel = $('.leftPanel:visible');
+                        var leftPanelOffset = (!$axure.player.isMobileMode() && $leftPanel.length > 0) ? $leftPanel.width() : 0;
+                        var $rightPanel = $('.rightPanel:visible');
+                        var rightPanelOffset = (!$axure.player.isMobileMode() && $rightPanel.length > 0) ? $rightPanel.width() : 0;
+                        var viewDimensions = {
+                            h: h != '0' ? h : '',
+                            scaleVal: $('.vpScaleOption').find('.selectedRadioButton').parent().attr('val'),
+                            height: $('.rightPanel').height(),
+                            panelWidthOffset: leftPanelOffset + rightPanelOffset
+                        };
+                        $axure.messageCenter.postMessage('toggleSelectWidgetNote', { id: this.getAttribute('data-id'), value: !wasSelected, view: viewDimensions});
+                    });
+                }
+
+                
+                //if (pageForNotes.masterNotes) {
+                //    for (var i = 0; i < pageForNotes.masterNotes.length; i++) {
+                //        var master = pageForNotes.masterNotes[i];
+                //        hasNotes = populateNotes(master) || hasNotes;
+                //    }
+                //}
+            }
+            
+            return hasNotes;
+        }
+
+        // bind to the page load
+        $axure.page.bind('load.page_notes', function () {
+            closeAllDialogs();
+
+            var hasNotes = false;
+
+            $('#pageNotesContent').html("");
+            hasNotes = populateNotes($axure.page);
+            
+            if(hasNotes) $('#pageNotesEmptyState').hide();
+            else $('#pageNotesEmptyState').show();
+
+            //If footnotes enabled for this prototype...
+            if ($axure.player.isMobileMode()) {
+                $axure.messageCenter.postMessage('annotationToggle', false);
+            } else if($axure.document.configuration.showAnnotations == true) {
+                //If the fn var is defined and set to 0, hide footnotes
+                //else if hide-footnotes button selected, hide them
+                var fnVal = $axure.player.getHashStringVar(FOOTNOTES_VAR_NAME);
+                if(fnVal.length > 0 && fnVal == 0) {
+                    $('#showNotesOption').find('.overflowOptionCheckbox').removeClass('selected');
+                    $axure.messageCenter.postMessage('annotationToggle', false);
+                } else if(!$('#showNotesOption').find('.overflowOptionCheckbox').hasClass('selected')) {
+                    //If the footnotes button isn't selected, hide them on this loaded page
+                    $axure.messageCenter.postMessage('annotationToggle', false);
+                }
+            }
+
+            // Get multiple click call if not removing beforehand
+            $('#notesOverlay').off('click');
+            $('#notesOverlay').on('click', '.closeNotesDialog', function () {
+                var ownerId = $(this).attr("data-ownerid");
+                _toggleAnnDialog(ownerId);
+            });
+            
+            $axure.player.updatePlugins();
+            return false;
+        });
+
+        $axure.messageCenter.addMessageListener(function (message, data) {
+            //var messageData = { id: elementId, x: event.pageX, y: event.pageY }
+            if (message == 'toggleAnnDialog') {
+                _toggleAnnDialog(data.id, data.x, data.y, data.page);
+            }
+        });
+
+    });
+
+    function linkify(text) {
+        var urlRegex = /(\b(((https?|ftp|file):\/\/)|(www\.))[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
+        return text.replace(urlRegex, function (url, b, c) {
+            var url2 = (c == 'www.') ? 'http://' + url : url;
+            return '<a href="' + url2 + '" target="_blank" class="noteLink">' + url + '</a>';
+        });
+    }
+
+    function getWidgetNotesHtml(ownerId, page) {
+        var pageForNotes = page || $axure.page;
+        var widgetNoteUi = '';
+
+        widgetNoteUi += "<div data-ownerid='" + ownerId + "' class='closeNotesDialog'></div>";
+        widgetNoteUi += "<div class='notesDialogScroll'>";
+
+        function getNotesForPage(widgetNotes) {
+            for (var i = 0; i < widgetNotes.length; i++) {
+                var widgetNote = widgetNotes[i];
+                if (widgetNote["ownerId"] == ownerId) {
+                    widgetNoteUi += "<div class='widgetNoteContainer' data-id='" + widgetNote["ownerId"] + "'>";
+                    widgetNoteUi += "<div class='widgetNoteFootnote'>" + widgetNote["fn"] + "</div>";
+                    widgetNoteUi += "<div class='widgetNoteLabel'>" + widgetNote["label"] + "</div>";
+
+                    for (var widgetNoteName in widgetNote) {
+                        if (widgetNoteName != "label" && widgetNoteName != "fn" && widgetNoteName != "ownerId") {
+                            widgetNoteUi += "<div class='pageNoteName'>" + widgetNoteName + "</div>";
+                            widgetNoteUi += "<div class='pageNote'>" + linkify(widgetNote[widgetNoteName]) + "</div>";
+                        }
+                    }
+                    widgetNoteUi += "</div>";
+                }
+            }
+        }
+
+        getNotesForPage(pageForNotes.widgetNotes);
+        if (pageForNotes.masterNotes) {
+            for (var i = 0; i < pageForNotes.masterNotes.length; i++) {
+                getNotesForPage(pageForNotes.masterNotes[i].widgetNotes);
+            }
+        }
+
+        widgetNoteUi += "</div>";
+        widgetNoteUi += "<div class='resizeNotesDialog'></div>";
+
+        return widgetNoteUi;
+    }
+
+    var maxZIndex = 1;
+    var dialogs = {};
+    var _toggleAnnDialog = function (id, srcLeft, srcTop, page) {
+
+        if(dialogs[id]) {
+            var $dialog = dialogs[id];
+            // reset the dialog
+            dialogs[id] = undefined;
+            $dialog.find('.notesDialogScroll').getNiceScroll().remove();
+            $dialog.remove();
+            return;
+        }
+        
+        var bufferH = 10;
+        var bufferV = 10;
+        var blnLeft = false;
+        var blnAbove = false;
+        var mfPos = $('#mainPanelContainer').position();
+        var viewablePanelLeftMargin = parseInt($('#mainPanelContainer').css('margin-left'));
+
+        var sourceTop = srcTop + mfPos.top;
+        var sourceLeft = srcLeft + viewablePanelLeftMargin;
+
+        var width = 300;
+        var height = 300;
+
+        if(sourceLeft > width + bufferH) {
+            blnLeft = true;
+        }
+        if(sourceTop > height + bufferV) {
+            blnAbove = true;
+        }
+
+        var top = 0;
+        var left = 0;
+        if(blnAbove) top = sourceTop - height - 20;
+        else top = sourceTop + 10;
+        if(blnLeft) left = sourceLeft - width - 4;
+        else left = sourceLeft - 6;
+
+        //need to set the zindex
+        maxZIndex = maxZIndex + 1;
+        
+        var $dialog = $('<div class="notesDialog"></div>')
+            .appendTo('#notesOverlay')
+            .html(getWidgetNotesHtml(id, page));     
+
+        $dialog.css({ 'left': left, 'top': top, 'z-index': maxZIndex });
+
+        $dialog.find('.notesDialogScroll').niceScroll({ cursorcolor: "#8c8c8c", cursorborder: "0px solid #fff" });
+
+        $dialog.find('.notesDialogScroll').on($axure.eventNames.mouseDownName, function(event) {
+            event.stopPropagation();
+        });
+        
+        $dialog.find('.closeNotesDialog').on($axure.eventNames.mouseDownName, function (event) {
+            event.stopPropagation();
+        });
+
+        $dialog.on($axure.eventNames.mouseDownName, startDialogMove);
+        var startMouseX;
+        var startMouseY;
+        var startDialogX;
+        var startDialogY;
+        function startDialogMove() {
+            startMouseX = window.event.pageX;
+            startMouseY = window.event.pageY;
+            var position = $dialog.position();
+            startDialogX = position.left;
+            startDialogY = position.top;
+
+            $dialog.addClass('active');
+            $('<div class="splitterMask"></div>').insertAfter($('#notesOverlay'));
+            $(document).bind($axure.eventNames.mouseMoveName, doDialogMove).bind($axure.eventNames.mouseUpName, endDialogMove);
+
+            $dialog.find('.notesDialogScroll').getNiceScroll().hide();
+        }
+
+        function doDialogMove() {
+            var currentX = window.event.pageX;
+            var currentY = window.event.pageY;
+            $dialog.css({ 'left': startDialogX + currentX - startMouseX, 'top': startDialogY + currentY - startMouseY });
+        }
+
+        function endDialogMove() {
+            $('div.splitterMask').remove();
+            $dialog.removeClass('active');
+            $(document).unbind($axure.eventNames.mouseMoveName, doDialogMove).unbind($axure.eventNames.mouseUpName, endDialogMove);
+
+            $dialog.find('.notesDialogScroll').getNiceScroll().resize();
+            $dialog.find('.notesDialogScroll').getNiceScroll().show();
+        }
+
+        $dialog.find('.resizeNotesDialog').on($axure.eventNames.mouseDownName, startDialogResize);
+
+        var startDialogW;
+        var startDialogH;
+        function startDialogResize() {
+            event.stopPropagation();
+
+            startMouseX = window.event.pageX;
+            startMouseY = window.event.pageY;
+            startDialogW = Number($dialog.css('width').replace('px',''));
+            startDialogH = Number($dialog.css('height').replace('px', ''));
+
+            $dialog.addClass('active');
+            $('<div class="splitterMask"></div>').insertAfter($('#notesOverlay'));
+            $(document).bind($axure.eventNames.mouseMoveName, doDialogResize).bind($axure.eventNames.mouseUpName, endDialogResize);
+
+            $dialog.find('.notesDialogScroll').getNiceScroll().hide();
+        }
+
+        function doDialogResize() {
+            var currentX = window.event.pageX;
+            var currentY = window.event.pageY;
+            var newWidth = Math.max(200, startDialogW + currentX - startMouseX);
+            var newHeight = Math.max(200, startDialogH + currentY - startMouseY);
+            $dialog.css({ 'width': newWidth, 'height': newHeight });
+        }
+
+        function endDialogResize() {
+            $('div.splitterMask').remove();
+            $dialog.removeClass('active');
+            $(document).unbind($axure.eventNames.mouseMoveName, doDialogResize).unbind($axure.eventNames.mouseUpName, endDialogResize);
+
+            $dialog.find('.notesDialogScroll').getNiceScroll().resize();
+            $dialog.find('.notesDialogScroll').getNiceScroll().show();
+        }
+
+        dialogs[id] = $dialog;
+
+        // scroll ... just for IE
+        //window.scrollTo(scrollX, scrollY);
+    };
+    
+    $(document).on('sidebarCollapse', function (event, data) {
+        clearSelection();
+    });
+
+    $(document).on('pluginShown', function (event, data) {
+        if(data != 2) {
+            clearSelection();
+        }
+    });
+
+    function clearSelection() {
+        var selectedNote = $('#pageNotesContainer').find('.widgetNoteContainerSelected');
+        if(selectedNote.length > 0) {
+            selectedNote.removeClass('widgetNoteContainerSelected');
+            //var dimStr = $('.currentAdaptiveView').attr('data-dim');
+            //var h = dimStr ? dimStr.split('x')[1] : '0';
+            //var $leftPanel = $('.leftPanel:visible');
+            //var leftPanelOffset = (!$axure.player.isMobileMode() && $leftPanel.length > 0) ? $leftPanel.width() : 0;
+            //var $rightPanel = $('.rightPanel:visible');
+            //var rightPanelOffset = (!$axure.player.isMobileMode() && $rightPanel.length > 0) ? $rightPanel.width() : 0;
+            //var viewDimensions = {
+            //    h: h != '0' ? h : '',
+            //    scaleVal: $('.vpScaleOption').find('.selectedRadioButton').parent().attr('val'),
+            //    scrollLeft: $('#clipFrameScroll').scrollLeft(),
+            //    scrollTop: $('#clipFrameScroll').scrollTop(),
+            //    height: $('.rightPanel').height(),
+            //    panelWidthOffset: leftPanelOffset + rightPanelOffset
+            //};
+            //$axure.messageCenter.postMessage('toggleSelectWidgetNote', { id: '', value: false, view: viewDimensions });
+            $axure.messageCenter.postMessage('toggleSelectWidgetNote', { id: '', value: false });
+            //$axure.messageCenter.postMessage('toggleSelectWidgetNote', '');
+        }
+    }
+
+    function closeAllDialogs() {
+        for (var id in dialogs) {
+            var $dialog = dialogs[id];
+            if ($dialog !== undefined) _toggleAnnDialog(id);
+        }
+    }
+
+    $axure.player.toggleFootnotes = function(val) {
+        var scaleCheckDiv = $('#showNotesOption').find('.overflowOptionCheckbox');
+        if (scaleCheckDiv.hasClass('selected')) {
+            if (!val) $('#showNotesOption').click();
+        } else {
+            if (val) $('#showNotesOption').click();
+        }
+    }
+
+    function footnotes_click(event) {
+        var scaleCheckDiv = $('#showNotesOption').find('.overflowOptionCheckbox');
+        if (scaleCheckDiv.hasClass('selected')) {
+            closeAllDialogs();
+
+            scaleCheckDiv.removeClass('selected');
+            $axure.messageCenter.postMessage('annotationToggle', false);
+            //Add 'fn' hash string var so that footnotes stay hidden across reloads
+            $axure.player.setVarInCurrentUrlHash(FOOTNOTES_VAR_NAME, 0);
+        } else {
+            scaleCheckDiv.addClass('selected');
+            $axure.messageCenter.postMessage('annotationToggle', true);
+            //Delete 'fn' hash string var if it exists since default is visible
+            $axure.player.deleteVarFromCurrentUrlHash(FOOTNOTES_VAR_NAME);
+        }
+    }
+
+    function createNotesOverlay() {
+        var $targetPanel = $('#clippingBounds');
+
+        if (!$('#notesOverlay').length) {
+            var notesOverlay = document.createElement('div');
+            notesOverlay.setAttribute('id', 'notesOverlay');
+
+            $targetPanel.prepend(notesOverlay);
+            $(notesOverlay).append('&nbsp;');
+        }
+    }
+
+    function generatePageNotes() {
+        var pageNotesUi = "<div id='pageNotesHeader'>";
+
+        pageNotesUi += "<div id='pageNotesToolbar' style='height: 12px;'>";
+        pageNotesUi += "</div>";
+        pageNotesUi += "</div>";
+
+
+        pageNotesUi += "<div id='pageNotesScrollContainer'>";
+        pageNotesUi += "<div id='pageNotesContainer'>";
+        pageNotesUi += "<div id='pageNotesEmptyState' class='emptyStateContainer'><div class='emptyStateTitle'>No notes for this page.</div><div class='emptyStateContent'>Notes added in Axure RP will appear here.</div><div class='dottedDivider'></div></div>";
+        pageNotesUi += "<span id='pageNotesContent'></span>";
+        pageNotesUi += "</div></div>";
+
+        $('#pageNotesHost').html(pageNotesUi);
+
+        if(!$axure.document.configuration.showAnnotations) {
+            $('#pageNotesHost .pageNameHeader').css('padding-right', '55px');
+        }
+    }
+
+})();   
\ No newline at end of file
diff --git a/src_old/plugins/page_notes/styles/images/notes_panel_off.svg b/src_old/plugins/page_notes/styles/images/notes_panel_off.svg
new file mode 100644
index 0000000..3682486
--- /dev/null
+++ b/src_old/plugins/page_notes/styles/images/notes_panel_off.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16">
+    <path fill="#008DCB" fill-rule="evenodd" d="M1 0h12a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H1a1 1 0 0 1-1-1V1a1 1 0 0 1 1-1zm1 2v12h10V2H2zm2 2h6a1 1 0 0 1 0 2H4a1 1 0 1 1 0-2zm0 3h6a1 1 0 0 1 0 2H4a1 1 0 1 1 0-2zm0 3h6a1 1 0 0 1 0 2H4a1 1 0 0 1 0-2z"/>
+</svg>
diff --git a/src_old/plugins/page_notes/styles/images/notes_panel_on.svg b/src_old/plugins/page_notes/styles/images/notes_panel_on.svg
new file mode 100644
index 0000000..3e7af5d
--- /dev/null
+++ b/src_old/plugins/page_notes/styles/images/notes_panel_on.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16">
+    <path fill="#6D6D6D" fill-rule="evenodd" d="M1 0h12a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H1a1 1 0 0 1-1-1V1a1 1 0 0 1 1-1zm1 2v12h10V2H2zm2 2h6a1 1 0 0 1 0 2H4a1 1 0 1 1 0-2zm0 3h6a1 1 0 0 1 0 2H4a1 1 0 1 1 0-2zm0 3h6a1 1 0 0 1 0 2H4a1 1 0 0 1 0-2z"/>
+</svg>
diff --git a/src_old/plugins/page_notes/styles/page_notes.css b/src_old/plugins/page_notes/styles/page_notes.css
new file mode 100644
index 0000000..35674c3
--- /dev/null
+++ b/src_old/plugins/page_notes/styles/page_notes.css
@@ -0,0 +1,209 @@
+#pageNotesHost {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+}
+
+#pageNotesHostBtn {
+    order: 2;
+}
+
+#pageNotesHostBtn a {
+    background: url('images/notes_panel_on.svg') no-repeat center center,linear-gradient(transparent, transparent);
+}
+
+#pageNotesHostBtn a.selected, #pageNotesHostBtn a.selected:hover {
+    background: url('images/notes_panel_off.svg') no-repeat center center,linear-gradient(transparent, transparent);
+}
+
+#pageNotesScrollContainer {
+    overflow: auto;
+    width: 100%;
+    flex: 1;
+    -webkit-overflow-scrolling: touch;
+}    
+
+#pageNotesContent {
+	overflow: visible;
+}
+
+.pageNoteContainer {
+    padding: 0px 12px 8px 12px;
+}
+
+.mobileMode .pageNoteContainer {
+    padding: 0px 16px 8px 17px;
+}
+
+.pageNoteName {
+    font-size: 13px;
+    font-weight: bold;
+    color: #2c2c2c;
+    margin: 15px 0px 5px 0px;
+    white-space: nowrap;
+}
+
+.pageNote {
+    font-size: 13px;
+    color: #2a2e38;
+    line-height: 1.67;
+    word-wrap: break-word;
+}
+
+.pageNote ul {
+    list-style: disc;
+    padding: 0px 0px 0px 40px;
+}
+
+.pageNote ul ul{
+    list-style: circle;
+}
+
+.pageNote ul ul ul{
+    list-style: square;
+}
+
+.pageNote ul ul ul ul {
+    list-style: disc;
+}
+
+.pageNote ul ul ul ul ul {
+    list-style: circle;
+}
+
+.pageNote ul ul ul ul ul ul {
+    list-style: square;
+}
+
+.widgetNoteContainer {
+    padding: 12px;
+    border-bottom: 1px solid transparent;
+    border-top: 1px solid transparent;
+    cursor: pointer;
+}
+
+.mobileMode .widgetNoteContainer {
+    padding: 12px 16px 12px 17px;
+}
+
+.widgetNoteContainerSelected {
+    background-color: white;
+    border-bottom: 1px solid #c2c2c2;
+    border-top: 1px solid #c2c2c2;
+}
+
+.widgetNoteFootnote {
+    display: inline-block;
+    padding-top: 1px;
+    background-color: #fff849;
+    font-size: 11px;
+    font-weight: bold;
+    line-height: 16px;
+    margin-right: 8px;
+    padding: 0px 5px;
+    color: #000;
+}
+
+div.annnoteline {
+    display: inline-block;
+    width: 9px;
+    height: 1px;
+    border-bottom: 1px solid white;
+    margin-top: 1px;
+}
+
+.widgetNoteLabel {
+    font-size: 13px;
+    font-weight: 600;
+    color: #58167d;
+    margin-top: 4px;
+    float: right;
+}
+
+.noteLink {
+    text-decoration: inherit;
+    color: inherit;
+}
+
+.noteLink:hover {
+    background-color: white;
+}
+
+.notesSectionHeader {
+    margin: 0px 8px 0px 12px;
+}
+
+.notesPageNameHeader {
+    margin: 8px 8px 15px 12px;
+}
+
+.mobileMode .notesPageNameHeader {
+    margin: 18px 14px 5px 16px;
+}
+
+#notesOverlay {
+    width: 0;
+    height: 0;
+    position: absolute;
+    overflow: visible;
+    z-index: 1;
+}
+
+div.closeNotesDialog {
+    position: absolute;
+    top: 6px;
+    right: 6px;
+    width: 11px;
+    height: 10px;
+    object-fit: contain;
+    background: url(../../../resources/images/close_x.svg) no-repeat center center, linear-gradient(transparent, transparent);
+    margin-left: auto;
+    cursor: pointer;
+}
+
+div.resizeNotesDialog {
+    position: absolute;
+    bottom: 2px;
+    right: 2px;
+    width: 11px;
+    height: 10px;
+    object-fit: contain;
+    background: url(../../../resources/images/resize.svg) no-repeat center center, linear-gradient(transparent, transparent);
+    margin-left: auto;
+    cursor: nwse-resize;
+}
+
+div.notesDialog {
+    position: absolute;
+    padding: 16px 3px 10px 3px;
+    background-color: #efefef;
+    width: 300px;
+    height: 300px;
+    line-height: normal;
+    border: #8F949A solid 1px;
+    box-shadow: 2px 2px 4px 0 rgba(0, 0, 0, 0.4);
+    cursor: move;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+}
+
+div.notesDialog.active {
+    user-select: none;
+}
+
+div.notesDialog .widgetNoteContainer {
+    cursor: auto;
+    padding: 2px 26px 16px 14px;
+}
+
+div.notesDialogScroll {
+    overflow-x: hidden;
+    overflow-y: auto;
+    height: 100%;
+    cursor: auto;
+}
+
+.mobileMode .pageNoteName, .mobileMode #pageNotesToolbar, .mobileMode .dottedDivider {
+    display: none;
+}
\ No newline at end of file
diff --git a/src_old/plugins/recordplay/recordplay.js b/src_old/plugins/recordplay/recordplay.js
new file mode 100644
index 0000000..9d39458
--- /dev/null
+++ b/src_old/plugins/recordplay/recordplay.js
@@ -0,0 +1,479 @@
+// use this to isolate the scope
+(function() {
+
+        if(!$axure.document.configuration.showRecordPlay) { return; }
+
+    $(window.document).ready(function() {
+        $axure.player.createPluginHost({
+            id: 'recordPlayHost',
+            context: 'interface',
+            title: 'Recording'
+        });
+        _generateRecordPlay();
+
+        $('#recordButton').click(_recordClick);
+        $('#playButton').click(_playClick);
+        $('#stopButton').click(_stopClick);
+        $('#deleteButton').click(_deleteClick);
+
+        // bind to the page load
+
+        $axure.page.bind('load.page_notes', function() {
+            
+            $.ajax({
+                type: "POST",
+                url: '/RecordController/ListRecordings',
+                success: function(response) {
+
+                    $('#recordNameHeader').html("");
+                    $('#recordPlayContent').html("");
+                    //populate the notes 
+                    
+                    axRecordingList = [];
+
+                    if(!eventList) {
+                        recordingIndex = 0;
+                        eventList = [];
+                        recordingStartTime = 0;
+                        bulkEventElement = "";
+                        lastBulkEvent = {};
+                    }
+
+                    for(var idx in response.recordingList) {
+                        getOneRecording(response.recordingList[idx]);
+                    }
+
+                    return false;
+                },
+                //                dataType: 'json'
+            });
+        });
+    });
+    
+    var nameMatcher = new RegExp("^axRecording[0-9]{4}$", "i");
+    var indexMatcher = new RegExp("[0-9]{4}$", "i");
+
+    var convertFromJson = function(oneRecording) {
+        
+        if(nameMatcher.exec(oneRecording.recordingName)) {
+            var myArray = indexMatcher.exec(oneRecording.recordingName);
+            var currIdx = parseInt(myArray);
+            if(recordingIndex < currIdx) {
+                recordingIndex = currIdx;
+            }
+        }
+        
+
+        for(var idx in oneRecording.eventList) {
+            var thisEvent = oneRecording.eventList[idx];
+                thisEvent.eventInfo = {};
+                            thisEvent.eventInfo.srcElement = thisEvent.elementID;
+                // TODO: check that this is correct.
+
+            if(isBulkMouse(thisEvent.eventType)) {
+                thisEvent.eventInfo.mousePositions = [];
+                thisEvent.eventInfo.mousePositions = thisEvent.mousePositions;
+                thisEvent.timeStamp = thisEvent.mousePositions[0].timeStamp;
+            }
+            if(isSingleMouse(thisEvent.eventType)) {
+                thisEvent.eventInfo.cursor = {};
+                thisEvent.eventInfo.cursor = thisEvent.cursor;
+                
+            }
+            if(thisEvent.eventType === 'OnDrag') {
+                thisEvent.eventInfo.dragInfo = {};
+                thisEvent.eventInfo.dragInfo = thisEvent.dragInfo;
+                thisEvent.timeStamp = thisEvent.dragInfo.startTime;
+            }
+
+        }
+        return oneRecording;
+    };
+
+    var getOneRecording = function(recordingItem) {
+        $.ajax({
+                type: "POST",
+                url: '/RecordController/GetRecording',
+                data: { 'recordingId': recordingItem.recordingId },
+            success: function(response) {
+                        axRecordingList[axRecordingList.length] = convertFromJson(response);
+                        var axRecordingContainer = $('#recordingContainer').find('li').filter('.recordingRootNode');
+                        axRecordingContainer.append(_formAxRecordingBranch(response));
+                        _attachEventTriggers(response);     
+            },                //                dataType: 'json'
+        });
+
+    };
+    
+    var axRecordingList;
+    var eventList;
+    var recordingIndex;
+    var recordingStartTime;
+    var recordingId;
+    var recordingName;
+
+
+    var leadingZeros = function(number, digits) { // because this thing doesn't have string.format (or does it?)
+        var recurseLeadingZeros = function(number, digitsLeft) {
+            if(digitsLeft > 0) {
+                return recurseLeadingZeros("0" + number, digitsLeft - 1);
+            } else {
+                return number;
+            }
+        };
+        return recurseLeadingZeros(number, digits - String(number).length);
+    };
+    
+
+    var generateRecordingName = function() {
+        return "axRecording" + leadingZeros(recordingIndex, 4);
+    };
+
+    var isSingleMouse = function(eventType) {
+        return (eventType === 'OnClick' ||
+            eventType === 'OnMouseUp' ||
+            eventType === 'OnMouseDown' ||
+            eventType === 'OnMouseOver' ||
+            eventType === 'OnKeyUp' ||
+            eventType === 'OnSelectedChange' ||
+            eventType === 'OnSelect' ||
+            eventType === 'OnUnselect' ||
+            eventType === 'OnTextChange' ||
+            eventType === 'OnMouseOut');
+    };
+
+    var isBulkMouse = function(eventType) {
+        return (eventType === 'OnMouseHover' ||
+            eventType === 'OnMouseMove');
+    };
+
+    var bulkEventElement;
+    var lastBulkEvent;
+
+
+    $axure.messageCenter.addMessageListener(function(message, eventData) {
+        var lastEvent, lastBulkData;
+        
+        if(message === 'logEvent') {
+            
+            if(bulkEventElement !== eventData.elementID) {
+                lastBulkEvent = {};
+                bulkEventElement = eventData.elementID;
+            }
+            
+            if(isBulkMouse(eventData.eventType)) {
+                lastEvent = lastBulkEvent[eventData.eventType];
+
+                if(lastEvent) {
+                    // this is the second or third or whatever onmousemove in a row
+                    lastBulkData = lastEvent.eventInfo.mousePositions;
+                    lastBulkData[lastBulkData.length] = {
+                        cursor: eventData.eventInfo.cursor,
+                        timeStamp: eventData.timeStamp
+                    };
+                } else {
+
+                    eventData.eventInfo.mousePositions = [];
+                    eventData.eventInfo.mousePositions[0] = {
+                        cursor: eventData.eventInfo.cursor,
+                        timeStamp: eventData.timeStamp
+                    };
+                    eventList[eventList.length] = eventData;
+                    lastBulkEvent[eventData.eventType] = eventData;
+                }
+            } else {
+                var z = true;
+            }
+            
+            if(isSingleMouse(eventData.eventType) ) {
+                eventList[eventList.length] = eventData;
+                lastBulkEvent = {};
+                bulkEventElement = eventData.elementID;
+            }
+
+            if(eventData.eventType === 'OnDrag') {
+
+                lastEvent = lastBulkEvent[eventData.eventType];
+                
+                if (lastEvent) {
+                    // this is the second or third or whatever onmousemove in a row
+                    lastBulkData = lastEvent.eventInfo.mousePositions;
+                    lastBulkData[lastBulkData.length] = {
+                        dragInfo: eventData.eventInfo.dragInfo,
+                        timeStamp: eventData.timeStamp
+                    };
+                } else {
+                    eventData.eventInfo.mousePositions = [];
+                    eventData.eventInfo.mousePositions[0] = {
+                        dragInfo: eventData.eventInfo.dragInfo,
+                        timeStamp: eventData.timeStamp
+                    };
+                    eventList[eventList.length] = eventData;
+                    lastBulkEvent[eventData.eventType] = eventData;
+                }
+            }
+//            if(eventData.eventType === 'OnKeyUp') {
+//                transmissionFields.eventInfo = eventData.eventInfo;
+//                $.ajax({
+//                    type: "POST",
+//                    url: '/RecordController/LogMouseClick',
+//                    data: transmissionFields,
+//                });
+//            }            
+        }
+
+    });
+    
+    
+    var _recordClick = function(event) {
+        $('#recordButton').addClass('recordPlayButtonSelected');
+        recordingIndex++;
+        //        $axure.recording.startRecord();
+
+        recordingStartTime = new Date().getTime();
+
+        $.ajax({
+            type: "POST",
+            url: '/RecordController/CreateRecording',
+            data: {
+                'recordingName': generateRecordingName(),
+                timeStamp: recordingStartTime
+            },
+            success: function(response) {
+                recordingId = response.recordingId;
+                recordingName = response.recordingName;
+        $axure.messageCenter.postMessage('startRecording', {'recordingId' : recordingId, 'recordingName': recordingName});
+            },
+            //                dataType: 'json'
+        });
+        
+    };
+
+    var _playClick = function(event) {
+        $('#playButton').addClass('recordPlayButtonSelected');
+    };
+
+    var _stopClick = function(event) {
+        var axRecording, axObjectDictionary, axRecordingContainer, transmissionFields;
+        $('#sitemapLinksContainer').toggle();
+        if($('#recordButton').is('.recordPlayButtonSelected')) {
+            $('#recordButton').removeClass('recordPlayButtonSelected');
+            //            $axure.recording.stopRecord();
+
+            axRecording = {
+                'recordingId' : recordingId,
+                'recordingName': recordingName,
+                'eventList': eventList
+            };
+            
+            axRecordingList[axRecordingList.length] = axRecording;
+            axRecordingContainer = $('#recordingContainer').find('li').filter('.recordingRootNode');
+            axRecordingContainer.append(_formAxRecordingBranch(axRecording));
+            _attachEventTriggers(axRecording);
+
+            lastBulkEvent = {};
+
+            var recordingStepList = [];
+
+            for(var eventListIdx in eventList) {
+                var eventListItem = eventList[eventListIdx];
+
+                if(eventListItem.eventType === 'OnDrag') {
+                    var lastDrag = eventListItem.eventInfo.mousePositions[eventListItem.eventInfo.mousePositions.length - 1].dragInfo;
+                    eventListItem.eventInfo.dragInfo.currentX = lastDrag.currentX;
+                    eventListItem.eventInfo.dragInfo.currentY = lastDrag.currentY;
+                    eventListItem.eventInfo.dragInfo.currentTime = lastDrag.currentTime;
+                    eventListItem.eventInfo.dragInfo.xDelta = eventListItem.eventInfo.dragInfo.currentX - eventListItem.eventInfo.dragInfo.lastX;
+                    eventListItem.eventInfo.dragInfo.yDelta = eventListItem.eventInfo.dragInfo.currentY - eventListItem.eventInfo.dragInfo.lastY;
+                    transmissionFields = {};
+                    transmissionFields = tackItOn(transmissionFields, eventListItem, ['eventType', 'elementID', 'path']);
+                    transmissionFields = tackItOn(transmissionFields, eventListItem.eventInfo, ['dragInfo']);
+                    transmissionFields.recordingId = recordingId;
+                }
+
+                if(isSingleMouse(eventListItem.eventType)) {
+                    transmissionFields = {};
+                    transmissionFields = tackItOn(transmissionFields, eventListItem, ['timeStamp', 'eventType', 'elementID', 'path']);
+                    transmissionFields = tackItOn(transmissionFields, eventListItem.eventInfo, ['cursor']);
+                    transmissionFields.recordingId = recordingId;
+                }
+
+                if(isBulkMouse(eventListItem.eventType)) {
+                    transmissionFields = {};
+                    transmissionFields = tackItOn(transmissionFields, eventListItem, ['eventType', 'elementID', 'path']);
+                    transmissionFields = tackItOn(transmissionFields, eventListItem.eventInfo, ['mousePositions']);
+                    transmissionFields.recordingId = recordingId;
+                }
+                recordingStepList[recordingStepList.length] = transmissionFields;
+            }
+
+            eventList = [];
+            $axure.messageCenter.postMessage('stopRecording', axObjectDictionary);
+
+            var jsonText = {
+                'recordingName': recordingName,
+                'recordingId': recordingId,
+                recordingStart: new Date().getTime(),
+                recordingEnd: recordingStartTime,
+                'eventList': recordingStepList
+            };
+
+            $.ajax({
+                type: "POST",
+                url: '/RecordController/StopRecording',
+                data: { 'jsonText': JSON.stringify(jsonText) }
+                
+            });
+
+        }
+
+        if($('#playButton').is('.recordPlayButtonSelected')) {
+            $('#playButton').removeClass('recordPlayButtonSelected');
+        }
+    };
+    
+    var _deleteClick = function(event) {
+        $.ajax({
+                type: "POST",
+                url: '/RecordController/DeleteRecordings',
+            success: function(response) {
+                var x = true;
+            },                //                dataType: 'json'
+        });
+    };
+
+    var tackItOn = function(destination, source, fields) {
+
+        for(var idx in fields) {
+            destination[fields[idx]] = source[fields[idx]];
+        }
+        return destination;
+    };
+
+    var makeFirstLetterLower = function(eventName) {
+        return eventName.substr(0, 1).toLowerCase() + eventName.substr(1);
+    };
+
+    var _attachEventTriggers = function(axRecording) {
+        for(var eventIdx in axRecording.eventList) {
+            var eventObject = axRecording.eventList[eventIdx];
+            var eventID = axRecording['recordingId'] + '_' + eventObject.timeStamp;
+            currentEvent = eventID;
+            $('#' + eventID).click(_triggerEvent(axRecording['recordingId'], eventObject.timeStamp));
+            //            $('#' + eventID).click(event.trigger);
+        }
+    };
+
+    var _formAxRecordingBranch = function(axRecording) {
+        var eventObject, eventID, RDOID;
+        var recordPlayUi = '<ul class="recordingTree">';
+        recordPlayUi += "<li class='recordingNode recordingExpandableNode'>";
+        recordPlayUi += '<div class="recordingContainer" style="margin-left:15px">';
+        recordPlayUi += '<a class="recordingPlusMinusLink"><span class="recordingMinus"></span></a>';
+        recordPlayUi += '<a class="recordingPageLink" nodeurl="home.html">';
+        recordPlayUi += '<span class="recordingPageIcon"></span>';
+        recordPlayUi += '<span class="recordingPageName">' + axRecording['recordingName'] + '</span>';
+        recordPlayUi += '</a>';
+
+        recordPlayUi += '<ul>';
+
+        for(eventID in axRecording.eventList) {
+
+            eventObject = axRecording.eventList[eventID];
+
+            recordPlayUi += '<li class="recordingNode recordingLeafNode">';
+            recordPlayUi += '<div class="recordingEventContainer" style="margin-left:44px">';
+            var eventID = axRecording['recordingId'] + '_' + eventObject.timeStamp;
+            recordPlayUi += '<a id="' + eventID + '" class="sitemapPageLink">';
+            recordPlayUi += 'Event ID: ' + eventID + '<br/>';
+
+            recordPlayUi += '<span class="sitemapPageIcon"></span>';
+            recordPlayUi += '<span class="sitemapPageName">';
+
+            recordPlayUi += 'elementID: ' + eventObject.elementID + '<br/>';
+            recordPlayUi += 'eventType: ' + eventObject.eventType + '<br/>';
+//            recordPlayUi += 'cursor: ' + eventObject.eventInfo.cursor.x + ',' + eventObject.eventInfo.cursor.y + '<br/>';
+
+            for(RDOID in eventObject.path) {
+                recordPlayUi += '/' + eventObject.path[RDOID];
+            }
+            recordPlayUi += '<br/>';
+            recordPlayUi += '</span>';
+            recordPlayUi += '</a>';
+            recordPlayUi += '</div>';
+            recordPlayUi += '</li>';
+        }
+
+        recordPlayUi += '</ul>';
+
+        recordPlayUi += '</div>';
+
+        recordPlayUi += "</li>";
+        recordPlayUi += "</ul>";
+
+        return recordPlayUi;
+    };
+
+    var currentEvent = '';
+
+    var _triggerEvent = function(axRecording, timeStamp) {
+        //            $axure.messageCenter.postMessage('triggerEvent', false);
+
+
+        for(var axRecordingIdx in axRecordingList) {
+            if(axRecordingList[axRecordingIdx].recordingId === axRecording) {
+                for(var eventIdx in axRecordingList[axRecordingIdx].eventList) {
+                    if(axRecordingList[axRecordingIdx].eventList[eventIdx].timeStamp === timeStamp) {
+
+                        var thisEvent = axRecordingList[axRecordingIdx].eventList[eventIdx];
+                        //                            thisEvent.trigger();
+
+                        var thisEventInfo, lowerEventType;
+                        lowerEventType = thisEvent.eventType.toLowerCase();
+                        if(lowerEventType === 'onclick' || lowerEventType === 'onmousein') {
+                            thisEventInfo = {};
+                            thisEventInfo = tackItOn(thisEventInfo, thisEvent.eventInfo, ['cursor', 'timeStamp', 'srcElement']);
+                            if(thisEvent.eventInfo.inputType) {
+                                thisEventInfo = tackItOn(thisEventInfo, thisEvent.eventInfo, ['inputType', 'inputValue']);
+                            }
+                        } else {
+                            thisEventInfo = thisEvent.eventInfo;
+                        }
+
+                        var thisParameters = {
+                            'element': thisEvent.elementID,
+                            'eventInfo': thisEventInfo,
+                            //                            'axEventObject': thisEvent.eventObject,
+                            'eventType': thisEvent.eventType
+                        };
+
+                        return function() {
+                            $axure.messageCenter.postMessage('playEvent', thisParameters);
+                        };
+
+                    }
+                }
+            }
+        }
+    };
+
+    var _generateRecordPlay = function() {
+        var recordPlayUi = "<div id='recordPlayContainer'>";
+
+        recordPlayUi += "<div id='recordPlayToolbar'>";
+
+        recordPlayUi += "<div style='height:30px;'>";
+
+        recordPlayUi += "<a id='recordButton' title='Start a Recording' class='recordPlayButton'></a>";
+        recordPlayUi += "<a id='playButton' title='Play Back a Recording' class='recordPlayButton'></a>";
+        recordPlayUi += "<a id='stopButton' title='Stop' class='recordPlayButton'></a>";
+        recordPlayUi += "<a id='deleteButton' title='Delete All Recordings' class='recordPlayButton'></a>";
+        recordPlayUi += "</div>";
+
+        recordPlayUi += "<div id='recordingContainer'><li class='recordingNode recordingRootNode'></li></div>";
+        recordPlayUi += "</div>";
+
+        $('#recordPlayHost').html(recordPlayUi);
+    };
+
+})();   
\ No newline at end of file
diff --git a/src_old/plugins/recordplay/styles/recordplay.css b/src_old/plugins/recordplay/styles/recordplay.css
new file mode 100644
index 0000000..428f820
--- /dev/null
+++ b/src_old/plugins/recordplay/styles/recordplay.css
@@ -0,0 +1,90 @@
+#recordPlayHost {
+    font-size: 12px;
+    color:#333;
+    height: 100%;
+}
+
+
+#recordPlayContainer 
+{
+    overflow: auto;
+    width: 100%;
+    height: 100%;
+    padding: 10px 10px 10px 10px;
+}
+
+#recordPlayToolbar 
+{
+	margin: 5px 5px 5px 5px;
+    height: 22px;
+}
+
+#recordPlayToolbar .recordPlayButton
+{
+    float: left;
+    width: 22px;
+    height: 22px;
+    border: 1px solid transparent;
+}
+
+#recordPlayToolbar .recordPlayButton:hover
+{
+    border: 1px solid rgb(0,157,217);
+    background-color : rgb(166,221,242);
+}
+
+#recordPlayToolbar .recordPlayButton:active
+{
+    border: 1px solid rgb(0,157,217);
+    background-color : rgb(204,235,248);
+}
+
+#recordPlayToolbar .recordPlayButtonSelected {
+    border: 1px solid rgb(0,157,217);
+    background-color : rgb(204,235,248);    
+}
+
+/* removed images */
+/*#recordButton {
+    background: url('../../sitemap/styles/images/233_hyperlink_16.png') no-repeat center center;
+}
+
+#playButton {
+    background: url('../../sitemap/styles/images/225_responsive_16.png') no-repeat center center;
+}
+
+#stopButton {
+    background: url('../../sitemap/styles/images/228_togglenotes_16.png') no-repeat center center;
+}
+
+#deleteButton {
+    background: url('../../sitemap/styles/images/231_event_16.png') no-repeat center center;
+}*/
+
+#recordNameHeader
+{
+    /* yeah??*/
+	font-size: 13px;
+	font-weight: bold;
+	height: 23px;
+	white-space: nowrap;
+}
+
+#recordPlayContent 
+{
+    /* yeah??*/
+	overflow: visible;
+}
+
+.recordPlayName 
+{
+	font-size: 12px;
+	margin-bottom: 5px;
+	text-decoration: underline;
+	white-space: nowrap;
+}
+
+.recordPlay 
+{
+	margin-bottom: 10px;
+}
\ No newline at end of file
diff --git a/src_old/plugins/sitemap/sitemap.js b/src_old/plugins/sitemap/sitemap.js
new file mode 100644
index 0000000..56f4c59
--- /dev/null
+++ b/src_old/plugins/sitemap/sitemap.js
@@ -0,0 +1,562 @@
+var currentNodeUrl = '';
+var allNodeUrls = [];
+
+var openNextPage = $axure.player.openNextPage = function () {
+    var index = allNodeUrls.indexOf(currentNodeUrl) + 1;
+    if(index >= allNodeUrls.length) return;
+    var nextNodeUrl = allNodeUrls[index];
+    currentNodeUrl = nextNodeUrl;
+    $('.sitemapPageLink[nodeUrl="' + nextNodeUrl + '"]').parent().mousedown();
+};
+
+var openPreviousPage = $axure.player.openPreviousPage = function () {
+    var index = allNodeUrls.indexOf(currentNodeUrl) - 1;
+    if(index < 0) return;
+    var nextNodeUrl = allNodeUrls[index];
+    currentNodeUrl = nextNodeUrl;
+    $('.sitemapPageLink[nodeUrl="' + nextNodeUrl + '"]').parent().mousedown();
+};
+
+// use this to isolate the scope
+(function() {
+
+    var SHOW_HIDE_ANIMATION_DURATION = 0;
+
+    var HIGHLIGHT_INTERACTIVE_VAR_NAME = 'hi';
+
+    var currentPageLoc = '';
+    var currentPlayerLoc = '';
+    var currentPageHashString = '';
+
+    $(window.document).ready(function() {
+        $axure.player.createPluginHost({
+            id: 'sitemapHost',
+            context: 'project',
+            title: 'Project Pages',
+            gid: 1,
+        });
+
+        $(window.document).bind('keyup', function (e) {
+            if (e.target.localName == "textarea" || e.target.localName == "input" || event.target.isContentEditable) return;
+            switch(e.which) {
+                case 188:
+                    openPreviousPage();
+                    break;
+                case 190:
+                    openNextPage();
+                    break;
+                default: return; // exit this handler for other keys
+            }
+        });
+
+        generateSitemap();
+        var pageCount = $('.sitemapPageLink').length;
+        
+        $('.leftArrow').click(openPreviousPage);
+        $('.rightArrow').click(openNextPage);
+
+        $('.sitemapPlusMinusLink').click(collapse_click);
+        $('.sitemapPageLink').parent().mousedown(node_click);
+
+        $('#interfaceAdaptiveViewsListContainer').hide();
+
+        $('#projectOptionsShowHotspots').click(showHotspots_click);
+        $('#searchIcon').click(searchBoxClose_click);
+        $('#searchDiv').click(searchBoxExpand_click);
+        $('#searchBox').keyup(search_input_keyup);
+
+        // bind to the page load
+        $axure.page.bind('load.sitemap', function() {
+            currentPageLoc = $axure.page.location.split("#")[0];
+            var decodedPageLoc = decodeURI(currentPageLoc);
+            currentNodeUrl = decodedPageLoc.substr(decodedPageLoc.lastIndexOf('/') ? decodedPageLoc.lastIndexOf('/') + 1 : 0);
+            currentPlayerLoc = $(location).attr('href').split("#")[0].split("?")[0];
+            currentPageHashString = '#p=' + currentNodeUrl.substr(0, currentNodeUrl.lastIndexOf('.'));
+
+            $axure.player.setVarInCurrentUrlHash(PAGE_ID_NAME, $axure.player.getPageIdByUrl(currentNodeUrl));
+            $axure.player.setVarInCurrentUrlHash(PAGE_URL_NAME, currentNodeUrl.substring(0, currentNodeUrl.lastIndexOf('.html')));
+
+            $('#sitemapTreeContainer').find('.sitemapHighlight').removeClass('sitemapHighlight');
+            var $currentNode = $('.sitemapPageLink[nodeUrl="' + currentNodeUrl + '"]');
+            $currentNode.parent().parent().addClass('sitemapHighlight');
+
+            var pageName = $axure.page.pageName;
+            $('.pageNameHeader').html(pageName);
+
+            if ($currentNode.length > 0 && pageCount > 1) {
+                var currentNode = $currentNode[0];
+                var currentNum = $('.sitemapPageLink').index(currentNode) + 1;
+                $('.pageCountHeader').html('(' + currentNum + ' of ' + pageCount + ')');
+            } else $('.pageCountHeader').html('');
+
+            //If highlight var is present and set to 1 or else if
+            //sitemap highlight button is selected then highlight interactive elements
+            var hiVal = $axure.player.getHashStringVar(HIGHLIGHT_INTERACTIVE_VAR_NAME);
+            if(hiVal.length > 0 && hiVal == 1) {
+                $('#showHotspotsOption').find('.overflowOptionCheckbox').addClass('selected');
+                if ($('#projectOptionsHotspotsCheckbox').length > 0) $('#projectOptionsHotspotsCheckbox').addClass('selected');
+                $axure.messageCenter.postMessage('highlightInteractive', true);
+            } else if ($('#showHotspotsOption').find('.overflowOptionCheckbox').hasClass('selected')) {
+                $axure.messageCenter.postMessage('highlightInteractive', true);
+            }
+
+            generateAdaptiveViews(false);
+            if (MOBILE_DEVICE) generateAdaptiveViews(true);
+
+            $axure.player.suspendRefreshViewPort = true;
+
+            //Set the current view if it is defined in the hash string
+            //If the view is invalid, set it to 'auto' in the string
+            //ELSE set the view based on the currently selected view in the toolbar menu
+            var viewStr = $axure.player.getHashStringVar(ADAPTIVE_VIEW_VAR_NAME);
+            if(viewStr.length > 0) {
+                var $view = $('.adaptiveViewOption[val="' + viewStr + '"]');
+                if($view.length > 0) $view.click();
+                else $('.adaptiveViewOption[val="auto"]').click();
+            } else if($('.selectedRadioButton').length > 0) {
+                var $viewOption = $('.selectedRadioButton').parents('.adaptiveViewOption');
+                $viewOption.click();
+            }
+            updateAdaptiveViewHeader();
+
+            function setDefaultScaleForDevice() {
+                if(MOBILE_DEVICE && $axure.player.isMobileMode()) {
+                    $('.projectOptionsScaleRow[val="0"]').click();
+                } else {
+                    $('.vpScaleOption[val="0"]').click();
+                }
+            }
+
+            var scaleStr = $axure.player.getHashStringVar(SCALE_VAR_NAME);
+            if(scaleStr.length > 0) {
+                var $scale = $('.vpScaleOption[val="' + scaleStr + '"]');
+                if($scale.length > 0) $scale.click();
+                else setDefaultScaleForDevice();
+            } else {
+                setDefaultScaleForDevice();
+            }
+
+            var rotateStr = $axure.player.getHashStringVar(ROT_VAR_NAME);
+            if(rotateStr.length > 0) {
+                $('#vpRotate').prop('checked', true);
+            }
+
+            $axure.player.suspendRefreshViewPort = false;
+
+            if (!$axure.player.isViewOverridden()) $axure.messageCenter.postMessage('setAdaptiveViewForSize', { 'width': $('#mainPanel').width(), 'height': $('#mainPanel').height() });
+
+            $axure.player.refreshViewPort();
+
+            $axure.messageCenter.postMessage('finishInit');
+
+            showMainPanel();
+            return false;
+        });
+
+        var $vpContainer = $('#interfaceScaleListContainer');
+        
+        var scaleOptions = '<div class="vpScaleOption" val="0"><div class="scaleRadioButton"><div class="selectedRadioButtonFill"></div></div>Default Scale</div>';
+        scaleOptions += '<div class="vpScaleOption" val="1"><div class="scaleRadioButton"><div class="selectedRadioButtonFill"></div></div>Scale to Width</div>';
+        scaleOptions += '<div class="vpScaleOption" val="2"><div class="scaleRadioButton"><div class="selectedRadioButtonFill"></div></div>Scale to Fit</div>';
+        $(scaleOptions).appendTo($vpContainer);
+
+        $('#overflowMenuContainer').append('<div id="showHotspotsOption" class="showOption" style="order: 1"><div class="overflowOptionCheckbox"></div>Show Hotspots</div>');
+        $('#overflowMenuContainer').append($vpContainer);
+        $vpContainer.show();
+
+        $('#showHotspotsOption').click(showHotspots_click);
+        $('.vpScaleOption').click(vpScaleOption_click);
+        $('.vpScaleOption').mouseup(function (event) {
+            event.stopPropagation();
+        });
+
+        if (MOBILE_DEVICE) {
+            var scaleOptions = '<div class="projectOptionsScaleRow" val="1"><div class="scaleRadioButton"><div class="selectedRadioButtonFill"></div></div>Scale to fit width</div>';
+            scaleOptions += '<div class="projectOptionsScaleRow" val="0"><div class="scaleRadioButton"><div class="selectedRadioButtonFill"></div></div>Original size (100%)</div>';
+            scaleOptions += '<div class="projectOptionsScaleRow" val="2" style="border-bottom: solid 1px #c7c7c7"><div class="scaleRadioButton"><div class="selectedRadioButtonFill"></div></div>Fit all to screen</div>';
+            $(scaleOptions).appendTo($('#projectOptionsScaleContainer'));
+
+            $('.projectOptionsScaleRow').click(vpScaleOption_click);
+        }
+
+        $('#searchBox').focusin(function() {
+            if($(this).is('.searchBoxHint')) {
+                $(this).val('');
+                $(this).removeClass('searchBoxHint');
+            }
+        }).focusout(function() {
+            if($(this).val() == '') {
+                $(this).addClass('searchBoxHint');
+            }
+        });
+
+
+        $('#searchBox').focusout();
+    });
+
+    var _formatViewDimension = function(dim) {
+        if(dim == 0) return 'any';
+        if(dim.toString().includes('.')) return dim.toFixed(2);
+        return dim;
+    };
+
+    function generateAdaptiveViews(forProjectOptions) {
+        var $container = forProjectOptions ? $('#projectOptionsAdaptiveViewsContainer') : $('#interfaceAdaptiveViewsListContainer');
+        var $viewSelect = forProjectOptions ? $('#projectOptionsViewSelect') : $('#viewSelect');
+        var adaptiveViewOptionClass = forProjectOptions ? 'projectOptionsAdaptiveViewRow' : 'adaptiveViewOption';
+        var currentViewClass = forProjectOptions ? '' : 'currentAdaptiveView';
+
+        $container.empty();
+        $viewSelect.empty();
+
+        //Fill out adaptive view container with prototype's defined adaptive views, as well as the default, and Auto
+        var viewsList = '<div class="' + adaptiveViewOptionClass + '" val="auto"><div class="adapViewRadioButton selectedRadioButton"><div class="selectedRadioButtonFill"></div></div>Adaptive</div>';
+        var viewSelect = '<option value="auto">Adaptive</option>';
+        if (typeof $axure.page.defaultAdaptiveView.name != 'undefined') {
+            //If the name is a blank string, make the view name the width if non-zero, else 'any'
+            var defaultView = $axure.page.defaultAdaptiveView;
+            var defaultViewName = defaultView.name;
+
+            var widthString = _formatViewDimension(defaultView.size.width);
+            var heightString = _formatViewDimension(defaultView.size.height);
+
+            var viewString = defaultViewName + ' (' + widthString + ' x ' + heightString + ')';
+
+            viewsList += '<div class="' + adaptiveViewOptionClass + ' ' + currentViewClass + '" val="default"data-dim="' + defaultView.size.width + 'x' + defaultView.size.height + '">' +
+                '<div class="adapViewRadioButton"><div class="selectedRadioButtonFill"></div></div>' + viewString + '</div>';
+            viewSelect += '<option value="default">' + viewString + '</option>';
+        }
+
+        var useViews = $axure.document.configuration.useViews;
+        var hasViews = false;
+        if(useViews) {
+            for(var viewIndex = 0; viewIndex < $axure.page.adaptiveViews.length; viewIndex++) {
+                var currView = $axure.page.adaptiveViews[viewIndex];
+
+                var widthString = _formatViewDimension(currView.size.width);
+                var heightString = _formatViewDimension(currView.size.height);
+
+                var viewString = currView.name + ' (' + widthString + ' x ' + heightString + ')';
+                viewsList += '<div class="' + adaptiveViewOptionClass +
+                    ((forProjectOptions && (viewIndex == $axure.page.adaptiveViews.length - 1)) ? '" style="border-bottom: solid 1px #c7c7c7; margin-bottom: 15px;' : '') + 
+                    '" val="' +
+                    currView.id +
+                    '"  data-dim="' +
+                    currView.size.width +
+                    'x' +
+                    currView.size.height +
+                    '"><div class="adapViewRadioButton"><div class="selectedRadioButtonFill"></div></div>' +
+                    viewString +
+                    '</div>';
+                viewSelect += '<option value="' + currView.id + '">' + viewString + '</option>';
+
+                hasViews = true;
+            }
+        }
+
+        $container.append(viewsList);
+        $viewSelect.append(viewSelect);
+
+        if (!hasViews) {
+            if (forProjectOptions) {
+                $('#projectOptionsAdaptiveViewsHeader').hide();
+                $('#projectOptionsAdaptiveViewsContainer').hide();
+            } else $('#interfaceAdaptiveViewsContainer').hide();
+        } else {
+            if (forProjectOptions) {
+                $('#projectOptionsAdaptiveViewsHeader').show();
+                $('#projectOptionsAdaptiveViewsContainer').show();
+            } else $('#interfaceAdaptiveViewsContainer').show();
+        }
+
+        $(('.' + adaptiveViewOptionClass)).click(adaptiveViewOption_click);
+
+        if (!forProjectOptions) {
+            $(('.' + adaptiveViewOptionClass)).mouseup(function (event) {
+                event.stopPropagation();
+            });
+        }
+    }
+
+
+    function collapse_click(event) {
+        if($(this).children('.sitemapPlus').length > 0) {
+            expand_click($(this));
+        } else {
+            $(this)
+                .children('.sitemapMinus').removeClass('sitemapMinus').addClass('sitemapPlus').end()
+                .closest('li').children('ul').hide(SHOW_HIDE_ANIMATION_DURATION);
+        }
+        event.stopPropagation();
+    }
+
+    function expand_click($this) {
+        $this
+            .children('.sitemapPlus').removeClass('sitemapPlus').addClass('sitemapMinus').end()
+            .closest('li').children('ul').show(SHOW_HIDE_ANIMATION_DURATION);
+    }
+
+    function searchBoxExpand_click(event) {
+        if (!$('#searchIcon').hasClass('sitemapToolbarButtonSelected')) {
+            $('#searchIcon').addClass('sitemapToolbarButtonSelected')
+            $('#searchBox').width(0);
+            $('#searchBox').show();
+            $('#searchBox').animate({ width: '95%' }, { duration: 200, complete: function () { $('#searchBox').focus(); } });
+        }
+    }
+
+    function searchBoxClose_click(event) {
+        if ($('#searchIcon').hasClass('sitemapToolbarButtonSelected')) {
+            $('#searchBox').animate({ width: '0%' }, { duration: 200,
+                complete: function () {
+                    $('#searchBox').hide();
+                    $('#searchIcon').removeClass('sitemapToolbarButtonSelected')
+                }});
+            $('#searchBox').val('');
+            $('#searchBox').keyup();
+        }
+    }
+
+    function node_click(event) {
+        hideMainPanel();
+        $('#sitemapTreeContainer').find('.sitemapHighlight').removeClass('sitemapHighlight');
+        $(this).parent().addClass('sitemapHighlight');
+        $axure.page.navigate($(this).children('.sitemapPageLink')[0].getAttribute('nodeUrl'), true);
+    }
+
+    function hideMainPanel() {
+        $('#mainPanel').css('opacity', '0');
+        $('#clippingBounds').css('opacity', '0');
+    }
+    function showMainPanel() {
+        $('#mainPanel').animate({ opacity: 1 }, 10);
+        $('#clippingBounds').animate({ opacity: 1 }, 10);
+    }
+
+    $axure.messageCenter.addMessageListener(function(message, data) {
+        if(message == 'adaptiveViewChange') {
+            $('.adaptiveViewOption').removeClass('currentAdaptiveView');
+            if(data.viewId) {$('.adaptiveViewOption[val="' + data.viewId + '"]').addClass('currentAdaptiveView');}
+            else $('.adaptiveViewOption[val="default"]').addClass('currentAdaptiveView');
+
+            //when we set adaptive view through user event, we want to update the checkmark on sitemap
+            if(data.forceSwitchTo) {
+                $('.adapViewRadioButton').find('.selectedRadioButtonFill').hide();
+                $('.adapViewRadioButton').removeClass('selectedRadioButton');
+                $('div[val="' + data.forceSwitchTo + '"]').find('.adapViewRadioButton').addClass('selectedRadioButton');
+                $('div[val="' + data.forceSwitchTo + '"]').find('.selectedRadioButtonFill').show();
+            }
+
+            updateAdaptiveViewHeader();
+            $axure.player.refreshViewPort();
+
+        } else if(message == 'previousPage') {
+            openPreviousPage();
+        } else if(message == 'nextPage') {
+            openNextPage();
+        }
+    });
+
+    $axure.player.toggleHotspots = function (val) {
+        var overflowMenuCheckbox = $('#showHotspotsOption').find('.overflowOptionCheckbox');
+        if ($(overflowMenuCheckbox).hasClass('selected')) {
+            if (!val) $('#showHotspotsOption').click();
+        } else {
+            if (val) $('#showHotspotsOption').click();
+        }
+    }
+
+    function showHotspots_click(event) {
+        var overflowMenuCheckbox = $('#showHotspotsOption').find('.overflowOptionCheckbox');
+        var projOptionsCheckbox = $('#projectOptionsHotspotsCheckbox');
+
+        if ($(overflowMenuCheckbox).hasClass('selected')) {
+            overflowMenuCheckbox.removeClass('selected');
+            if (projOptionsCheckbox.length > 0 ) projOptionsCheckbox.removeClass('selected');
+            $axure.messageCenter.postMessage('highlightInteractive', false);
+            //Delete 'hi' hash string var if it exists since default is unselected
+            $axure.player.deleteVarFromCurrentUrlHash(HIGHLIGHT_INTERACTIVE_VAR_NAME);
+        } else {
+            overflowMenuCheckbox.addClass('selected');
+            if (projOptionsCheckbox.length > 0) projOptionsCheckbox.addClass('selected');
+            $axure.messageCenter.postMessage('highlightInteractive', true);
+            //Add 'hi' hash string var so that stay highlighted across reloads
+            $axure.player.setVarInCurrentUrlHash(HIGHLIGHT_INTERACTIVE_VAR_NAME, 1);
+        }
+    }
+
+
+    function adaptiveViewOption_click(event) {
+        var currVal = $(this).attr('val');
+
+        $('.adaptiveViewOption').removeClass('currentAdaptiveView');
+        if(currVal) {$('.adaptiveViewOption[val="' + currVal + '"]').addClass('currentAdaptiveView');}
+        else $('.adaptiveViewOption[val="default"]').addClass('currentAdaptiveView');
+
+        $('.adapViewRadioButton').find('.selectedRadioButtonFill').hide();
+        $('.adapViewRadioButton').removeClass('selectedRadioButton');
+        $('div[val="' + currVal + '"]').find('.adapViewRadioButton').addClass('selectedRadioButton');
+        $('div[val="' + currVal + '"]').find('.selectedRadioButtonFill').show();
+
+        selectAdaptiveView(currVal);
+        $axure.player.closePopup();
+        updateAdaptiveViewHeader();
+    }
+
+    var selectAdaptiveView = $axure.player.selectAdaptiveView = function(currVal) {
+        if (currVal == 'auto') {
+            $axure.messageCenter.postMessage('setAdaptiveViewForSize', { 'width': $('#mainPanel').width(), 'height': $('#mainPanel').height() });
+            $axure.player.deleteVarFromCurrentUrlHash(ADAPTIVE_VIEW_VAR_NAME);
+        } else {
+            currentPageLoc = $axure.page.location.split("#")[0];
+            var decodedPageLoc = decodeURI(currentPageLoc);
+            var nodeUrl = decodedPageLoc.substr(decodedPageLoc.lastIndexOf('/')
+                ? decodedPageLoc.lastIndexOf('/') + 1
+                : 0);
+            var adaptiveData = {
+                src: nodeUrl
+            };
+
+            adaptiveData.view = currVal;
+            $axure.messageCenter.postMessage('switchAdaptiveView', adaptiveData);
+            $axure.player.setVarInCurrentUrlHash(ADAPTIVE_VIEW_VAR_NAME, currVal);
+        }
+    }
+
+    $axure.player.updateAdaptiveViewHeader = updateAdaptiveViewHeader = function () {
+        var hasDefinedDim = true;
+        var dimensionlessViewStr = '(any x any)';
+
+        var viewString = $('.adaptiveViewOption.currentAdaptiveView').text();
+        if (viewString != null && viewString.indexOf(dimensionlessViewStr) >= 0) hasDefinedDim = false;
+
+        if (!hasDefinedDim) {
+            var viewName = viewString.substring(0, viewString.lastIndexOf(' ('));
+            var widthString = $('#mainPanelContainer').width();
+            viewString = viewName + ' (' + widthString + ' x any)';
+        }
+
+        $('.adaptiveViewHeader').html(viewString);
+    }
+
+    $axure.player.selectScaleOption = function (scaleVal) {
+        var $scale = $('.vpScaleOption[val="' + scaleVal + '"]');
+        if ($scale.length > 0) $scale.click();
+    }
+
+    function vpScaleOption_click(event) {
+        var scaleCheckDiv = $(this).find('.scaleRadioButton');
+        var scaleVal = $(this).attr('val');
+        if (scaleCheckDiv.hasClass('selectedRadioButton')) return false;
+
+        var $selectedScaleOption = $('.vpScaleOption[val="' + scaleVal + '"], .projectOptionsScaleRow[val="' + scaleVal + '"]');
+        var $allScaleOptions = $('.vpScaleOption, .projectOptionsScaleRow');
+        $allScaleOptions.find('.scaleRadioButton').removeClass('selectedRadioButton');
+        $allScaleOptions.find('.selectedRadioButtonFill').hide();
+        $selectedScaleOption.find('.scaleRadioButton').addClass('selectedRadioButton');
+        $selectedScaleOption.find('.selectedRadioButtonFill').show();
+
+        if (scaleVal == '0') {
+            $axure.player.deleteVarFromCurrentUrlHash(SCALE_VAR_NAME);
+        } else if (typeof scaleVal !== 'undefined') {
+            $axure.player.setVarInCurrentUrlHash(SCALE_VAR_NAME, scaleVal);
+        }
+
+        $axure.player.refreshViewPort();
+    }
+
+    function search_input_keyup(event) {
+        var searchVal = $(this).val().toLowerCase();
+        //If empty search field, show all nodes, else grey+hide all nodes and
+        //ungrey+unhide all matching nodes, as well as unhide their parent nodes
+        if(searchVal == '') {
+            $('.sitemapPageName').removeClass('sitemapGreyedName');
+            $('.sitemapNode').show();
+        } else {
+            $('.sitemapNode').hide();
+
+            $('.sitemapPageName').addClass('sitemapGreyedName').each(function() {
+                var nodeName = $(this).text().toLowerCase();
+                if(nodeName.indexOf(searchVal) != -1) {
+                    $(this).removeClass('sitemapGreyedName').parents('.sitemapNode:first').show().parents('.sitemapExpandableNode').show();
+                }
+            });
+        }
+    }
+
+
+    function generateSitemap() {
+        var treeUl = "<div id='sitemapHeader'' class='sitemapHeader'>";
+        treeUl += "<div id='sitemapToolbar' class='sitemapToolbar'>";
+
+        treeUl += '<div id="searchDiv"><span id="searchIcon" class="sitemapToolbarButton"></span><input id="searchBox" type="text"/></div>';
+        treeUl += "<div class='leftArrow sitemapToolbarButton'></div>";
+        treeUl += "<div class='rightArrow sitemapToolbarButton'></div>";
+
+        treeUl += "</div>";
+        treeUl += "</div>";
+
+        ///////////////////
+
+        var sitemapTitle = $axure.player.getProjectName();
+        if (!sitemapTitle) sitemapTitle = "Pages";
+        treeUl += "<div class='sitemapPluginNameHeader pluginNameHeader'>" + sitemapTitle + "</div>";
+
+        treeUl += "<div id='sitemapTreeContainer'>";
+        treeUl += "<ul class='sitemapTree' style='clear:both;'>";
+        var rootNodes = $axure.document.sitemap.rootNodes;
+        for(var i = 0; i < rootNodes.length; i++) {
+            treeUl += generateNode(rootNodes[i], 0);
+        }
+        treeUl += "</ul></div>";
+
+        if (!MOBILE_DEVICE) {
+            treeUl += "<div id='changePageInstructions' class='pageSwapInstructions'>Use  ";
+            treeUl += '<span class="backKeys"></span>';
+            treeUl += "  and  ";
+            treeUl += '<span class="forwardKeys"></span>';
+            treeUl += "  keys<br>to move between pages";
+            treeUl += "</div>";
+        }
+
+        $('#sitemapHost').html(treeUl);
+    }
+
+    function generateNode(node, level) {
+        var hasChildren = (node.children && node.children.length > 0);
+        var margin, returnVal;
+        if(hasChildren) {
+            margin = (9 + level * 17);
+            returnVal = "<li class='sitemapNode sitemapExpandableNode'><div><div class='sitemapPageLinkContainer' style='margin-left:" + margin + "px'><a class='sitemapPlusMinusLink'><span class='sitemapMinus'></span></a>";
+        } else {
+            margin = (19 + level * 17);
+            returnVal = "<li class='sitemapNode sitemapLeafNode'><div><div class='sitemapPageLinkContainer' style='margin-left:" + margin + "px'>";
+        }
+
+        var isFolder = node.type == "Folder";
+        if(!isFolder) {
+            returnVal += "<a class='sitemapPageLink' nodeUrl='" + node.url + "'>";
+            allNodeUrls.push(node.url);
+        }
+        returnVal += "<span class='sitemapPageIcon";
+		if(node.type == "Flow"){ returnVal += " sitemapFlowIcon";}
+        if(isFolder) { returnVal += " sitemapFolderIcon"; }
+
+        returnVal += "'></span><span class='sitemapPageName'>";
+        returnVal += $('<div/>').text(node.pageName).html();
+        returnVal += "</span>";
+        if(!isFolder) returnVal += "</a>";
+        returnVal += "</div></div>";
+
+        if(hasChildren) {
+            returnVal += "<ul>";
+            for(var i = 0; i < node.children.length; i++) {
+                var child = node.children[i];
+                returnVal += generateNode(child, level + 1);
+            }
+            returnVal += "</ul>";
+        }
+        returnVal += "</li>";
+        return returnVal;
+    }
+})();
diff --git a/src_old/plugins/sitemap/styles/images/back_keys.svg b/src_old/plugins/sitemap/styles/images/back_keys.svg
new file mode 100644
index 0000000..205ef8b
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/back_keys.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+    <g fill="none" fill-rule="evenodd">
+        <rect width="18" height="18" x="1" y="1" stroke="#E1E0E0" stroke-width="2" rx="4"/>
+        <rect width="19" height="19" x=".5" y=".5" stroke="#979797" rx="4"/>
+        <path fill="#666" d="M9 5V4L4.448 6.5v1L9 9.5v-1C6.733 7.513 5.567 7.013 5.5 7c.069-.017 1.235-.683 3.5-2zM5.292 14.262a.675.675 0 0 1 .195-.477.676.676 0 0 1 .225-.147.753.753 0 0 1 .288-.054c.12 0 .227.022.321.066a.641.641 0 0 1 .234.183.827.827 0 0 1 .141.27c.032.102.048.213.048.333 0 .18-.026.367-.078.561a2.996 2.996 0 0 1-.222.576 3.439 3.439 0 0 1-.84 1.053l-.18-.174a.222.222 0 0 1-.078-.168c0-.052.028-.106.084-.162.04-.044.091-.103.153-.177s.125-.159.189-.255.123-.202.177-.318c.054-.116.093-.24.117-.372h-.078a.709.709 0 0 1-.282-.054.647.647 0 0 1-.219-.153.698.698 0 0 1-.144-.234.834.834 0 0 1-.051-.297z"/>
+    </g>
+</svg>
diff --git a/src_old/plugins/sitemap/styles/images/closed_item.svg b/src_old/plugins/sitemap/styles/images/closed_item.svg
new file mode 100644
index 0000000..cc96bf2
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/closed_item.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="5px" height="8px" viewBox="0 0 5 8" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+    <title>open item copy</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Tree-item" transform="translate(-6.000000, -9.000000)" fill="#8C8C8C">
+            <g id="closed-item" transform="translate(5.062500, 9.000000)">
+                <polygon id="Rectangle-13" transform="translate(3.500000, 4.000000) rotate(-90.000000) translate(-3.500000, -4.000000) " points="0 1.6 7 1.6 3.5 6.4"></polygon>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src_old/plugins/sitemap/styles/images/flow.svg b/src_old/plugins/sitemap/styles/images/flow.svg
new file mode 100644
index 0000000..228330a
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/flow.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="13" height="13" viewBox="0 0 13 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+ <g id="Page-1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+  <g id="flow" sketch:type="MSArtboardGroup">
+   <rect id="Rectangle-38" fill="#62666b" sketch:type="MSShapeGroup" x="1" y="10" width="3" height="3"/>
+   <rect id="Rectangle-38-Copy" fill="#62666b" sketch:type="MSShapeGroup" x="9" y="10" width="3" height="3"/>
+   <path d="M6.90806226,0.277785818 C8.60537484,1.36088413 12,3.52708074 12,3.52708074 L6.47274687,7 L1,3.52708074 L6.47274687,0 C6.47274687,0 6.76295713,0.185190545 6.90806226,0.277785818 Z" id="Shape" fill="#62666b" sketch:type="MSShapeGroup"/>
+   <path d="M7.33917705,2.07093789 C8.05945137,2.55245016 9.5,3.51547471 9.5,3.51547471 L6.48513465,5.5 L3.5,3.51547471 L6.48513465,1.5 C6.48513465,1.5 7.05449625,1.88062526 7.33917705,2.07093789 Z" id="Shape-Copy-3" fill="#ffffff" sketch:type="MSShapeGroup"/>
+   <path d="M2.45,9 L10.55,9 L11,9 L11,8 L10.55,8 L2.45,8 L2,8 L2,9 L2.45,9 L2.45,9 Z" id="Shape" fill="#62666b" sketch:type="MSShapeGroup"/>
+   <path d="M7,7.66666667 L7,6.33333333 L7,6 L6,6 L6,6.33333333 L6,7.66666667 L6,8 L7,8 L7,7.66666667 L7,7.66666667 Z" id="Shape" fill="#62666b" sketch:type="MSShapeGroup"/>
+   <path d="M3,10.6666667 L3,9.33333333 L3,9 L2,9 L2,9.33333333 L2,10.6666667 L2,11 L3,11 L3,10.6666667 L3,10.6666667 Z" id="Shape-Copy" fill="#62666b" sketch:type="MSShapeGroup"/>
+   <path d="M11,10.6666667 L11,9.33333333 L11,9 L10,9 L10,9.33333333 L10,10.6666667 L10,11 L11,11 L11,10.6666667 L11,10.6666667 Z" id="Shape-Copy-2" fill="#62666b" sketch:type="MSShapeGroup"/>
+  </g>
+ </g>
+</svg>
diff --git a/src_old/plugins/sitemap/styles/images/folder_closed_blue.svg b/src_old/plugins/sitemap/styles/images/folder_closed_blue.svg
new file mode 100644
index 0000000..f1fc99b
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/folder_closed_blue.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+    <g fill="#138CDE" fill-rule="evenodd">
+        <path d="M2 4.061h11v8.485H2z"/>
+        <path d="M2 3h4.583v3.182H2z"/>
+    </g>
+</svg>
diff --git a/src_old/plugins/sitemap/styles/images/forward_keys.svg b/src_old/plugins/sitemap/styles/images/forward_keys.svg
new file mode 100644
index 0000000..cb04793
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/forward_keys.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
+    <g fill="none" fill-rule="evenodd">
+        <rect width="18" height="18" x="1" y="1" stroke="#E1E0E0" stroke-width="2" rx="4"/>
+        <rect width="19" height="19" x=".5" y=".5" stroke="#979797" rx="4"/>
+        <path fill="#666" d="M4.448 8.5v1L9 7V6L4.448 4v1c2.267.987 3.433 1.487 3.5 1.5-.069.017-1.235.683-3.5 2z"/>
+        <text fill="#666" font-family="Lato-Regular, Lato" font-size="12">
+            <tspan x="4.728" y="16">.</tspan>
+        </text>
+    </g>
+</svg>
diff --git a/src_old/plugins/sitemap/styles/images/left_arrow.svg b/src_old/plugins/sitemap/styles/images/left_arrow.svg
new file mode 100644
index 0000000..c1d72ba
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/left_arrow.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="11" viewBox="0 0 6 11">
+    <path fill="#6D6D6D" fill-rule="evenodd" d="M5.5 11L0 5.5 5.5 0v2L2 5.5 5.5 9z"/>
+</svg>
diff --git a/src_old/plugins/sitemap/styles/images/open_item.svg b/src_old/plugins/sitemap/styles/images/open_item.svg
new file mode 100644
index 0000000..062b37c
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/open_item.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="9px" height="10px" viewBox="0 0 9 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+    <title>open item</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="open-item" fill="#8C8C8C">
+            <polygon id="Rectangle-13" points="0 0 9 0 4.5 6"></polygon>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src_old/plugins/sitemap/styles/images/page_lt_grey.svg b/src_old/plugins/sitemap/styles/images/page_lt_grey.svg
new file mode 100644
index 0000000..15e33b0
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/page_lt_grey.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="9" height="11" viewBox="0 0 9 11">
+    <g fill="none" fill-rule="evenodd" stroke="#979797">
+        <path d="M.5.5h8v10h-8z"/>
+        <path stroke-linecap="square" d="M2.5 7.5h4M2.5 3.5h4M2.5 5.5h4"/>
+    </g>
+</svg>
diff --git a/src_old/plugins/sitemap/styles/images/right_arrow.svg b/src_old/plugins/sitemap/styles/images/right_arrow.svg
new file mode 100644
index 0000000..f21915b
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/right_arrow.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="11" viewBox="0 0 6 11">
+    <path fill="#6D6D6D" fill-rule="evenodd" d="M.5 11L6 5.5.5 0v2L4 5.5.5 9z"/>
+</svg>
diff --git a/src_old/plugins/sitemap/styles/images/search_off.svg b/src_old/plugins/sitemap/styles/images/search_off.svg
new file mode 100644
index 0000000..55f40fe
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/search_off.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+    <g fill="none" fill-rule="evenodd" stroke="#018DCC" transform="translate(1 1)">
+        <path stroke-linecap="square" d="M6.5 6.5l2.791 2.865"/>
+        <circle cx="3.5" cy="3.5" r="3.5"/>
+    </g>
+</svg>
diff --git a/src_old/plugins/sitemap/styles/images/search_on.svg b/src_old/plugins/sitemap/styles/images/search_on.svg
new file mode 100644
index 0000000..c813852
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/search_on.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+    <g fill="none" fill-rule="evenodd" stroke="#535353" transform="translate(1 1)">
+        <path stroke-linecap="square" d="M6.5 6.5l2.791 2.865"/>
+        <circle cx="3.5" cy="3.5" r="3.5"/>
+    </g>
+</svg>
diff --git a/src_old/plugins/sitemap/styles/images/sitemap_panel_off.svg b/src_old/plugins/sitemap/styles/images/sitemap_panel_off.svg
new file mode 100644
index 0000000..93cec71
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/sitemap_panel_off.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="14" viewBox="0 0 16 14">
+    <path fill="#008DCB" fill-rule="nonzero" d="M14.965 6C15.532 6 16 6.433 16 7s-.434 1-1.002 1H1.002A.983.983 0 0 1 0 7c0-.567.434-1 1.002-1h13.963zm-4.001 6c.568 0 1.036.433 1.036 1s-.435 1-1.003 1H1.003A.984.984 0 0 1 0 13c0-.567.435-1 1.003-1h9.96zM1.003 2A.984.984 0 0 1 0 1c0-.567.435-1 1.003-1h9.994A.984.984 0 0 1 12 1c0 .567-.435 1-1.003 1H1.003z"/>
+</svg>
diff --git a/src_old/plugins/sitemap/styles/images/sitemap_panel_on.svg b/src_old/plugins/sitemap/styles/images/sitemap_panel_on.svg
new file mode 100644
index 0000000..701e8b0
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/images/sitemap_panel_on.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="14" viewBox="0 0 16 14">
+    <path fill="#6D6D6D" fill-rule="nonzero" d="M14.965 6C15.532 6 16 6.433 16 7s-.434 1-1.002 1H1.002A.983.983 0 0 1 0 7c0-.567.434-1 1.002-1h13.963zm-4.001 6c.568 0 1.036.433 1.036 1s-.435 1-1.003 1H1.003A.984.984 0 0 1 0 13c0-.567.435-1 1.003-1h9.96zM1.003 2A.984.984 0 0 1 0 1c0-.567.435-1 1.003-1h9.994A.984.984 0 0 1 12 1c0 .567-.435 1-1.003 1H1.003z"/>
+</svg>
diff --git a/src_old/plugins/sitemap/styles/sitemap.css b/src_old/plugins/sitemap/styles/sitemap.css
new file mode 100644
index 0000000..428335b
--- /dev/null
+++ b/src_old/plugins/sitemap/styles/sitemap.css
@@ -0,0 +1,384 @@
+
+#sitemapHost {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+}
+
+#sitemapHostBtn a {
+    background: url('images/sitemap_panel_on.svg') no-repeat center center, linear-gradient(transparent, transparent);
+}
+
+#sitemapHostBtn a.selected, #sitemapHostBtn a.selected:hover {
+    background: url('images/sitemap_panel_off.svg') no-repeat center center, linear-gradient(transparent, transparent);
+}
+
+#sitemapHost .pageButtonHeader {
+    top: -27px;
+}
+
+#sitemapTreeContainer {
+    overflow: auto;
+    width: 100%;
+    flex: 1;
+    -webkit-overflow-scrolling: touch;
+}
+
+.mobileMode #sitemapTreeContainer {
+    margin-left: 5px;
+    overflow-x: hidden;
+}
+
+.sitemapTree {
+    margin: 0px 0px 10px 0px;
+    overflow:visible;
+}
+
+.sitemapTree ul {
+    list-style-type: none;
+    margin: 0px 0px 0px 0px;
+    padding-left: 0px;
+}
+
+ul.sitemapTree {
+    display: inline-block;
+    min-width: 100%;
+}
+
+.pageSwapInstructions {
+    width: 129px;
+    font-size: 12px;
+    text-align: center;
+    color: #8c8c8c;
+    margin: 0 auto;
+    padding: 12px 0px;
+    line-height: 20px;
+}
+
+.sitemapMinus, .sitemapPlus {
+	vertical-align:middle;
+    background-repeat: no-repeat;
+	margin-right: 3px;	
+    width: 7px;
+    height: 8px;
+    object-fit: contain;
+    display:inline-block;
+}
+    .sitemapMinus {
+        margin-bottom: 0px;
+        background: url('images/open_item.svg') no-repeat center center, linear-gradient(transparent,transparent);
+    }
+    .sitemapPlus {
+        margin-bottom: 2px;
+        background: url('images/closed_item.svg') no-repeat center center, linear-gradient(transparent,transparent);
+    }
+
+.mobileMode .sitemapMinus, .mobileMode .sitemapPlus {
+    width: 10.5px;
+    height: 12px;
+    margin-right: 5px;	
+    background-size: contain;
+}
+
+.sitemapPageLink {
+    margin-left: 0px;
+}
+
+.sitemapPageIcon {
+	margin: 0px 6px -3px 3px;
+    width: 16px;
+    height: 16px;
+    display: inline-block;
+    background: url('images/page_lt_grey.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+.mobileMode .sitemapPageIcon {
+    margin-right: 7px;	
+    background-size: contain;
+}
+
+.sitemapFolderIcon {
+    background: url('images/folder_closed_blue.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+.mobileMode .sitemapFolderIcon {
+    width: 18px;
+    height: 18px;
+    margin-left: 1px;
+    background-position-y: 1px;
+    background-size: contain;
+}
+
+.sitemapFlowIcon {
+    background: url('images/flow.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+.sitemapFolderOpenIcon {
+    background: url('images/folder_open.png') no-repeat center center;
+    background: url('images/folder_open.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+.sitemapPageName {
+    font-size: 14px;
+    line-height: 1.93;
+    color: #4a4a4a;
+}
+
+.sitemapPageName.mobileText {
+    line-height: 1.69;
+}
+
+.sitemapNode  {
+    white-space:nowrap;
+}
+
+.sitemapPageLinkContainer {
+    cursor: pointer;
+    padding-right: 10px;
+}
+
+.mobileMode .sitemapPageLinkContainer {
+    margin-bottom: 13px;
+}
+
+.sitemapHighlight {
+    background-color: #e6e6e6;
+}
+
+.sitemapGreyedName
+{
+	color: #AAA;
+}
+
+.sitemapPluginNameHeader {
+    margin: 13px 9px 5px 9px;
+    font-size: 14px;
+    color: #444444;
+}
+
+.sitemapHeader {
+    padding-top: 7px;
+}
+
+.mobileMode .sitemapHeader {
+    padding-top: 0px;
+}
+
+.sitemapToolbar {
+    margin: 0px 3px 0px 5px;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+}
+
+.sitemapToolbarButton {
+    width: 19px;
+    height: 18px;
+    border: 1px solid transparent;
+    cursor: pointer;
+    flex: 0 0 auto;
+}
+
+.hashover .sitemapToolbarButton:hover {
+    border-radius: 3px;
+    background-color: #e6e6e6 !important;
+}
+
+.sitemapToolbarButton.sitemapToolbarButtonSelected, .sitemapToolbarButton.sitemapToolbarButtonSelected:hover{
+    background-color: inherit !important;
+}
+
+.leftArrow {
+    background: url('images/left_arrow.svg') no-repeat center center, linear-gradient(transparent,transparent);
+    margin-left: 11px;
+}
+
+.rightArrow {
+    background: url('images/right_arrow.svg') no-repeat center center, linear-gradient(transparent,transparent);
+    margin-left: 3px;
+    margin-right: 2px;
+}
+
+#searchIcon {
+    width: 10px;
+    height: 10px;
+    object-fit: contain;
+    background: url('images/search_on.svg') no-repeat center center, linear-gradient(transparent,transparent);
+    vertical-align: bottom;
+    padding: 5px 4px 5px 4px;
+    display: inline-block;
+}
+
+#searchIcon.sitemapToolbarButtonSelected {
+    padding: 5px 3px 5px 5px;
+    border-top-left-radius: 5px;
+    border-bottom-left-radius: 5px;
+    border-left: solid 1px #cccccc;
+    border-top: solid 1px #cccccc;
+    border-bottom: solid 1px #cccccc;
+    background: url('images/search_off.svg') no-repeat center center, linear-gradient(transparent,transparent);
+    background-color: #FFFFFF !important;
+}
+
+.backKeys {
+    width: 20px;
+    height: 21px;
+    object-fit: contain;
+    vertical-align: bottom;
+    margin: 2px;
+    display: inline-block;
+    background: url('images/back_keys.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+.forwardKeys {
+    width: 20px;
+    height: 21px;
+    object-fit: contain;
+    vertical-align: bottom;
+    margin: 2px;
+    display: inline-block;
+    background: url('images/forward_keys.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+#interfaceAdaptiveViewsListContainer {
+    position: absolute;
+    display: none;
+    width: 220px;
+    left: 155px;
+    padding: 6px 9px;
+    top: 36px;
+}
+
+#interfaceScaleListContainer {
+    padding: 7.5px 9px 12px 16px;
+    margin-top: 9px;
+    border-top: solid 1px #bdbcbc;
+    order: 10;
+}
+
+.adaptiveViewOption, .vpPresetOption, .vpScaleOption {
+    padding: 3px 0px 3px 0px;
+    color: #3B3B3B;
+    display: flex;
+}
+
+.projectOptionsScaleRow, .projectOptionsAdaptiveViewRow, .projectOptionsHotspotsRow {
+    border-top: solid 1px #c7c7c7;
+    display: flex;
+    padding: 13px 7px 13px 0px;
+}
+
+.adaptiveViewOption:hover, .vpScaleOption:hover, .vpPresetOption:hover, .projectOptionsAdaptiveViewRow:hover, .projectOptionsScaleRow:hover
+{ 
+	cursor: pointer;
+}
+
+.scaleRadioButton, .adapViewRadioButton {
+    border: solid 1px #8c8c8c;
+    display: inline-block;
+    position: relative;
+    width: 12px;
+    height: 12px;
+    border-radius: 48px;
+    margin-right: 12px;
+    top: 2px;
+    flex-shrink: 0;
+}
+
+.mobileMode .scaleRadioButton, .mobileMode .adapViewRadioButton {
+    width: 20px;
+    height: 20px;
+    border-radius: 60px;
+    margin-right: 22px;
+    margin-left: 22px;
+    top: 0px;
+    flex-shrink: 0;
+}
+
+.selectedRadioButton {
+    border: solid 1px #20aca9;
+}
+
+.selectedRadioButtonFill { 
+    position: relative;
+    display: none;
+    background-color: #20aca9;
+    margin: auto;
+    width: 8px;
+    height: 8px;
+    border-radius: 30px;
+    top: 2px;
+}
+    .mobileMode .selectedRadioButtonFill {
+        width: 12px;
+        height: 12px;
+        border-radius: 48px;
+        top: 4px;
+    }
+
+#searchDiv {
+    display: flex;
+    margin-right: auto;
+    flex: 1;
+}
+
+#searchBox {
+    display: none;
+    width: 0%;
+    height: 22px;
+    padding-left: 5px;
+    border-radius: 0px 5px 5px 0px;
+    border-right: solid 1px #cccccc;
+    border-top: solid 1px #cccccc;
+    border-bottom: solid 1px #cccccc;
+    border-left: none;
+    -webkit-appearance: none;
+}
+
+#searchBox:focus {
+    outline-width: 0;
+}
+
+.searchBoxHint {
+	color: #8f949a;
+}
+
+#sitemapHost.popup #searchDiv{
+    display: none;
+}
+
+#sitemapHost.popup #sitemapHeader{
+    display: none;
+}
+
+#sitemapHost.popup #changePageInstructions{
+    display: none;
+}
+
+.mobileMode #sitemapHeader {
+    display: none;
+}
+
+
+
+/* Expo Sitemap
+******************************************************************************/
+
+.expoSitemapNode {
+    padding: 15px;
+    text-align: center;
+}
+
+.sitemapPageImg {
+    max-width: 90%;
+    max-height: 150px;
+}
+
+.popup .sitemapPageImg {
+    display: none;
+}
+
+.popup .expoSitemapNode {
+    padding: 0 0 0 10px;
+    text-align: left;
+}
\ No newline at end of file
diff --git a/src_old/resources/Other.html b/src_old/resources/Other.html
new file mode 100644
index 0000000..d0fa808
--- /dev/null
+++ b/src_old/resources/Other.html
@@ -0,0 +1,35 @@
+<html>
+	<head>
+		<title></title>
+	</head>
+	<body>
+	<br />
+	<div style="width:100%; text-align:center; font-family:Arial; font-size:12px;" id=other></div>
+	<br />
+	<div style="width:100%; text-align:center; font-family:Arial; font-size:12px;">
+	    <button onclick="parent.window.close();">
+		    Close
+	    </button>
+	</div>
+	
+	<SCRIPT src="axurerp_pagescript.js"></SCRIPT>
+	
+	<script language=javascript>
+	function getQueryVariable(variable) {
+      var query = window.location.hash.substring(1);
+      var vars = query.split("&&&");
+      for (var i=0;i<vars.length;i++) {
+        var pair = vars[i].split("=");
+        if (pair[0] == variable) {
+          return decodeURI(pair[1]);
+        }
+      } 
+    }
+
+	var other = document.getElementById('other');
+	other.innerHTML = getQueryVariable('other');
+
+	</script>
+	
+	</body>
+</html>
\ No newline at end of file
diff --git a/src_old/resources/chrome/allow-access.png b/src_old/resources/chrome/allow-access.png
new file mode 100644
index 0000000..eaa707f
Binary files /dev/null and b/src_old/resources/chrome/allow-access.png differ
diff --git a/src_old/resources/chrome/axure-chrome-extension.crx b/src_old/resources/chrome/axure-chrome-extension.crx
new file mode 100644
index 0000000..fde7743
Binary files /dev/null and b/src_old/resources/chrome/axure-chrome-extension.crx differ
diff --git a/src_old/resources/chrome/axure_logo.png b/src_old/resources/chrome/axure_logo.png
new file mode 100644
index 0000000..0882a16
Binary files /dev/null and b/src_old/resources/chrome/axure_logo.png differ
diff --git a/src_old/resources/chrome/chrome.html b/src_old/resources/chrome/chrome.html
new file mode 100644
index 0000000..e9a3ede
--- /dev/null
+++ b/src_old/resources/chrome/chrome.html
@@ -0,0 +1,187 @@
+<html>
+<head>
+    <title>Install the Axure RP Chrome Extension</title>
+    <style type="text/css">
+        *
+        {
+            font-family: NunitoSans, Helvetica, Arial, sans-serif;
+        }
+        body
+        {
+            text-align: center;
+            background-color: #fafafa;
+        }
+        p
+        {
+            font-size: 14px;
+            line-height: 18px;
+            color: #333333;
+        }
+        div.container
+        {
+            width: 980px;
+            margin-left: auto;
+            margin-right: auto;
+            text-align: left;
+        }
+        a
+        {
+            text-decoration: none;
+            color: #009dda;
+        }
+        .button
+        {
+            background: #A502B3;
+            font: normal 16px Arial, sans-serif;
+            color: #FFFFFF;
+            padding: 10px 30px 10px 30px;
+            border: 2px solid #A502B3;
+            display: inline-block;
+            margin-top: 10px;
+            text-transform: uppercase;
+            font-size: 14px;
+	    border-radius: 4px;
+        }
+        a:hover.button
+        {
+            border: 2px solid #A502B3;
+	    color: #A502B3;
+	    background-color: #FFFFFF;
+        }
+        div.left
+        {
+            width: 400px;
+            float: left;
+            margin-right: 80px;
+        }
+        div.right
+        {
+            width: 400px;
+            float: left;
+        }
+        div.buttonContainer
+        {
+            text-align: center;
+        }
+        h1
+        {
+            font-size: 36px;
+            color: #333333;
+            line-height: 50px;
+            margin-bottom: 20px;
+            font-weight: normal;
+        }
+        h2
+        {
+            font-size: 24px;
+            font-weight: normal;
+            color: #08639C;
+            text-align: center;
+        }
+        h3
+        {
+            font-size: 16px;
+            color: #333333;
+            font-weight: normal;
+	    text-transform: uppercase;
+        }
+        .heading
+        {
+            border-bottom: 1px solid black;
+	    height: 36px;
+            line-height: 36px;
+            font-size: 22px;
+            color: #000000;
+
+        }
+        span.faq
+        {
+            font-size: 16px;
+	    line-height: 24px;
+            font-weight: normal;
+	    text-transform: uppercase;
+            color: #333333;
+            display: block;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <br />
+        <br />
+        <img src="axure_logo.png" alt="axure" />
+        <br />
+	<br />
+        <h1>
+            AXURE RP EXTENSION FOR CHROME</h1>
+        <p style="font-size: 14px; color: #666666; margin-top: 10px;">
+            Google Chrome requires an extension to view locally stored projects. Alternatively,
+            upload your RP file to <a href="https://www.axure.cloud">Axure Cloud</a> or use a different
+            browser. You can also Preview from Axure RP.</p>
+            <img src="preview-rp.png" alt="preview"/>
+        <h3 class="heading">
+            VIEW LOCAL PROJECTS IN CHROME</h3>
+        <div class="left">
+            <h3>
+                1. Install Extension from Chrome Store</h3>
+            <div class="buttonContainer">
+                <a class="button" href="https://chrome.google.com/webstore/detail/dogkpdfcklifaemcdfbildhcofnopogp"
+                    target="_blank">Install Extension</a>
+            </div>
+        </div>
+        <div class="right">
+            <h3>
+                2. Open "More Tools > Extensions"</h3>
+            <img src="extensions.png" alt="extensions"/>
+        </div>
+        <div style="clear: both; height: 20px;">
+            &nbsp;</div>
+       <div class="left">
+            <h3>
+                3. View Axure RP Extension Details</h3>
+            <img src="details.png" alt="extension details"/>
+            </div>
+	<div class="right">
+            <h3>
+                4. Check "Allow access to file URLs"</h3>
+            <img src="allow-access.png" alt="allow access"/>
+        </div>
+   <div style="clear: both; height: 20px;">
+            &nbsp;</div>
+        <div class="left">
+            <h3>
+                5. Click the button below</h3>
+            <div class="buttonContainer">
+                <a class="button" href="../../start.html">View in Chrome</a>
+            </div>
+        </div>
+        <div style="clear: both; height: 20px;">
+        </div>
+        <h3 class="heading">
+            EXTENSION FAQ</h3>
+        <p>
+            <span class="faq">What is a Chrome Extension?</span> Extensions are downloadable
+            plug-ins for Google Chrome that modify the browser
+            and allow you additional capabilities.
+        </p>
+        <p style="margin-top: 25px;">
+            <span class="faq">Why do I need to install the extension?</span> Google requires
+            this extension to be installed to allow the viewing of local files in
+            Chrome
+        </p>
+        <p style="margin-top: 25px; margin-bottom: 25px;">
+            <span class="faq">Why does this extension require a high access level?</span> This
+            extension requires a high access level to allow the viewing of the file://
+            protocol. Axure does not track or access any of your information.
+        </p>
+        <h3 class="heading">
+           WE'RE HERE TO HELP</h3>
+        <p>
+            Need help or have any questions? Contact our support team at <a href="mailto:support@axure.com">
+                support@axure.com</a>.
+        </p>
+        <div style="clear: both; height: 20px;">
+        </div>
+    </div>
+</body>
+</html>
diff --git a/src_old/resources/chrome/details.png b/src_old/resources/chrome/details.png
new file mode 100644
index 0000000..260397f
Binary files /dev/null and b/src_old/resources/chrome/details.png differ
diff --git a/src_old/resources/chrome/extensions.png b/src_old/resources/chrome/extensions.png
new file mode 100644
index 0000000..4b011c9
Binary files /dev/null and b/src_old/resources/chrome/extensions.png differ
diff --git a/src_old/resources/chrome/firefox.html b/src_old/resources/chrome/firefox.html
new file mode 100644
index 0000000..cbf33b5
--- /dev/null
+++ b/src_old/resources/chrome/firefox.html
@@ -0,0 +1,130 @@
+<html>
+<head>
+    <title>Axure RP - Firefox Local File Restrictions</title>
+    <style type="text/css">
+        *
+        {
+            font-family: Helvetica, Arial, sans-serif;
+        }
+        body
+        {
+            text-align: center;
+            background-color: #fafafa;
+        }
+        p
+        {
+            font-size: 14px;
+            line-height: 18px;
+            color: #333333;
+        }
+        div.container
+        {
+            width: 980px;
+            margin-left: auto;
+            margin-right: auto;
+            text-align: left;
+        }
+        a
+        {
+            text-decoration: none;
+            color: #009dda;
+        }
+        .button
+        {
+            background: #A502B3;
+            font: normal 16px Arial, sans-serif;
+            color: #FFFFFF;
+            padding: 10px 30px 10px 30px;
+            border: 2px solid #A502B3;
+            display: inline-block;
+            margin-top: 10px;
+            text-transform: uppercase;
+            font-size: 14px;
+	    border-radius: 4px;
+        }
+        a:hover.button
+        {
+            border: 2px solid #A502B3;
+	    color: #A502B3;
+	    background-color: #FFFFFF;
+        }
+        div.left
+        {
+            width: 400px;
+            float: left;
+            margin-right: 80px;
+        }
+        div.right
+        {
+            width: 400px;
+            float: left;
+        }
+        div.buttonContainer
+        {
+            text-align: center;
+        }
+        h1
+        {
+            font-size: 36px;
+            color: #333333;
+            line-height: 50px;
+            margin-bottom: 20px;
+            font-weight: normal;
+        }
+        h2
+        {
+            font-size: 24px;
+            font-weight: normal;
+            color: #08639C;
+            text-align: center;
+        }
+        h3
+        {
+            font-size: 16px;
+            line-height: 24px;
+            color: #333333;
+            font-weight: normal;
+        }
+        .heading
+        {
+            border-bottom: 1px solid black;
+	    height: 36px;
+            line-height: 36px;
+            font-size: 22px;
+            color: #000000;
+        }
+        span.faq
+        {
+            font-size: 16px;
+            font-weight: normal;
+	    text-transform: uppercase;
+            color: #333333;
+            display: block;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <br />
+        <br />
+        <img src="axure_logo.png" alt="axure" />
+        <br />
+        <h1>
+            FIREFOX LOCAL FILE RESTRICTIONS</h1>
+        <p style="font-size: 16px; line-height: 24px; color: #666666; margin-top: 10px;">
+            Firefox does not permit locally stored files to be viewed. Use Preview to view your projects in progress.
+<img src="preview-rp.png" alt="preview"/>
+          </p>
+            <p style="font-size: 16px; line-height: 24px; color: #666666; margin-top: 10px;">
+          Alternatively,  you can choose a different web browser, upload your RP file to <a href="https://app.axure.cloud">Axure Cloud</a> or publish the local files to a web server.</p>
+        <h3 class="heading">
+            We're Here to Help</h3>
+        <p>
+            Need help or have any questions? Drop us a line at <a href="mailto:support@axure.com">
+                support@axure.com</a>.
+        </p>
+        <div style="clear: both; height: 20px;">
+        </div>
+    </div>
+</body>
+</html>
diff --git a/src_old/resources/chrome/preview-rp.png b/src_old/resources/chrome/preview-rp.png
new file mode 100644
index 0000000..78f3704
Binary files /dev/null and b/src_old/resources/chrome/preview-rp.png differ
diff --git a/src_old/resources/chrome/safari.html b/src_old/resources/chrome/safari.html
new file mode 100644
index 0000000..b828eeb
--- /dev/null
+++ b/src_old/resources/chrome/safari.html
@@ -0,0 +1,155 @@
+<html>
+<head>
+    <title>Axure RP - Safari Local File Restrictions</title>
+    <style type="text/css">
+        *
+        {
+            font-family: Helvetica, Arial, sans-serif;
+        }
+        body
+        {
+            text-align: center;
+            background-color: #fafafa;
+        }
+        p
+        {
+            font-size: 14px;
+            line-height: 18px;
+            color: #333333;
+        }
+        div.container
+        {
+            width: 980px;
+            margin-left: auto;
+            margin-right: auto;
+            text-align: left;
+        }
+        a
+        {
+            text-decoration: none;
+            color: #009dda;
+        }
+        .button
+        {
+            background: #A502B3;
+            font: normal 16px Arial, sans-serif;
+            color: #FFFFFF;
+            padding: 10px 30px 10px 30px;
+            border: 2px solid #A502B3;
+            display: inline-block;
+            margin-top: 10px;
+            text-transform: uppercase;
+            font-size: 14px;
+	    border-radius: 4px;
+        }
+        a:hover.button
+        {
+            border: 2px solid #A502B3;
+	    color: #A502B3;
+	    background-color: #FFFFFF;
+        }
+        div.left
+        {
+            width: 400px;
+            float: left;
+            margin-right: 80px;
+        }
+        div.right
+        {
+            width: 400px;
+            float: left;
+        }
+        div.buttonContainer
+        {
+            text-align: center;
+        }
+        h1
+        {
+            font-size: 36px;
+            color: #333333;
+            line-height: 50px;
+            margin-bottom: 20px;
+            font-weight: normal;
+        }
+        h2
+        {
+            font-size: 24px;
+            font-weight: normal;
+            color: #08639C;
+            text-align: center;
+        }
+        h3
+        {
+            font-size: 16px;
+            line-height: 24px;
+            color: #333333;
+            font-weight: normal;
+        }
+        .heading
+        {
+            border-bottom: 1px solid black;
+	    height: 36px;
+            line-height: 36px;
+            font-size: 22px;
+            color: #000000;
+        }
+        span.faq
+        {
+            font-size: 16px;
+            font-weight: normal;
+	    text-transform: uppercase;
+            color: #333333;
+            display: block;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <br />
+        <br />
+        <img src="axure_logo.png" alt="axure" />
+        <br />
+        <h1>
+            SAFARI LOCAL FILE RESTRICTIONS</h1>
+        <p style="font-size: 16px; line-height: 24px; color: #666666; margin-top: 10px;">
+            To view locally stored projects in Safari, you will need to "disable local file restrictions". Alternatively,
+            you can upload your RP file to <a href="https://www.axure.cloud">Axure Cloud</a> or publish the local files to a web server. You can also Preview from Axure RP.</p>
+            <img src="preview-rp.png" alt="preview"/>
+        <h3 class="heading">
+            VIEW LOCAL PROJECTS IN SAFARI</h3>
+        <div class="">
+            <h3>
+                1. Open "Safari > Preferences > Advanced" from the top menu, and check the option to "Show Develop menu in menu bar"</h3>
+            <img src="safari_advanced.png" alt="advanced" />
+        </div>
+        <div style="clear: both; height: 20px;">
+            &nbsp;
+        </div>
+        <div class="">
+            <h3>
+                2. In the Develop menu that appears in the menu bar, click "Develop > Disable Local File Restrictions" to un-select the menu option</h3>
+            <img src="safari_restrictions.png" alt="extensions" />
+        </div>
+        <div style="clear: both; height: 20px;">
+            &nbsp;</div>
+        <div class="left">
+            <h3>
+                3. Click the button below
+            </h3>
+            <div class="buttonContainer">
+                <a class="button" href="../../start.html">View in Safari</a>
+            </div>
+        </div>
+        <div style="clear: both; height: 20px;">
+        </div>
+        <h3 class="heading">
+            We're Here to Help</h3>
+        <p>
+            Need help or have any questions? Drop us a line at <a href="mailto:support@axure.com">
+                support@axure.com</a>.
+        </p>
+        <div style="clear: both; height: 20px;">
+        </div>
+    </div>
+</body>
+</html>
diff --git a/src_old/resources/chrome/safari_advanced.png b/src_old/resources/chrome/safari_advanced.png
new file mode 100644
index 0000000..9f81b2a
Binary files /dev/null and b/src_old/resources/chrome/safari_advanced.png differ
diff --git a/src_old/resources/chrome/safari_restrictions.png b/src_old/resources/chrome/safari_restrictions.png
new file mode 100644
index 0000000..26ddf3f
Binary files /dev/null and b/src_old/resources/chrome/safari_restrictions.png differ
diff --git a/src_old/resources/chrome/splitter.gif b/src_old/resources/chrome/splitter.gif
new file mode 100644
index 0000000..3f8bca9
Binary files /dev/null and b/src_old/resources/chrome/splitter.gif differ
diff --git a/src_old/resources/chrome/splitter.png b/src_old/resources/chrome/splitter.png
new file mode 100644
index 0000000..8e354e7
Binary files /dev/null and b/src_old/resources/chrome/splitter.png differ
diff --git a/src_old/resources/css/axure_rp_page.css b/src_old/resources/css/axure_rp_page.css
new file mode 100644
index 0000000..d4b188f
--- /dev/null
+++ b/src_old/resources/css/axure_rp_page.css
@@ -0,0 +1,292 @@
+/* so the window resize fires within a frame in IE7 */
+html, body {
+    height: 100%;
+}
+
+.mobileFrameCursor div * {
+    cursor: inherit !important;
+}
+
+a {
+    color: inherit;
+}
+
+p {
+    margin: 0px;
+    text-rendering: optimizeLegibility;
+    font-feature-settings: "kern" 1;
+    -webkit-font-feature-settings: "kern";
+    -moz-font-feature-settings: "kern";
+    -moz-font-feature-settings: "kern=1";
+    font-kerning: normal;
+}
+
+ul {
+    margin:0px;
+}
+
+iframe {
+    background: #FFFFFF;
+}
+
+/* to match IE with C, FF */
+input {
+    padding: 1px 0px 1px 0px;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+}
+
+input[type=text]::-ms-clear {
+    width: 0;
+    height: 0;
+    display: none;
+}
+
+textarea {
+    margin: 0px;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+}
+
+.focused:focus, .selectedFocused:focus {
+    outline: none;
+}
+
+div.intcases {
+    font-family: arial; 
+    font-size: 12px;
+    text-align:left; 
+    border:1px solid #AAA; 
+    background:#FFF none repeat scroll 0% 0%; 
+    z-index:9999; 
+    visibility:hidden; 
+    position:absolute;
+    padding: 0px;
+    border-radius: 3px;
+    white-space: nowrap;
+}
+
+div.intcaselink {
+    cursor: pointer;
+    padding: 3px 8px 3px 8px;
+    margin: 5px;
+    background:#EEE none repeat scroll 0% 0%; 
+    border:1px solid #AAA;
+    border-radius: 3px;
+}
+
+div.refpageimage {
+    position: absolute;
+    left: 0px;
+    top: 0px;
+    font-size: 0px;
+    width: 16px;
+    height: 16px;
+    cursor: pointer;
+    background-image: url(images/newwindow.gif);
+    background-repeat: no-repeat;
+}
+
+div.annnoteimage {
+    position: absolute;
+    left: 0px;
+    top: 0px;
+    font-size: 0px;
+    /*width: 16px;
+    height: 12px;*/
+    cursor: help;
+    /*background-image: url(images/note.gif);*/
+    /*background-repeat: no-repeat;*/
+    width: 13px;
+    height: 12px;
+    padding-top: 1px;
+    text-align: center;
+    background-color: #138CDD;
+    -moz-box-shadow: 1px 1px 3px #aaa;
+    -webkit-box-shadow: 1px 1px 3px #aaa;
+    box-shadow: 1px 1px 3px #aaa;
+}
+
+div.annnoteline {
+    display: inline-block;
+    width: 9px;
+    height: 1px;
+    border-bottom: 1px solid white;
+    margin-top: 1px;
+}
+
+div.annnotelabel {
+    /*position: absolute;
+    left: 0px;
+    top: 0px;*/
+    font-family: Helvetica,Arial;
+    white-space: nowrap;
+    
+    padding-top: 1px;
+    background-color: #fff849;
+    font-size: 10px;
+    font-weight: bold;
+    line-height: 14px;
+    margin-right: 3px;
+    padding: 0px 4px;
+    color: #000;
+
+    -moz-box-shadow: 1px 1px 3px #aaa;
+    -webkit-box-shadow: 1px 1px 3px #aaa;
+    box-shadow: 1px 1px 3px #aaa;
+}
+
+div.annnote {
+    display: flex;
+    position: absolute;
+    cursor: help;
+    line-height: 14px;
+}
+
+.annotation {
+    font-size: 12px;
+    padding-left: 2px;
+    margin-bottom: 5px;
+}
+
+.annotationName {
+    /*font-size: 13px;
+    font-weight: bold;
+    margin-bottom: 3px;
+    white-space: nowrap;*/
+
+    font-family: 'Trebuchet MS';
+    font-size: 14px;
+    font-weight: bold;
+    margin-bottom: 5px;
+    white-space: nowrap;
+}
+
+.annotationValue {
+    font-family: Arial, Helvetica, Sans-Serif;
+    font-size: 12px;
+    color: #4a4a4a;
+    line-height: 21px;
+    margin-bottom: 20px;
+}
+
+.noteLink {
+    text-decoration: inherit;
+    color: inherit;
+}
+
+.noteLink:hover {
+    background-color: white;
+}
+
+/* this is a fix for the issue where dialogs jump around and takes the text-align from the body */
+.dialogFix {
+    position:absolute;
+    text-align:left;
+    border: 1px solid #8f949a;
+}
+
+
+@keyframes pulsate {
+  from {
+    box-shadow: 0 0 10px #15d6ba;
+  }
+  to {
+    box-shadow: 0 0 20px #15d6ba;
+  }
+}
+
+@-webkit-keyframes pulsate {
+  from {
+    -webkit-box-shadow: 0 0 10px #15d6ba;
+    box-shadow: 0 0 10px #15d6ba;
+  }
+  to {
+    -webkit-box-shadow: 0 0 20px #15d6ba;
+    box-shadow: 0 0 20px #15d6ba;
+  }
+}
+ 
+@-moz-keyframes pulsate {
+  from {
+    -moz-box-shadow: 0 0 10px #15d6ba;
+    box-shadow: 0 0 10px #15d6ba;
+  }
+  to {
+    -moz-box-shadow: 0 0 20px #15d6ba;
+    box-shadow: 0 0 20px #15d6ba;
+  }
+}
+
+.legacyPulsateBorder {
+    /*border: 5px solid #15d6ba;
+    margin: -5px;*/
+    -moz-box-shadow: 0 0 10px 3px #15d6ba;
+    box-shadow: 0 0 10px 3px #15d6ba;
+}
+
+.pulsateBorder {
+  animation-name: pulsate;
+  animation-timing-function: ease-in-out;
+  animation-duration: 0.9s;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+  
+  -webkit-animation-name: pulsate;
+  -webkit-animation-timing-function: ease-in-out;
+  -webkit-animation-duration: 0.9s;
+  -webkit-animation-iteration-count: infinite;
+  -webkit-animation-direction: alternate;
+
+  -moz-animation-name: pulsate;
+  -moz-animation-timing-function: ease-in-out;
+  -moz-animation-duration: 0.9s;
+  -moz-animation-iteration-count: infinite;
+  -moz-animation-direction: alternate;
+}
+
+.ax_default_hidden, .ax_default_unplaced{
+    display: none;
+    visibility: hidden;
+}
+
+.widgetNoteSelected {
+    -moz-box-shadow: 0 0 10px 3px #138CDD;
+    box-shadow: 0 0 10px 3px #138CDD;
+    /*-moz-box-shadow: 0 0 20px #3915d6;
+    box-shadow: 0 0 20px #3915d6;*/
+    /*border: 3px solid #3915d6;*/
+    /*margin: -3px;*/
+}
+
+
+.singleImg {
+    display: none;
+    visibility: hidden;
+}
+
+#ios-safari {
+    overflow: auto;
+    -webkit-overflow-scrolling: touch;
+}
+
+#ios-safari-html {
+    display: block;
+    overflow: auto;
+    -webkit-overflow-scrolling: touch;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+}
+
+#ios-safari-fixed {
+    position: absolute;
+    pointer-events: none;
+    width: initial;
+}
+
+#ios-safari-fixed div {
+    pointer-events: auto;
+}
\ No newline at end of file
diff --git a/src_old/resources/css/default.css b/src_old/resources/css/default.css
new file mode 100644
index 0000000..fc882e4
--- /dev/null
+++ b/src_old/resources/css/default.css
@@ -0,0 +1,1052 @@
+body {
+    font-family: 'Source Sans Pro', 'Trebuchet MS', Arial;
+    font-size: 14px;
+    color: #2c2c2c;
+    -webkit-font-smoothing: antialiased;
+    text-rendering: optimizeLegibility;
+    -webkit-font-feature-settings: "kern";
+    -moz-font-feature-settings: "kern";
+    -moz-font-feature-settings: "kern=1";
+    font-feature-settings: "kern" 1;
+    font-kerning: normal;
+    overflow: hidden;
+}
+
+a {
+  cursor: pointer;
+}
+
+input[type="radio"], input[type="checkbox"] {
+    margin: 0px 9px 0px 0px;
+    vertical-align: bottom;
+}
+
+input {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+}
+
+input[type=text]::-ms-clear {
+    width: 0;
+    height: 0;
+    display: none;
+}
+
+#outerContainer {
+    position: absolute;
+    width:1000px;
+    height:1500px;
+    overflow: hidden;
+    display: flex;
+}
+
+#mobileControlFrameContainer {
+    position: absolute;
+    width: 100%;
+    pointer-events: none;
+}
+
+.splitbar {
+    display: none;
+    position: absolute;
+    top: 0px;
+    width: 3px;
+    height: 100%;
+    cursor: ew-resize;
+    z-index: 5;
+    user-select: none;
+}
+
+.splitbar:hover, .splitbar.active {
+    background: #cccccc;
+}
+
+#lsplitbar {
+    border-right: 1px solid #cccccc;
+}
+
+#rsplitbar {
+    border-left: 1px solid #cccccc;
+}
+
+#mainPanel {
+    background-color: #d8d8d8;
+    opacity: 0; 
+    flex: 1;
+    overflow: hidden;
+}
+
+#clippingBounds {
+    width: 100%;
+    overflow: hidden;
+    pointer-events: none;
+    position: absolute;
+    z-index: 1;
+}
+
+#clippingBounds div {
+    pointer-events: auto;
+}
+
+#clippingBoundsScrollContainer {
+    position: absolute;
+    pointer-events: none;
+}
+
+#browserOutOfDateNotification {
+    width: 100%;
+    height: 289px;
+    background-color: #e36154;
+    padding-top: 40px;
+    color: #FFFFFF;
+}
+    .mobileMode #browserOutOfDateNotification {
+        padding-top: 15px;
+    }
+
+#supportedBrowsersListContainer {
+    border-radius: 5px;
+    line-height: 1.64;
+    background-color: #c3463a;
+    padding-top: 4px;
+    width: 255px;
+    margin: auto;
+}
+
+.browserName {
+    display: inline-block;
+    width: 55%;
+    font-weight: bold;
+    margin-left: 18px;
+}
+
+.browserSupportedVersion {
+    display: inline-block;
+    font-style: italic;
+}
+
+#browserOutOfDateNotificationButtons {
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 28px;
+}
+    .mobileMode #browserOutOfDateNotificationButtons {
+        margin-top: 8px;
+    }
+
+#updateBrowserButton {
+    display: inline-block;
+    width: 330px;
+    height: 35px;
+    margin-left: auto;
+    line-height: 35px;
+    text-decoration: none;
+    text-align: center;
+    border-radius: 9px;
+    border: solid 1px #FFFFFF;
+    color: #FFFFFF;
+}
+
+#continueToPrototypeButton {
+    display: inline-block;
+    text-align: center;
+    line-height: 37px;
+    text-decoration: underline;
+}
+
+#topPanel {
+    z-index: 1;
+    height: 36px;
+    background-color: #f2f2f2;
+    border-bottom: 1px solid #cccccc;
+    user-select: none;
+}
+
+.leftPanel, .rightPanel, .mobileOnlyPanel {
+    position: relative;
+    background-color: #f2f2f2;
+    overflow: hidden;
+    width: 0px;
+    flex-shrink: 0;
+}
+
+
+.popup, .leftPanel.popup {
+    position: absolute;
+    z-index: 20000;
+    display: none;
+    background-color: #f2f2f2;
+    border: solid 1px #bdbcbc;
+    position: absolute;
+    box-shadow: 0 1px 2px 0 rgba(87, 87, 87, 0.5);
+}
+
+.leftPanel.popup .sitemapHeader, .leftPanel.popup #searchDiv {
+    display: none;
+}
+
+#clipFrameScroll {
+}
+
+.splitterMask {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    background-image: url(../images/transparent.gif);
+    z-index: 10000;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+#maximizePanelContainer {
+  font-size: 4px;
+  overflow: hidden;
+  z-index: 1000;
+  display: none;
+}
+
+#maximizePanel {
+    background-color: #f2f2f2;
+    cursor: pointer;
+}
+
+#maximizePanelContainer, #maximizePanelOver, #maximizePanel {
+  position:absolute;
+  left: 0px;
+  top: 0px;
+  width: 28px;
+  height: 36px;
+}
+
+#interfaceControlFrameMinimizeContainer {
+    font-size: 2px; /*for IE*/
+    text-align: right;
+    z-index: 100;
+    height: 36px;
+    width: 28px;
+    border-right: solid 1px #cbcbcb;
+}
+#interfaceControlFrameMinimizeContainer a {
+    display: inline-block;
+    width: 28px;
+    height: 100%;
+    font-size: 2px;
+    text-decoration: none;
+}
+
+#interfaceControlFrame {
+    height: 100%;
+    display: flex;
+    opacity: 0;
+}
+
+#interfaceControlFrameCloseContainer {
+    display: none;
+    font-size: 9px;
+    font-weight: bold;
+    letter-spacing: 1px;
+    z-index: 100;
+    width: 55px;
+    background-color: #62666b;
+    text-align: center;  
+}
+#interfaceControlFrameCloseContainer a {
+    display: inline-block;
+    width: 55px;
+    color: #ffffff;
+    padding: 5px 0px;
+}
+#inspectControlFrameHeader li {
+    float: left;
+    display: block;
+    width: 42px;
+    height: 36px;
+    padding: 4px 5px 4px 5px;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+
+#inspectControlFrameHeader li a {
+    height: 100%;
+    width: 32px;
+    display: block;
+    text-align: center;
+    outline: none;
+    text-decoration: none;
+    white-space: nowrap;
+    background-color: transparent;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+
+.hashover #inspectControlFrameHeader li a:hover {
+    border-radius: 3px;
+    background-color: #e6e6e6;
+}
+
+/*#inspectControlFrameHeader li a.selected, #inspectControlFrameHeader li a.selected:hover {
+    background-color: inherit;
+}*/
+
+#inspectControlFrameHeaderContainer {
+    overflow: visible;
+}
+
+#inspectControlFrameHeader {
+    position: relative;
+    list-style: none;
+    z-index: 50;
+    letter-spacing: 1px;
+    display: flex;
+}
+
+#projectControlFrameHeaderContainer {
+    overflow: visible;
+}
+
+#projectControlFrameHeader {
+    position: relative;
+    list-style: none;
+    font-size: 8px;
+    z-index: 50;
+    font-weight: bold;
+    letter-spacing: 1px;
+}
+
+#projectControlFrameHeader li {
+    float: left;
+    display: block;
+    width: 28px;
+    height: 28px;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+
+#projectControlFrameHeader li a {
+    display: block;
+    height: 100%;
+    width: 32px;
+    outline: none;
+    margin: auto;
+    text-decoration: none;
+    color: #ffffff;
+    white-space: nowrap;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+
+.hashover #projectControlFrameHeader li a:hover {
+    border-radius: 3px;
+    background-color: #e6e6e6;
+}
+
+/*#projectControlFrameHeader li a.selected, #projectControlFrameHeader li a.selected:hover {
+    background-color: inherit;
+}*/
+
+#handoffControlFrameHeaderContainer {
+    display: none;
+}
+
+#handoffControlFrameHeader li {
+    float: left;
+    display: block;
+    width: 44px;
+    height: 36px;
+    margin: 0px 3.5px 0px 3.5px;
+    padding: 4px 6px 4px 6px;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+
+#handoffControlFrameHeader li.selected {
+    padding: 0px;
+    border-bottom: 2px solid #008dcb;
+}
+
+#handoffControlFrameHeader li a {
+    float: left;
+    height: 100%;
+    width: 32px;
+    display: block;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+
+.hashover #handoffControlFrameHeader li a:hover {
+    border-radius: 3px;
+    background-color: #e6e6e6;
+}
+
+#handoffControlFrameHeader li a.selected {
+    width: 100%;
+    /*background-color: inherit;*/
+}
+
+#publishContainer {
+    display: none;
+    margin: 6px 20.5px 5px;
+    width: 150px;
+    height: 25px;
+    border-radius: 10px;
+    background-color: #008dcb;
+}
+
+
+#publishContainer.preview {
+    display: block;
+}
+
+#overflowBtn {
+    order: 5;
+}
+
+#overflowMenuButton {
+    background: url('../images/overflow-icon.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+#overflowMenuButton.selected {
+    background: url('../images/overflow_icon_off.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+.overflowOptionCheckbox, #projectOptionsHotspotsCheckbox {
+    position: relative;
+    border: solid 1px #8c8c8c;
+    display: inline-block;
+}
+    .overflowOptionCheckbox {
+        width: 10px;
+        height: 10px;
+        margin-right: 14px;
+        top: 1px;
+    }
+    #projectOptionsHotspotsCheckbox {
+        width: 16px;
+        height: 16px;
+        margin-right: 25px;
+        margin-left: 21px;
+        top: 2.5px;
+    }
+
+.overflowOptionCheckbox.selected, #projectOptionsHotspotsCheckbox.selected {
+    background: url('../images/overflow_checkmark.svg') no-repeat center center, linear-gradient(transparent,transparent);
+    background-color: #20bba6;
+    border: solid 1px #20bba6;
+    background-size: contain;
+}
+
+#overflowMenuContainer {
+    display: none;
+    flex-direction: column;
+    top: 36px;
+    right: 80px;
+    width: 171px;
+    border-radius: 2px;
+}
+
+#overflowMenuContainer.popup {
+    display: flex;
+}
+
+.showOption {
+    font-size: 14px;
+	padding: 9px 0px 0px 15px;
+    color: #3B3B3B;
+}
+
+.showOption:hover {
+	cursor: pointer;
+}
+
+#signInButton {
+    padding: 0px 20px 0px 20px;
+    width: 50.8px;
+    height: 16px;
+    font-size: 12px;
+    text-align: center;
+    line-height: 22px;
+}
+
+#accountLoginContainer {
+    display: none;
+    right: 220px;
+}
+
+.accountOption {
+    font-size: 12px;
+    padding: 7px;
+    line-height: 1.83;
+}
+
+/* temporary sign in css (borrowed from feedback9.css*/
+.feedbackGreenBtn_Player {
+    background-color: #74BC68;
+    border-radius: 2.5px;
+    box-shadow: inset 0 -1px 0 0 rgba(137, 137, 137, 0.58);
+    color: #FFFFFF;
+    cursor: pointer;
+    font-size: 12px;
+    height: 25px;
+    line-height: 25px;
+}
+
+    .feedbackGreenBtn_Player:hover {
+        background-color: #58964E;
+    }
+/* Axure Commenter Login w/out pin */
+.axureLoginBubble_Player {
+    background-color: #F2F2F2 !important;
+}
+
+.axureLoginBubbleContainer_Player {
+    padding: 5px;
+}
+
+    .axureLoginBubbleContainer_Player input {
+        width: 100%;
+        padding: 0 5px;
+        margin-bottom: 10px;
+        height: 30px;
+        font-size: 14px;
+    }
+
+    .axureLoginBubbleContainer_Player span {
+        margin: 0;
+    }
+
+div.axClearMsgBubble_Player {
+    padding: 10px;
+    max-width: 300px;
+    text-align: center;
+}
+
+    div.axClearMsgBubble_Player span {
+        margin: 2px;
+        white-space: pre-wrap;
+        white-space: -moz-pre-wrap; /* Firefox */
+        white-space: -pre-wrap; /* Opera <7 */
+        white-space: -o-pre-wrap; /* Opera 7 */
+        word-wrap: break-word; /* IE */
+    }
+
+
+#publishButton {
+    display: block;
+    width: 95px;
+    margin: auto;
+    font-size: 14px;
+    line-height: 26px;
+    color: #ffffff;
+}
+
+.maximizeCaret {
+    width: 5px;
+    height: 5px;
+    object-fit: contain;
+    border-right: solid 1.5px #525252;
+    border-top: solid 1.5px #525252;
+    margin: auto;
+}
+.caret {
+    width: 9px;
+    height: 7px;
+    background: url('../images/caret_down.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+.selected .caret {
+    background: url('../images/caret_down_off.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+.upCaret {
+    transform: rotate(-45deg);
+}
+.leftCaret {
+    transform: rotate(-135deg);
+}
+.downCaret {
+    transform: rotate(-225deg);
+}
+.rightCaret {
+    transform: rotate(-315deg);
+}
+
+#pageSelectDropdown, #adaptiveViewsDropdown {
+    display: inline-block;
+    margin-left: 8px;
+}
+
+.minimizeIcon, .maximizeIcon {
+    transition: .25s linear;
+    position: absolute;
+    height: 36px;
+    width: 28px;
+}
+
+#minimizeX {
+    background: url('../images/close_x_minimize.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+#minimizeArrow {
+    opacity: 0;
+    transform: rotate(270deg);
+    background: url('../images/caret_down.svg') no-repeat center center, linear-gradient(transparent,transparent);
+} 
+
+#maximizeButton {
+    transform: rotate(-270deg);
+    background: url('../images/caret_down.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+.collapseHovered #minimizeX {
+    transition: .25s linear;
+    opacity: 0;
+    transform: rotate(-90deg);
+}
+
+.collapseHovered #minimizeArrow {
+    transition: .25s linear;
+    opacity: 1;
+    transform: rotate(90deg);
+}
+
+#maximizeButton.rotated {
+    transition: .20s linear;
+    transform: rotate(-90deg);
+}
+
+.expandHovered #minimizeX {
+    opacity: 0;
+}
+
+.expandHovered #minimizeArrow {
+    opacity: 1;
+}
+
+#separatorContainer {
+    display: none; 
+    line-height: 24px;
+    height: 36px;
+}
+
+#separatorContainer.hasLeft {
+    display: block;
+}
+
+.separator {
+    display: block;
+    width: 0px;
+    height: 100%;
+    border: solid 0.5px #c4c4c4;
+}
+
+#interfacePageNameContainer {
+    float: left;
+    cursor: pointer;
+}
+
+#sitemapControlFrameContainer{
+    display: flex;
+    margin: 4px 6px;
+}
+
+.hashover #sitemapControlFrameContainer:hover {
+    border-radius: 3px;
+    background-color: #e6e6e6;
+}
+
+/*.hashover #sitemapControlFrameContainer.selected:hover {
+    background-color: inherit;
+}*/
+
+#interfaceOverflowMenuContainer {
+    position: absolute;
+    display: none;
+    width: 220px;
+    background-color: #f2f2f2;
+    right: 240px;
+}
+
+.pageNameHeader {
+    float: left;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 175px;
+    margin-left: 10px;
+    margin-right: 6px;
+}
+
+.pageCountHeader {
+    float: left;
+    white-space: nowrap;
+    margin-left: 5px;
+    margin-right: 6px;
+    color: #aaaaaa;
+}
+
+#interfaceAdaptiveViewsContainer {
+    display: none;
+    margin: 4px 0px 4px 30.5px;
+    padding: 0px 6px;
+    cursor: pointer;
+}
+#interfaceAdaptiveViewsContainer:hover {
+    border-radius: 3px;
+    background-color: #e6e6e6;
+}
+
+.adaptiveViewHeader {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+#interfaceAdaptiveViewsButton {
+    float: left;
+    max-width: 145px;
+}
+
+#interfaceAdaptiveViewsIconButton {
+    display: none;
+    float:left;
+    width: 16px;
+    margin-right: 6px;
+    background: url('../images/views-icon.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+#interfaceScaleContainer {
+    line-height: 36px;
+    padding: 0px 10px;
+    cursor: pointer;
+}
+
+.scaleHeader {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+#overflowMadeWith {
+    line-height: 36px;
+    margin: 0px 12px;
+}
+
+#axureLogo {
+    display: inline-block;
+    width: 56px;
+    height: 36px;
+    padding-top: 1px;
+    background: url('../images/axure9_logo.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+#overflowMenuContainer > #overflowMadeWith {
+    line-height: 24px;
+    border-top: 1px solid #ccc;
+    margin-top: 7px;
+    padding-top: 7px;
+}
+
+#interfaceControlFrameContainer {
+    overflow: hidden;
+    height: 36px;
+    display: flex;
+}
+
+#interfaceControlFrameLeft {
+    flex: 1;
+    display: flex;
+    font-size: 14px;
+    line-height: 29px;
+    color: #3b3b3b;
+}
+
+#interfaceControlFrameRight {
+    flex: 1;
+    display: flex;
+    justify-content: flex-end;
+}
+
+#interfaceControlFrameLogoContainer {
+    overflow: hidden;
+    margin-left: auto;
+    margin-right: auto;
+    height: 100%;
+    display: flex;
+}
+
+#interfaceControlFrameLogoCaptionContainer {
+    text-align: center;
+    margin: 5px 10px 0px 10px;
+    font-size: 14px;
+    color: #4a4a4a;
+    font-weight: bold;
+    line-height: 30px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+#previewNotice {
+    font-size: 14px;
+    line-height: 36px;
+    display: none;
+}
+
+#logoImage {
+    margin: 12px;
+    max-width: 150px;
+    max-height: 12px;
+}
+
+.emptyStateContainer {
+    text-align: center;
+    padding: 0px 10px;
+    margin-top: 32px
+}
+
+.emptyStateTitle {
+    margin: 0px 0px 9px 0px;
+    font-weight: bold;
+}
+
+.emptyStateContent {
+    line-height: 22px;
+}
+
+.dottedDivider {
+    height: 2px;
+    margin: 15px 0px 15px 0px;
+    background: url('../images/divider.png') no-repeat center center;
+    background: url('../images/divider.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+.mobileMode .dottedDivider {
+    display: none;
+}
+
+.nondottedDivider {
+    height: 2px;
+    margin: 9px 0px 9px 0px;
+}
+
+.lineDivider {
+    height: 2px;
+    margin: 10px 12px 20px 12px;
+    border-bottom: solid 1px #e7e7e7;
+}
+
+.pluginNameHeader {
+    font-size: 14px;
+    font-weight: bold;
+    color: #6d6d6d;
+}
+
+.mobileMode .pluginNameHeader {
+    margin: 14px 12px 13px 12px;
+    font-size: 18px;
+    color: #6d6d6d;
+}
+
+#projectOptionsHost {
+    display: flex;
+    flex-direction: column;
+}
+
+#projectOptionsScrollContainer {
+    overflow: auto;
+    width: 100%;
+    -webkit-overflow-scrolling: touch;
+    flex: 1;
+}
+
+div.mobileSubHeader {
+    font-size: 18px;
+    font-weight: bold;
+    color: #4a4a4a;
+    margin: 0px 12px 11px 15px;
+}
+
+div.mobileText, span.mobileText {
+    font-size: 16px;
+    color: #4a4a4a;
+}
+
+.nativeMenuText {
+    height: 20px;
+    font-size: 14px;
+    text-align: center;
+    color: #ffffff;
+    margin-top: 6px;
+    margin-bottom: 13px;
+    text-decoration: none;
+}
+
+#refreshText, #exitText {
+    margin-top: 6px;
+}
+
+#returnText {
+    margin-top: 7px;
+}
+
+#refreshIcon {
+    height: 20px;
+    object-fit: contain;
+    background: url('../images/refresh.svg') no-repeat center center, linear-gradient(transparent,transparent);
+    margin-top: 14px;
+}
+
+#exitIcon {
+    height: 19px;
+    object-fit: contain;
+    background: url('../images/exit.svg') no-repeat center center, linear-gradient(transparent,transparent);
+    margin-top: 14px;
+}
+
+#returnIcon {
+    height: 46px;
+    object-fit: contain;
+    background: url('../images/return.svg') no-repeat center center, linear-gradient(transparent,transparent);
+}
+
+
+.nativePrototypeButton {
+    width:50%;
+    margin-left:auto;
+    margin-right:auto;
+}
+
+.circleBackground {
+    border-radius: 50%;
+    behavior: url(PIE.htc);
+    margin: auto;
+    box-shadow: 3px 3px 3px 0 rgba(55, 55, 55, 0.5);
+}
+
+#returnBackground {
+    width: 46px;
+    height: 46px;
+    background-color: #ffffff;
+}
+
+#closeBackground {
+    width: 61px;
+    height: 61px;
+    background-color: #f2f2f2;
+}
+
+.closeIconSlash {
+    width: 35px;
+    height: 5px;
+    background-color: #9b9b9b;
+    position: relative;
+    margin: auto;
+}
+#forwardSlash{
+    top: 28px;
+    transform: rotate(-45deg);
+}
+#backwardSlash{
+    transform: rotate(90deg);
+}
+
+.mobilePrototypeControlFrame {
+    position: absolute;
+    display: none;
+    width: 100%;
+    min-width: 310px;
+    bottom: 0px;
+    z-index: 2;
+    pointer-events: auto;
+}
+
+#nativeMenuBlueBackground {
+    height: 72px;
+    width: 100%;
+    background-color: #008fe0;
+}
+
+#mHideSidebar {
+    position: absolute;
+    width: 10000px;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    top: 0px;
+    z-index: 2;
+    display: none;
+    left: -60px;
+}
+
+/*@media (max-width: 419px) {*/
+    .mobileMode #topPanel {
+        display: none;
+    }
+
+    .mobileMode #mainPanel {
+        -webkit-overflow-scrolling: touch;
+    }
+
+    .mobileMode .leftPanel, .mobileMode .rightPanel, .mobileMode .mobileOnlyPanel {
+        box-shadow: 0 5.5px 5px 0 rgba(0, 0, 0, 0.24), 0 9px 18px 0 rgba(0, 0, 0, 0.18);
+        top: 45px;
+        left: 100px;
+    }
+
+    .mobileMode .leftPanel, .mobileMode .rightPanel, .mobileMode .mobileOnlyPanel {
+        float: left;
+    }
+
+    .mobileMode .rightPanel {
+        margin-left: 13px;
+    }
+
+    .mobileMode #maximizePanelContainer {
+        display: none;
+    }
+/*}*/
+
+@media (max-width: 850px) {
+    #overflowMenuContainer {
+        right: 0px;
+    }
+
+    #overflowMadeWith, #publishContainer.preview, #separatorContainer, #separatorContainer.hasLeft {
+        display: none;
+    }
+
+    #interfaceControlFrameLogoCaptionContainer {
+        display: none;
+    }
+
+    #interfaceControlFrameContainer {
+        justify-content: flex-end;
+    }
+
+    #interfaceAdaptiveViewsButton {
+        display: none;
+    }
+
+    #interfaceAdaptiveViewsIconButton {
+        display: block;
+    }
+
+    #interfaceAdaptiveViewsContainer {
+        padding-left: 8px;
+    }
+}
+
+@media (max-width: 700px) {
+    #interfacePageNameContainer {
+        display: none;
+    }
+}
+
diff --git a/src_old/resources/css/images/images.html b/src_old/resources/css/images/images.html
new file mode 100644
index 0000000..335d9c9
--- /dev/null
+++ b/src_old/resources/css/images/images.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+	<head>
+		<title></title>
+	</head>
+	<body>
+	<p>
+	    <img border="0" src="note.gif" width="1" height="1">
+        <img border="0" src="newwindow.gif" width="1" height="1">
+        <img border="0" src="ui-bg_flat_0_aaaaaa_40x100.png" width="1" height="1">
+        <img border="0" src="ui-bg_glass_55_fbf9ee_1x400.png" width="1" height="1">
+        <img border="0" src="ui-bg_glass_65_ffffff_1x400.png" width="1" height="1">
+        <img border="0" src="ui-bg_glass_75_dadada_1x400.png" width="1" height="1">
+        <img border="0" src="ui-bg_glass_75_e6e6e6_1x400.png" width="1" height="1">
+        <img border="0" src="ui-bg_glass_75_ffffff_1x400.png" width="1" height="1">
+        <img border="0" src="ui-bg_highlight-soft_75_cccccc_1x100.png" width="1" height="1">
+        <img border="0" src="ui-bg_inset-soft_95_fef1ec_1x100.png" width="1" height="1">
+        <img border="0" src="ui-icons_222222_256x240.png" width="1" height="1">
+        <img border="0" src="ui-icons_2e83ff_256x240.png" width="1" height="1">
+        <img border="0" src="ui-icons_454545_256x240.png" width="1" height="1">
+        <img border="0" src="ui-icons_888888_256x240.png" width="1" height="1">
+        <img border="0" src="ui-icons_cd0a0a_256x240.png" width="1" height="1">
+   </p>
+   </body>
+</html>
\ No newline at end of file
diff --git a/src_old/resources/css/images/newwindow.gif b/src_old/resources/css/images/newwindow.gif
new file mode 100644
index 0000000..7b14cb0
Binary files /dev/null and b/src_old/resources/css/images/newwindow.gif differ
diff --git a/src_old/resources/css/images/note.gif b/src_old/resources/css/images/note.gif
new file mode 100644
index 0000000..a8c2762
Binary files /dev/null and b/src_old/resources/css/images/note.gif differ
diff --git a/src_old/resources/css/images/touch.cur b/src_old/resources/css/images/touch.cur
new file mode 100644
index 0000000..01355e8
Binary files /dev/null and b/src_old/resources/css/images/touch.cur differ
diff --git a/src_old/resources/css/images/touch.svg b/src_old/resources/css/images/touch.svg
new file mode 100644
index 0000000..9903c7f
--- /dev/null
+++ b/src_old/resources/css/images/touch.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
+    <title>touch_update</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <circle id="path-1" cx="859" cy="783" r="24"></circle>
+        <filter x="-26.0%" y="-26.0%" width="152.1%" height="152.1%" filterUnits="objectBoundingBox" id="filter-2">
+            <feMorphology radius="0.5" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+            <feOffset dx="0" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+            <feGaussianBlur stdDeviation="4" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+            <feComposite in="shadowBlurOuter1" in2="SourceAlpha" operator="out" result="shadowBlurOuter1"></feComposite>
+            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+        </filter>
+        <filter x="-41.7%" y="-41.7%" width="183.3%" height="183.3%" filterUnits="objectBoundingBox" id="filter-3">
+            <feGaussianBlur stdDeviation="7.5" in="SourceAlpha" result="shadowBlurInner1"></feGaussianBlur>
+            <feOffset dx="5" dy="8" in="shadowBlurInner1" result="shadowOffsetInner1"></feOffset>
+            <feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
+            <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.356034873 0" type="matrix" in="shadowInnerInner1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Sitemap-expanded" transform="translate(-827.000000, -751.000000)" fill-rule="nonzero">
+            <g id="touch_update">
+                <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+                <use fill-opacity="0.236894248" fill="#E4DEDE" fill-rule="evenodd" xlink:href="#path-1"></use>
+                <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-1"></use>
+                <use stroke-opacity="0.225798234" stroke="#CACACA" stroke-width="1" xlink:href="#path-1"></use>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src_old/resources/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/src_old/resources/css/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100644
index 0000000..5b5dab2
Binary files /dev/null and b/src_old/resources/css/images/ui-bg_flat_0_aaaaaa_40x100.png differ
diff --git a/src_old/resources/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/src_old/resources/css/images/ui-bg_glass_55_fbf9ee_1x400.png
new file mode 100644
index 0000000..ad3d634
Binary files /dev/null and b/src_old/resources/css/images/ui-bg_glass_55_fbf9ee_1x400.png differ
diff --git a/src_old/resources/css/images/ui-bg_glass_65_ffffff_1x400.png b/src_old/resources/css/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 0000000..42ccba2
Binary files /dev/null and b/src_old/resources/css/images/ui-bg_glass_65_ffffff_1x400.png differ
diff --git a/src_old/resources/css/images/ui-bg_glass_75_dadada_1x400.png b/src_old/resources/css/images/ui-bg_glass_75_dadada_1x400.png
new file mode 100644
index 0000000..5a46b47
Binary files /dev/null and b/src_old/resources/css/images/ui-bg_glass_75_dadada_1x400.png differ
diff --git a/src_old/resources/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/src_old/resources/css/images/ui-bg_glass_75_e6e6e6_1x400.png
new file mode 100644
index 0000000..86c2baa
Binary files /dev/null and b/src_old/resources/css/images/ui-bg_glass_75_e6e6e6_1x400.png differ
diff --git a/src_old/resources/css/images/ui-bg_glass_75_ffffff_1x400.png b/src_old/resources/css/images/ui-bg_glass_75_ffffff_1x400.png
new file mode 100644
index 0000000..e65ca12
Binary files /dev/null and b/src_old/resources/css/images/ui-bg_glass_75_ffffff_1x400.png differ
diff --git a/src_old/resources/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/src_old/resources/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
new file mode 100644
index 0000000..7c9fa6c
Binary files /dev/null and b/src_old/resources/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ
diff --git a/src_old/resources/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png b/src_old/resources/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png
new file mode 100644
index 0000000..0e05810
Binary files /dev/null and b/src_old/resources/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png differ
diff --git a/src_old/resources/css/images/ui-icons_222222_256x240.png b/src_old/resources/css/images/ui-icons_222222_256x240.png
new file mode 100644
index 0000000..b273ff1
Binary files /dev/null and b/src_old/resources/css/images/ui-icons_222222_256x240.png differ
diff --git a/src_old/resources/css/images/ui-icons_2e83ff_256x240.png b/src_old/resources/css/images/ui-icons_2e83ff_256x240.png
new file mode 100644
index 0000000..09d1cdc
Binary files /dev/null and b/src_old/resources/css/images/ui-icons_2e83ff_256x240.png differ
diff --git a/src_old/resources/css/images/ui-icons_454545_256x240.png b/src_old/resources/css/images/ui-icons_454545_256x240.png
new file mode 100644
index 0000000..59bd45b
Binary files /dev/null and b/src_old/resources/css/images/ui-icons_454545_256x240.png differ
diff --git a/src_old/resources/css/images/ui-icons_888888_256x240.png b/src_old/resources/css/images/ui-icons_888888_256x240.png
new file mode 100644
index 0000000..6d02426
Binary files /dev/null and b/src_old/resources/css/images/ui-icons_888888_256x240.png differ
diff --git a/src_old/resources/css/images/ui-icons_cd0a0a_256x240.png b/src_old/resources/css/images/ui-icons_cd0a0a_256x240.png
new file mode 100644
index 0000000..2ab019b
Binary files /dev/null and b/src_old/resources/css/images/ui-icons_cd0a0a_256x240.png differ
diff --git a/src_old/resources/css/jquery-ui-themes.css b/src_old/resources/css/jquery-ui-themes.css
new file mode 100644
index 0000000..8afb633
--- /dev/null
+++ b/src_old/resources/css/jquery-ui-themes.css
@@ -0,0 +1,412 @@
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+*/
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden { display: none; }
+.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
+.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }/* Accordion
+----------------------------------*/
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
+.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; }
+.ui-accordion .ui-accordion-content-active { display: block; }
+
+/* Datepicker
+----------------------------------*/
+.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; }
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
+.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
+.ui-datepicker-row-break { clear:both; width:100%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
+.ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}
+
+/* Dialog
+----------------------------------*/
+.ui-dialog { position: relative; padding: 0px; width: 300px;}
+.ui-dialog .ui-dialog-titlebar { padding: .3em .3em .1em .8em; font-size:.7em; position: relative; background-image: none; }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em;     
+                              font-family: 'Trebuchet MS';
+    font-size: 15px;
+    font-weight: normal;
+    color: #ffffff;} 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .1em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { /*padding: 0;*/ }
+.ui-dialog .ui-dialog-content { border: 0; padding: .5em .2em; background: none; overflow: auto; zoom: 1; background-color: #ffffff;}
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; background-color: #8f949a; border-bottom: 1px solid #d9d9d9;}
+
+/* Progressbar
+----------------------------------*/
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* Resizable
+----------------------------------*/
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Slider
+----------------------------------*/
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
+----------------------------------*/
+.ui-tabs { padding: .2em; zoom: 1; }
+.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; }
+.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; }
+.ui-tabs .ui-tabs-hide { display: none !important; }
+/*
+* jQuery UI CSS Framework
+* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* To view and modify this theme, visit http://jqueryui.com/themeroller/
+*/
+
+
+/* Component containers
+----------------------------------*/
+.ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1.1em/*{fsDefault}*/; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; }
+.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_glass_75_ffffff_1x400.png)/*{bgImgUrlContent}*/ 0/*{bgContentXPos}*/ 0/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; }
+.ui-widget-content a { /*color: #222222*//*{fcContent}*/; }
+.ui-widget-header { border: none /*1px solid #aaaaaa*//*{borderColorHeader}*/; background: #D3D3D3/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 0/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #000000/*{fcHeader}*/; font-weight: bold; }
+.ui-widget-header a { color: #222222/*{fcHeader}*/; }
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default, .ui-widget-content .ui-state-default { border: none /*1px solid #d3d3d3*//*{borderColorDefault}*/; /*background: #e6e6e6*//*{bgColorDefault}*/ /*url(images/ui-bg_glass_75_e6e6e6_1x400.png)*//*{bgImgUrlDefault}*/ /*0*//*{bgDefaultXPos}*/ /*50%*//*{bgDefaultYPos}*/ /*repeat-x*//*{bgDefaultRepeat}*/ font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; outline: none; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555/*{fcDefault}*/; text-decoration: none; outline: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: none /*1px solid #999999*//*{borderColorHover}*/; /*background: #dadada*//*{bgColorHover}*/ /*url(images/ui-bg_glass_75_dadada_1x400.png)*//*{bgImgUrlHover}*/ /*0*//*{bgHoverXPos}*/ /*50%*//*{bgHoverYPos}*/ /*repeat-x*//*{bgHoverRepeat}*/ font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; outline: none; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #212121/*{fcHover}*/; text-decoration: none; outline: none; }
+.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 0/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; outline: none; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121/*{fcActive}*/; outline: none; text-decoration: none; }
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 0/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636/*{fcHighlight}*/; }
+.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_inset-soft_95_fef1ec_1x100.png)/*{bgImgUrlError}*/ 0/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; }
+.ui-state-error a, .ui-widget-content .ui-state-error a { color: #363636/*{fcError}*/; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a/*{fcError}*/; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHeader}*/; }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHover}*/; }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; }
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-tl { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-tr { -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-br { -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-top { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-right {  -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-left { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; }
+.ui-corner-all { -moz-border-radius: 0px/*{cornerRadius}*/; -webkit-border-radius: 0px/*{cornerRadius}*/; }
+
+/* Overlays */
+.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ none/*{bgImgUrlOverlay}*/ 0/*{bgOverlayXPos}*/ 0/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; }
+.ui-widget-shadow { margin: -4px/*{offsetTopShadow}*/ 0 0 -4px/*{offsetLeftShadow}*/; padding: 4px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ none/*{bgImgUrlShadow}*/ 0/*{bgShadowXPos}*/ 0/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .35;filter:Alpha(Opacity=35)/*{opacityShadow}*/; -moz-border-radius: 4px/*{cornerRadiusShadow}*/; -webkit-border-radius: 4px/*{cornerRadiusShadow}*/; }
\ No newline at end of file
diff --git a/src_old/resources/css/previewfonts.css b/src_old/resources/css/previewfonts.css
new file mode 100644
index 0000000..bbc04ec
--- /dev/null
+++ b/src_old/resources/css/previewfonts.css
@@ -0,0 +1,12 @@
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url('previewfonts/SourceSansPro-Regular.woff2') format('woff2'), url('previewfonts/SourceSansPro-Regular.woff') format('woff');
+}
+@font-face {
+  font-family: 'Source Sans Pro Semibold';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Sans Pro Semibold'), local('SourceSansPro-Semibold'), url('previewfonts/SourceSansPro-Semibold.woff2') format('woff2'), url('previewfonts/SourceSansPro-Semibold.woff') format('woff');
+}
\ No newline at end of file
diff --git a/src_old/resources/css/previewfonts/SourceSansPro-OpenFontLicense.txt b/src_old/resources/css/previewfonts/SourceSansPro-OpenFontLicense.txt
new file mode 100644
index 0000000..bce8032
--- /dev/null
+++ b/src_old/resources/css/previewfonts/SourceSansPro-OpenFontLicense.txt
@@ -0,0 +1,93 @@
+Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name ‘Source’.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/src_old/resources/css/previewfonts/SourceSansPro-Regular.woff2 b/src_old/resources/css/previewfonts/SourceSansPro-Regular.woff2
new file mode 100644
index 0000000..0dd3464
Binary files /dev/null and b/src_old/resources/css/previewfonts/SourceSansPro-Regular.woff2 differ
diff --git a/src_old/resources/css/previewfonts/SourceSansPro-Semibold.woff2 b/src_old/resources/css/previewfonts/SourceSansPro-Semibold.woff2
new file mode 100644
index 0000000..2526d2e
Binary files /dev/null and b/src_old/resources/css/previewfonts/SourceSansPro-Semibold.woff2 differ
diff --git a/src_old/resources/css/reset.css b/src_old/resources/css/reset.css
new file mode 100644
index 0000000..01a4271
--- /dev/null
+++ b/src_old/resources/css/reset.css
@@ -0,0 +1,24 @@
+html,body,div,span,
+applet,object,iframe,
+h1,h2,h3,h4,h5,h6,p,blockquote,pre,
+a,abbr,acronym,address,big,cite,code,
+del,dfn,em,font,img,ins,kbd,q,s,samp,
+small,strike,strong,sub,sup,tt,var,
+dd,dl,dt,li,ol,ul,
+fieldset,form,label,legend,
+table,caption,tbody,tfoot,thead,tr,th,td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+ol,ul {
+	list-style: none;
+}
+q:before,q:after,
+blockquote:before,blockquote:after {
+	content: "";
+}
\ No newline at end of file
diff --git a/src_old/resources/expand.html b/src_old/resources/expand.html
new file mode 100644
index 0000000..295783b
--- /dev/null
+++ b/src_old/resources/expand.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+    <title></title>
+    <link type="text/css" href="css/default.css" rel="Stylesheet" />
+    <script type="text/javascript" src="scripts/jquery-3.2.1.min.js"></script>
+    <script type="text/javascript" src="scripts/messagecenter.js"></script>
+    <script type="text/javascript">
+<!--
+            $(document).ready(function () {
+                $axure.messageCenter.addMessageListener(messageCenter_message);
+                function messageCenter_message(message, data) {
+                    if(message == 'collapseFrameOnLoad') {
+                        setTimeout(function() {
+                            $('#maximizePanel').animate({
+                                left:'-' + maxPanelWidth + 'px'
+                            }, 300);
+                        }, 2000);
+                    }
+                }
+                $axure.messageCenter.postMessage('getCollapseFrameOnLoad');
+
+                if(MOBILE_DEVICE) {
+                    $('#maximizePanel').height('45px');
+                }
+                var maxPanelWidth = $('#maximizePanel').width();
+
+                $('#maximizePanel').click(function () {
+                    $(this).removeClass('maximizePanelOver');
+                    $axure.messageCenter.postMessage('expandFrame');
+                });
+
+                if(!MOBILE_DEVICE) {
+                    $('#maximizePanel').mouseenter(function() {
+                        $(this).addClass('maximizePanelOver');
+                    });
+                    $('#maximizePanel').mouseleave(function() {
+                        if($(this).hasClass('maximizePanelOver')) {
+                            $(this).animate({
+                                left:'-' + maxPanelWidth + 'px'
+                            }, 300);
+                        }
+                        $(this).removeClass('maximizePanelOver');
+                    });
+                    $('#maximizePanelOver').mouseenter(function() {
+                        $('#maximizePanel').animate({
+                            left:'0px'
+                        }, 100);
+                    });
+                }
+            });
+        --></script>
+</head>
+<body style="background-color: transparent;">
+    <div id="maximizePanelOver">
+        <div id="maximizePanel" class="maximizePanel" title="Expand">
+        </div>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src_old/resources/images/axure9_logo.svg b/src_old/resources/images/axure9_logo.svg
new file mode 100644
index 0000000..0aa619c
--- /dev/null
+++ b/src_old/resources/images/axure9_logo.svg
@@ -0,0 +1 @@
+<svg height="14" viewBox="0 0 50 14" width="50" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><g fill="#3f4040"><path d="m6.7827 7.0792v2.741c-.866.119-2.101.146-2.521.146-1.998 0-2.09-.542-2.09-1.581 0-1.013.345-1.306 1.541-1.306zm-2.619-6.916c-.624 0-1.476.017-2.547.147l-.056.012c-.367.105-.561.358-.561.731v.432c0 .445.287.732.733.732h2.431c1.885 0 2.619.476 2.619 1.698v1.13h-3.07c-2.568 0-3.713 1.03-3.713 3.34 0 2.568 1.184 3.615 4.085 3.615 1.159 0 3.295-.091 4.09-.334.504-.14.76-.472.76-.987v-6.881c0-2.446-1.561-3.635-4.771-3.635z" transform="translate(0 .8362)"/><path d="m8.6973.3014h-.686c-.425 0-.733.308-.733.732v8.913h-2.717c-1.659 0-2.345 0-2.345-2.796v-6.117c0-.424-.309-.732-.733-.732h-.667c-.429 0-.752.315-.752.732v6.117c0 4.1 1.56 4.85 4.633 4.85 1.101 0 2.608 0 4.057-.205l.039-.008c.526-.132.636-.473.636-.736v-10.018c0-.424-.308-.732-.732-.732" transform="translate(22 .8362)"/><path d="m5.2529.3297-.062-.017c-.411-.086-1.525-.149-2.076-.149-2.549 0-3.085 1.348-3.085 2.478v8.527c0 .425.308.733.733.733h.686c.425 0 .733-.308.733-.733v-8.371c0-.272 0-.58 1.11-.58l1.688-.003c.206.026.402-.032.553-.161.165-.14.256-.342.256-.569v-.431c0-.341-.201-.611-.536-.724" transform="translate(34 .8362)"/><path d="m5.4444.1637c-2.024 0-3.174.399-3.843 1.335-.691.966-.83 2.466-.83 4.574 0 4.099.675 5.927 4.673 5.927.472 0 2.083-.009 3.032-.125.443-.073.641-.417.641-.725v-.451c0-.429-.323-.752-.752-.752h-2.921c-2.113 0-2.466-.47-2.521-3.345v-.958c.018-2.946.372-3.426 2.521-3.426 1.957 0 2.317.406 2.393 2.867h-3.282v2.073h4.457c.451 0 .988-.161.988-.929v-.576c-.063-4.207-1.127-5.489-4.556-5.489" transform="translate(40 .8362)"/></g><path d="m19.9341 1.496c-.111-.237-.346-.378-.629-.378h-.882c-.305 0-.543.128-.661.349l-1.362 1.994 1.314 1.802 2.101-3.022c.269-.328.173-.63.119-.745" fill="#74bb11"/><path d="m13.0293 1.4428-.003-.004c-.159-.213-.382-.321-.661-.321h-.862c-.274 0-.498.128-.618.351-.121.227-.098.498.068.746l3.139 4.361-3.621 5.062c-.157.237-.178.503-.056.73.119.223.344.351.617.351h.882c.274 0 .522-.144.636-.36l4.172-5.762z" fill="#009cd9"/><path d="m20.3711 11.6977-2.687-3.699-1.296 1.793 2.109 2.822.086.038c.105.045.206.067.31.067h.863c.257 0 .476-.117.601-.32.128-.207.134-.462.014-.701" fill="#eb2084"/></g></svg>
\ No newline at end of file
diff --git a/src_old/resources/images/axure_logo.png b/src_old/resources/images/axure_logo.png
new file mode 100644
index 0000000..ed8be89
Binary files /dev/null and b/src_old/resources/images/axure_logo.png differ
diff --git a/src_old/resources/images/axure_logo.svg b/src_old/resources/images/axure_logo.svg
new file mode 100644
index 0000000..999ccf4
--- /dev/null
+++ b/src_old/resources/images/axure_logo.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="52px" height="12px" viewBox="0 0 52 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
+    <title>axure_logo</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="updated_header-copy" transform="translate(-1371.000000, -12.000000)" fill="#3D4557">
+            <g id="axure_logo" transform="translate(1371.000000, 12.000000)">
+                <path d="M23.6337569,0.211361346 L19.4142734,6.12413879 C20.5929844,7.76544547 22.4073623,10.3236224 23.4927644,11.7946181 L20.5223167,11.7946181 L17.9762186,8.20017753 C17.1271762,9.43098196 16.2788199,10.5887458 15.4297775,11.7946181 L12.5066702,11.7946181 L16.5141504,6.12413879 C15.1944469,4.24193858 13.6623971,2.1427235 12.3420075,0.211361346 L15.2884419,0.211361346 L17.9762186,4.04915352 L20.6633092,0.211361346 L23.6337569,0.211361346 Z" id="Fill-5-Copy-124"></path>
+                <path d="M11.6136895,6.03116989 L11.6136895,11.8575336 L9.24336066,11.8575336 L9.24336066,10.4558287 C8.49296706,11.4226674 7.06182513,12.0035446 5.7952372,12.0035446 C2.6052109,12.0035446 0,9.31940634 0,6.03116989 C0,2.74293344 2.6052109,0.0591470426 5.7952372,0.0591470426 C7.06182513,0.0591470426 8.49296706,0.638265082 9.24336066,1.60580737 L9.24336066,0.228027151 L11.6136895,0.228027151 L11.6136895,6.03116989 L11.6136895,6.03116989 Z M5.7952372,9.56146783 C7.69648468,9.56146783 9.24336066,7.98841998 9.24336066,6.03116989 C9.24336066,4.07216063 7.69648468,2.50052012 5.7952372,2.50052012 C3.89467252,2.50052012 2.34745514,4.07216063 2.34745514,6.03116989 C2.34745514,7.98841998 3.89467252,9.56146783 5.7952372,9.56146783 L5.7952372,9.56146783 Z" id="Fill-1-Copy-126"></path>
+                <path d="M33.9017123,11.8397627 L31.548487,11.8397627 L31.548487,10.8706411 C31.0307226,11.6705454 29.8537675,12.0086274 29.006579,12.0086274 C25.8999928,12.0086274 24.0885024,9.73230222 24.0885024,6.9218849 L24.0885024,0.211361346 L26.4413853,0.211361346 L26.4413853,6.9218849 C26.4413853,8.39971598 27.5477984,9.56237985 29.006579,9.56237985 C30.39516,9.56237985 31.4776026,8.4233359 31.548487,6.99485986 L31.548487,0.211361346 L33.9017123,0.211361346 L33.9017123,11.8397627" id="Fill-2-Copy-128"></path>
+                <path d="M37.4691032,5.23094818 L37.4691032,11.7946181 L35.1006626,11.7946181 L35.1006626,0.211361346 L37.4691032,0.211361346 L37.4691032,1.27329157 C37.8195915,0.596591985 39.2986725,0.211361346 40.307478,0.211361346 L40.7524991,0.211361346 L40.7524991,2.67269366 L40.307478,2.67269366 C39.2747833,2.67269366 37.4691032,3.1548465 37.4691032,5.23094818" id="Fill-3-Copy-125"></path>
+                <path d="M50.9313232,9.28841829 C49.5903307,11.130254 47.7551081,11.8564131 46.1557058,11.8564131 C43.004476,11.8564131 40.4405722,9.21685989 40.4405722,5.9706465 C40.4405722,2.6997578 43.004476,0.0591470426 46.1557058,0.0591470426 C49.8254664,0.0591470426 52.6002052,3.64482221 51.7777435,7.32743609 L42.9805175,7.32743609 C43.404241,8.63452255 44.8150555,9.60390976 46.1557058,9.60390976 C47.1670976,9.60390976 47.7082178,9.26480049 48.3208714,8.73181378 L50.9313232,9.28841829 L50.9313232,9.28841829 Z M42.910011,4.97693648 L49.3794957,4.97693648 C48.9554299,3.57220629 47.6616699,2.48155755 46.1557058,2.48155755 C44.6976588,2.48155755 43.3806247,3.6201469 42.910011,4.97693648 L42.910011,4.97693648 Z" id="Fill-4-Copy-124"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src_old/resources/images/caret_down.svg b/src_old/resources/images/caret_down.svg
new file mode 100644
index 0000000..692dab8
--- /dev/null
+++ b/src_old/resources/images/caret_down.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="5" viewBox="0 0 10 5">
+    <path fill="#666" fill-rule="evenodd" d="M10 0L5 5 0 0h2l3 3 3-3z"/>
+</svg>
diff --git a/src_old/resources/images/caret_down_off.svg b/src_old/resources/images/caret_down_off.svg
new file mode 100644
index 0000000..7b640d8
--- /dev/null
+++ b/src_old/resources/images/caret_down_off.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="5" viewBox="0 0 10 5">
+    <path fill="#008DCB" fill-rule="evenodd" d="M10 0L5 5 0 0h2l3 3 3-3z"/>
+</svg>
\ No newline at end of file
diff --git a/src_old/resources/images/close_x.svg b/src_old/resources/images/close_x.svg
new file mode 100644
index 0000000..325ca55
--- /dev/null
+++ b/src_old/resources/images/close_x.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="9" height="8" viewBox="0 0 9 8">
+    <g fill="#666" fill-rule="evenodd">
+        <path d="M7.682.11l.707.708-7.071 7.071-.707-.707z"/>
+        <path d="M8.39 7.182l-.708.707L.611.818l.707-.707z"/>
+    </g>
+</svg>
diff --git a/src_old/resources/images/close_x_minimize.svg b/src_old/resources/images/close_x_minimize.svg
new file mode 100644
index 0000000..24f693b
--- /dev/null
+++ b/src_old/resources/images/close_x_minimize.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="9" height="9" viewBox="0 0 9 9">
+    <g fill="#6D6D6D" fill-rule="evenodd">
+        <path d="M7.018-.053l1.178 1.178-7.07 7.071-1.18-1.178z"/>
+        <path d="M1.125-.053l7.07 7.07-1.178 1.18-7.071-7.072z"/>
+    </g>
+</svg>
diff --git a/src_old/resources/images/divider.png b/src_old/resources/images/divider.png
new file mode 100644
index 0000000..f7b738a
Binary files /dev/null and b/src_old/resources/images/divider.png differ
diff --git a/src_old/resources/images/divider.svg b/src_old/resources/images/divider.svg
new file mode 100644
index 0000000..767941e
--- /dev/null
+++ b/src_old/resources/images/divider.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="58" height="2" viewBox="0 0 58 2" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+ <defs>
+  <path id="path-1" d="M245.5,521 L305.5,521" stroke-linejoin="round" stroke="#bababa" stroke-dasharray="1 8" stroke-width="2" stroke-linecap="round"/>
+ </defs>
+ <g id="Axshare---Web-View" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+  <g id="Share-Page-Notes-Copy" sketch:type="MSArtboardGroup" transform="translate(-244.000000, -520.000000)">
+   <g id="divider">
+    <use xlink:href="#path-1"/>
+   </g>
+  </g>
+ </g>
+</svg>
diff --git a/src_old/resources/images/exit.svg b/src_old/resources/images/exit.svg
new file mode 100644
index 0000000..f6e38c0
--- /dev/null
+++ b/src_old/resources/images/exit.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="19" viewBox="0 0 18 19">
+    <g fill="#FFF" fill-rule="nonzero">
+        <path d="M16.305 18.94H6.547a.714.714 0 0 1-.717-.712v-3.344c0-.393.321-.712.717-.712.395 0 .716.319.716.712v2.632h8.325V1.484H7.263v2.632c0 .393-.32.712-.716.712a.714.714 0 0 1-.717-.712V.772c0-.394.321-.713.717-.713h9.758c.395 0 .716.32.716.713v17.456c0 .394-.32.713-.716.713z"/>
+        <path d="M.363 9.01l3.29-3.476a.719.719 0 0 1 1.217.277.71.71 0 0 1-.174.699L2.548 8.787h9.072c.396 0 .717.32.717.713 0 .394-.321.713-.717.713H2.548l2.148 2.277a.71.71 0 0 1-.353 1.192.719.719 0 0 1-.69-.216L.363 9.99a.71.71 0 0 1 0-.978z"/>
+    </g>
+</svg>
diff --git a/src_old/resources/images/favicon_play.ico b/src_old/resources/images/favicon_play.ico
new file mode 100644
index 0000000..6f9a873
Binary files /dev/null and b/src_old/resources/images/favicon_play.ico differ
diff --git a/src_old/resources/images/overflow-icon.svg b/src_old/resources/images/overflow-icon.svg
new file mode 100644
index 0000000..31a4669
--- /dev/null
+++ b/src_old/resources/images/overflow-icon.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="3" height="12" viewBox="0 0 3 12">
+    <g fill="#6D6D6D" fill-rule="evenodd">
+        <circle cx="1.5" cy="10.5" r="1.5"/>
+        <circle cx="1.5" cy="1.5" r="1.5"/>
+        <circle cx="1.5" cy="6" r="1.5"/>
+    </g>
+</svg>
diff --git a/src_old/resources/images/overflow_checkmark.svg b/src_old/resources/images/overflow_checkmark.svg
new file mode 100644
index 0000000..1902c82
--- /dev/null
+++ b/src_old/resources/images/overflow_checkmark.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="8" viewBox="0 0 10 8">
+    <path fill="#FFF" fill-rule="evenodd" d="M8.404 0L10 1.548 3.865 7.5 0 3.75l1.596-1.548 2.27 2.202L8.403 0z"/>
+</svg>
diff --git a/src_old/resources/images/overflow_icon_off.svg b/src_old/resources/images/overflow_icon_off.svg
new file mode 100644
index 0000000..392e0e7
--- /dev/null
+++ b/src_old/resources/images/overflow_icon_off.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="3" height="12" viewBox="0 0 3 12">
+    <g fill="#008DCB" fill-rule="evenodd">
+        <circle cx="1.5" cy="10.5" r="1.5"/>
+        <circle cx="1.5" cy="1.5" r="1.5"/>
+        <circle cx="1.5" cy="6" r="1.5"/>
+    </g>
+</svg>
diff --git a/src_old/resources/images/refresh.svg b/src_old/resources/images/refresh.svg
new file mode 100644
index 0000000..258992e
--- /dev/null
+++ b/src_old/resources/images/refresh.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="23" height="20" viewBox="0 0 23 20">
+    <g fill="#FFF" fill-rule="nonzero">
+        <path d="M16.097 3.636H14.73v1.48h1.367c2.797 0 5.065 2.32 5.065 5.183 0 2.861-2.268 5.181-5.065 5.181h-3.041l1.647-2a.753.753 0 0 0-.087-1.045.713.713 0 0 0-1.02.09l-2.573 3.13a.753.753 0 0 0 0 .955l2.573 3.127a.715.715 0 0 0 1.234-.226.754.754 0 0 0-.127-.73l-1.5-1.82h2.894c3.596 0 6.512-2.983 6.512-6.662 0-3.68-2.916-6.663-6.512-6.663zM0 9.739c0 3.658 2.867 6.625 6.403 6.625h1.345V14.89H6.403c-2.75 0-4.98-2.307-4.98-5.152 0-2.846 2.23-5.153 4.98-5.153h2.66L7.512 6.487a.754.754 0 0 0 .085 1.038c.3.262.75.223 1.003-.088l2.538-3.114a.756.756 0 0 0 0-.95L8.607.266A.702.702 0 0 0 7.934.01a.722.722 0 0 0-.548.475.76.76 0 0 0 .124.728l1.546 1.902H6.403C2.868 3.116.001 6.08 0 9.739z"/>
+    </g>
+</svg>
diff --git a/src_old/resources/images/resize.svg b/src_old/resources/images/resize.svg
new file mode 100644
index 0000000..3c62509
--- /dev/null
+++ b/src_old/resources/images/resize.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+    <g fill="#ACACAC" fill-rule="evenodd">
+        <path d="M8.104 9.956l1.389-1.439.72.695-1.39 1.439zM5.276 10.005L9.444 5.69l.719.695L5.995 10.7zM2.448 10.055L9.394 2.86l.72.695-6.947 7.193zM.314 9.385L8.65.753l.72.694-8.336 8.632z"/>
+    </g>
+</svg>
diff --git a/src_old/resources/images/return.svg b/src_old/resources/images/return.svg
new file mode 100644
index 0000000..b5bc16d
--- /dev/null
+++ b/src_old/resources/images/return.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="18" viewBox="0 0 22 18">
+    <path fill="#008FE0" fill-rule="nonzero" d="M21.6 4.89V16.8c0 .66-.54 1.2-1.2 1.2H2.73c-.66 0-1.2-.54-1.2-1.2 0-.66.54-1.2 1.2-1.2H19.2V6H4.11l1.65 1.68c.48.48.48 1.26 0 1.74-.24.24-.54.36-.84.36-.3 0-.6-.12-.84-.36L.36 5.73C.12 5.49 0 5.19 0 4.89c0-.33.12-.63.36-.84L4.08.36c.48-.48 1.23-.48 1.71 0s.45 1.2 0 1.68L4.11 3.6H20.4c.66 0 1.2.63 1.2 1.29z"/>
+</svg>
diff --git a/src_old/resources/images/transparent.gif b/src_old/resources/images/transparent.gif
new file mode 100644
index 0000000..35d42e8
Binary files /dev/null and b/src_old/resources/images/transparent.gif differ
diff --git a/src_old/resources/images/views-icon.svg b/src_old/resources/images/views-icon.svg
new file mode 100644
index 0000000..0f78550
--- /dev/null
+++ b/src_old/resources/images/views-icon.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="10" viewBox="0 0 16 10">
+    <g fill="#4A4A4A" fill-rule="nonzero">
+        <path d="M.05 3.8h.833V.917H14.45v8.166H9.217v.834h6.066V.083H.05z"/>
+        <path d="M.05 9.917h8.217v-5.15H.05v5.15zM.883 5.6h6.55v3.483H.883V5.6z"/>
+    </g>
+</svg>
diff --git a/src_old/resources/reload.html b/src_old/resources/reload.html
new file mode 100644
index 0000000..5f99f0b
--- /dev/null
+++ b/src_old/resources/reload.html
@@ -0,0 +1,24 @@
+<html>
+	<head>
+		<title></title>
+	</head>
+	<body>
+	
+	<script language="javascript">
+	function getUrl() {
+      var query = window.location.hash.substring(1);
+      var vars = query.split("&&&");
+      for (var i=0;i<vars.length;i++) {
+        var url = vars[i];
+        return decodeURI(url).replace("html%23","html#");
+      } 
+    }
+
+    var rel = '../';
+    var url = getUrl();
+    if (url.indexOf(":") > 0 && url.indexOf(":") < 10) rel = '';
+	self.location.href = rel + url;
+	</script>
+	
+	</body>
+</html>
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/action.js b/src_old/resources/scripts/axure/action.js
new file mode 100644
index 0000000..14b3264
--- /dev/null
+++ b/src_old/resources/scripts/axure/action.js
@@ -0,0 +1,2115 @@
+$axure.internal(function($ax) {
+    var _actionHandlers = {};
+    var _action = $ax.action = {};
+
+    var queueTypes = _action.queueTypes = {
+        none: 0,
+        move: 1,
+        setState: 2,
+        fade: 3,
+        resize: 4,
+        rotate: 5
+    };
+
+    var animationQueue = {};
+
+    // using array as the key doesn't play nice
+    var nextAnimationId = 1;
+    var animationsToCount = {};
+    var actionToActionGroups = {};
+    var getAnimation = function(id, type) {
+        return animationQueue[id] && animationQueue[id][type] && animationQueue[id][type][0];
+    };
+
+    var _addAnimation = _action.addAnimation = function (id, type, func, suppressFire) {
+
+        var wasEmpty = !getAnimation(id, type);
+        // Add the func to the queue. Create the queue if necessary.
+        var idQueue = animationQueue[id];
+        if(!idQueue) animationQueue[id] = idQueue = {};
+
+        var queue = idQueue[type];
+        if(!queue) idQueue[type] = queue = [];
+
+        queue[queue.length] = func;
+        // If it was empty, there isn't a callback waiting to be called on this. You have to fire it manually.
+        // If this is waiting on something, suppress it, and it will fire when it's ready
+        if(wasEmpty && !suppressFire) func();
+    };
+
+    var _addAnimations = function (animations) {
+        if(animations.length == 1) {
+            _addAnimation(animations[0].id, animations[0].type, animations[0].func);
+            return;
+        }
+        var allReady = true;
+        var readyCount = 0;
+        for(var i = 0; i < animations.length; i++) {
+            var animation = animations[i];
+            var thisReady = !getAnimation(animation.id, animation.type);
+            allReady = allReady && thisReady;
+            if (thisReady) readyCount++;
+            else {
+                var typeToGroups = actionToActionGroups[animation.id];
+                if (!typeToGroups) actionToActionGroups[animation.id] = typeToGroups = {};
+
+                var groups = typeToGroups[animation.type];
+                if (!groups) typeToGroups[animation.type] = groups = [];
+
+                groups[groups.length] = animations;
+            }
+        }
+
+        for(i = 0; i < animations.length; i++) {
+            animation = animations[i];
+            _addAnimation(animation.id, animation.type, animation.func, true);
+        }
+
+        if (allReady) {
+            for (i = 0; i < animations.length; i++) animations[i].func();
+        } else {
+            animations.id = nextAnimationId++;
+            animationsToCount[animations.id] = readyCount;
+        }
+    }
+
+    var _fireAnimationFromQueue = _action.fireAnimationFromQueue = function (id, type) {
+        // Remove the function that was just fired
+        if (animationQueue[id] && animationQueue[id][type]) $ax.splice(animationQueue[id][type], 0, 1);
+
+        // Fire the next func if there is one
+        var func = getAnimation(id, type);
+        if(func && !_checkFireActionGroup(id, type, func)) func();
+    };
+
+    var _checkFireActionGroup = function(id, type, func) {
+        var group = actionToActionGroups[id];
+        group = group && group[type];
+        if (!group || group.length == 0) return false;
+
+        var animations = group[0];
+        var found = false;
+        for (var i = 0; i < animations.length; i++) {
+            var animation = animations[i];
+            if (animation.id == id && animation.type == type) {
+                found = func == animation.func;
+                break;
+            }
+        }
+
+        // if found then update this action group, otherwise, keep waiting for right action to fire
+        if(!found) return false;
+        $ax.splice(group, 0, 1);
+        var count = animationsToCount[animations.id] + 1;
+        if(count != animations.length) {
+            animationsToCount[animations.id] = count;
+            return true;
+        }
+        delete animationsToCount[animations.id];
+
+        // Funcs is needed because an earlier func can try to cascade right away (when no animation for example) and will kill this func and move on to the
+        //  next one (which may not even exist). If we get all funcs before calling any, then we know they are all the func we want.
+        var funcs = [];
+        for(i = 0; i < animations.length; i++) {
+            animation = animations[i];
+            funcs.push(getAnimation(animation.id, animation.type));
+        }
+        for(i = 0; i < funcs.length; i++) {
+            funcs[i]();
+        }
+
+        return true;
+    }
+
+    var _refreshing = [];
+    _action.refreshStart = function(repeaterId) { _refreshing.push(repeaterId); };
+    _action.refreshEnd = function() { _refreshing.pop(); };
+
+    // TODO: [ben] Consider moving this to repeater.js
+    var _repeatersToRefresh = _action.repeatersToRefresh = [];
+    var _ignoreAction = function(repeaterId) {
+        for(var i = 0; i < _refreshing.length; i++) if(_refreshing[i] == repeaterId) return true;
+        return false;
+    };
+
+    var _addRefresh = function(repeaterId) {
+        if(_repeatersToRefresh.indexOf(repeaterId) == -1) _repeatersToRefresh.push(repeaterId);
+    };
+
+    var _getIdToResizeMoveState = function(eventInfo) {
+        if(!eventInfo.idToResizeMoveState) eventInfo.idToResizeMoveState = {};
+        return eventInfo.idToResizeMoveState;
+    }
+
+    var _queueResizeMove = function (id, type, eventInfo, actionInfo) {
+        if (type == queueTypes.resize || type == queueTypes.rotate) $ax.public.fn.convertToSingleImage($jobj(id));
+        
+        var idToResizeMoveState = _getIdToResizeMoveState(eventInfo);
+        if(!idToResizeMoveState[id]) {
+            idToResizeMoveState[id] = {};
+            idToResizeMoveState[id][queueTypes.move] = { queue: [], used: 0 };
+            idToResizeMoveState[id][queueTypes.resize] = { queue: [], used: 0 };
+            idToResizeMoveState[id][queueTypes.rotate] = { queue: [], used: 0 };
+        }
+        var state = idToResizeMoveState[id];
+
+        // If this is not a type being queued (no action of it's type waiting already) then if it is an instant, fire right away.
+        var myOptions = type == queueTypes.resize ? actionInfo : actionInfo.options;
+        if(!state[type].queue.length && (!myOptions.easing || myOptions.easing == 'none' || !myOptions.duration)) {
+            var func = type == queueTypes.resize ? _addResize : type == queueTypes.rotate ? _addRotate : _addMove;
+            func(id, eventInfo, actionInfo, { easing: 'none', duration: 0, stop: { instant: true } });
+            return;
+        }
+
+        // Check other 2 types to see if either is empty, if so, we can't do anything, so just queue it up
+        var otherType1 = type == queueTypes.move ? queueTypes.resize : queueTypes.move;
+        var otherType2 = type == queueTypes.rotate ? queueTypes.resize : queueTypes.rotate;
+        if (!state[otherType1].queue.length || !state[otherType2].queue.length) {
+            state[type].queue.push({ eventInfo: eventInfo, actionInfo: actionInfo });
+        } else {
+            var duration = myOptions.duration;
+            var used1 = state[otherType1].used;
+            var used2 = state[otherType2].used;
+
+            while(state[otherType1].queue.length && state[otherType2].queue.length && duration != 0) {
+                var other1 = state[otherType1].queue[0];
+                var otherOptions1 = otherType1 == queueTypes.resize ? other1.actionInfo : other1.actionInfo.options;
+                // If queue up action is a non animation, then don't combo it, just queue it and move on
+                if(!otherOptions1.easing || otherOptions1.easing == 'none' || !otherOptions1.duration) {
+                    func = otherType1 == queueTypes.resize ? _addResize : otherType1 == queueTypes.rotate ? _addRotate : _addMove;
+                    func(id, eventInfo, actionInfo, { easing: 'none', duration: 0, stop: { instant: true } });
+                    continue;
+                }
+                var other2 = state[otherType2].queue[0];
+                var otherOptions2 = otherType2 == queueTypes.resize ? other2.actionInfo : other2.actionInfo.options;
+                // If queue up action is a non animation, then don't combo it, just queue it and move on
+                if(!otherOptions2.easing || otherOptions2.easing == 'none' || !otherOptions2.duration) {
+                    func = otherType2 == queueTypes.resize ? _addResize : otherType2 == queueTypes.rotate ? _addRotate : _addMove;
+                    func(id, eventInfo, actionInfo, { easing: 'none', duration: 0, stop: { instant: true } });
+                    continue;
+                }
+
+                // Other duration is what is left over. When in queue it may be partly finished already
+                var otherDuration1 = otherOptions1.duration - used1;
+                var otherDuration2 = otherOptions2.duration - used2;
+
+                var resizeInfo = type == queueTypes.resize ? actionInfo : otherType1 == queueTypes.resize ? other1.actionInfo : other2.actionInfo;
+                var rotateInfo = type == queueTypes.rotate ? actionInfo : otherType1 == queueTypes.rotate ? other1.actionInfo : other2.actionInfo;
+                var moveInfo = type == queueTypes.move ? actionInfo : otherType1 == queueTypes.move ? other1.actionInfo : other2.actionInfo;
+                var options = { easing: moveInfo.options.easing, duration: Math.min(duration, otherDuration1, otherDuration2) };
+                // Start for self is whole duration - duration left, end is start plus duration of combo to be queued, length is duration
+                var stop = { start: myOptions.duration - duration, len: myOptions.duration };
+                stop.end = stop.start + options.duration;
+                // Start for other is used (will be 0 after 1st round), end is start plus length is duration of combo to be queued, length is other duration
+                var otherStop1 = { start: used1, end: options.duration + used1, len: otherOptions1.duration };
+                var otherStop2 = { start: used2, end: options.duration + used2, len: otherOptions2.duration };
+                options.stop = type == queueTypes.resize ? stop : otherType1 == queueTypes.resize ? otherStop1 : otherStop2;
+                options.moveStop = type == queueTypes.move ? stop : otherType1 == queueTypes.move ? otherStop1 : otherStop2;
+                options.rotateStop = type == queueTypes.rotate ? stop : otherType1 == queueTypes.rotate ? otherStop1 : otherStop2;
+
+                _addResize(id, eventInfo, resizeInfo, options, moveInfo, rotateInfo);
+
+                // Update duration for this animation
+                duration -= options.duration;
+                // For others update used and remove from queue if necessary
+                if(otherDuration1 == options.duration) {
+                    $ax.splice(state[otherType1].queue, 0, 1);
+                    used1 = 0;
+                } else used1 += options.duration;
+
+                if(otherDuration2 == options.duration) {
+                    $ax.splice(state[otherType2].queue, 0, 1);
+                    used2 = 0;
+                } else used2 += options.duration;
+            }
+
+            // Start queue for new type if necessary
+            if(duration) {
+                state[type].queue.push({ eventInfo: eventInfo, actionInfo: actionInfo });
+                state[type].used = myOptions.duration - duration;
+            }
+
+            // Update used for others
+            state[otherType1].used = used1;
+            state[otherType2].used = used2;
+        }
+    };
+
+    _action.flushAllResizeMoveActions = function (eventInfo) {
+        var idToResizeMoveState = _getIdToResizeMoveState(eventInfo);
+        for(var id in idToResizeMoveState) _flushResizeMoveActions(id, idToResizeMoveState);
+    };
+
+    var _flushResizeMoveActions = function(id, idToResizeMoveState) {
+        var state = idToResizeMoveState[id];
+        var move = state[queueTypes.move];
+        var moveInfo = move.queue[0];
+        var resize = state[queueTypes.resize];
+        var resizeInfo = resize.queue[0];
+        var rotate = state[queueTypes.rotate];
+        var rotateInfo = rotate.queue[0];
+        while (moveInfo || resizeInfo || rotateInfo) {
+            var eventInfo = moveInfo ? moveInfo.eventInfo : resizeInfo ? resizeInfo.eventInfo : rotateInfo.eventInfo;
+            moveInfo = moveInfo && moveInfo.actionInfo;
+            resizeInfo = resizeInfo && resizeInfo.actionInfo;
+            rotateInfo = rotateInfo && rotateInfo.actionInfo;
+
+            // Resize is used by default, then rotate
+            if(resizeInfo) {
+                // Check for instant resize
+                if(!resizeInfo.duration || resizeInfo.easing == 'none') {
+                    _addResize(id, resize.queue[0].eventInfo, resizeInfo, { easing: 'none', duration: 0, stop: { instant: true } });
+                    _updateResizeMoveUsed(id, queueTypes.resize, 0, idToResizeMoveState);
+                    resizeInfo = resize.queue[0];
+                    continue;
+                }
+
+                var duration = resizeInfo.duration - resize.used;
+                if(moveInfo) duration = Math.min(duration, moveInfo.options.duration - move.used);
+                if(rotateInfo) duration = Math.min(duration, rotateInfo.options.duration - rotate.used);
+
+                var baseOptions = moveInfo ? moveInfo.options : resizeInfo;
+                var options = { easing: baseOptions.easing, duration: duration };
+
+                options.stop = { start: resize.used, end: resize.used + duration, len: resizeInfo.duration };
+                if(moveInfo) options.moveStop = { start: move.used, end: move.used + duration, len: moveInfo.options.duration };
+                if(rotateInfo) options.rotateStop = { start: rotate.used, end: rotate.used + duration, len: rotateInfo.options.duration };
+
+                _addResize(id, eventInfo, resizeInfo, options, moveInfo, rotateInfo);
+
+                _updateResizeMoveUsed(id, queueTypes.resize, duration, idToResizeMoveState);
+                resizeInfo = resize.queue[0];
+                if(rotateInfo) {
+                    _updateResizeMoveUsed(id, queueTypes.rotate, duration, idToResizeMoveState);
+                    rotateInfo = rotate.queue[0];
+                }
+                if(moveInfo) {
+                    _updateResizeMoveUsed(id, queueTypes.move, duration, idToResizeMoveState);
+                    moveInfo = move.queue[0];
+                }
+            } else if (rotateInfo) {
+                // Check for instant rotate
+                if(!rotateInfo.options.duration || rotateInfo.options.easing == 'none') {
+                    _addRotate(id, rotate.queue[0].eventInfo, rotateInfo, { easing: 'none', duration: 0, stop: { instant: true } });
+                    _updateResizeMoveUsed(id, queueTypes.rotate, 0, idToResizeMoveState);
+                    rotateInfo = rotate.queue[0];
+                    continue;
+                }
+
+                duration = rotateInfo.options.duration - rotate.used;
+                if(moveInfo) duration = Math.min(duration, moveInfo.options.duration - move.used);
+
+                baseOptions = moveInfo ? moveInfo.options : rotateInfo.options;
+                options = { easing: baseOptions.easing, duration: duration };
+
+                options.stop = { start: rotate.used, end: rotate.used + duration, len: rotateInfo.options.duration };
+                if(moveInfo) options.moveStop = { start: move.used, end: move.used + duration, len: moveInfo.options.duration };
+
+                _addRotate(id, eventInfo, rotateInfo, options, moveInfo);
+
+                _updateResizeMoveUsed(id, queueTypes.rotate, duration, idToResizeMoveState);
+                rotateInfo = rotate.queue[0];
+                if(moveInfo) {
+                    _updateResizeMoveUsed(id, queueTypes.move, duration, idToResizeMoveState);
+                    moveInfo = move.queue[0];
+                }
+            } else {
+                if(!moveInfo.options.duration || moveInfo.options.easing == 'none') {
+                    _addMove(id, eventInfo, moveInfo, { easing: 'none', duration: 0, stop: { instant: true } });
+                    _updateResizeMoveUsed(id, queueTypes.move, 0, idToResizeMoveState);
+                    moveInfo = move.queue[0];
+                    continue;
+                }
+
+                duration = moveInfo.options.duration - move.used;
+                options = { easing: moveInfo.options.easing, duration: duration };
+                options.stop = { start: move.used, end: moveInfo.options.duration, len: moveInfo.options.duration };
+                _addMove(id, eventInfo, moveInfo, options);
+
+                _updateResizeMoveUsed(id, queueTypes.move, duration, idToResizeMoveState);
+                moveInfo = move.queue[0];
+            }
+        }
+    };
+
+    var _updateResizeMoveUsed = function(id, type, duration, idToResizeMoveState) {
+        var state = idToResizeMoveState[id][type];
+        state.used += duration;
+        var options = state.queue[0].actionInfo;
+        if(options.options) options = options.options;
+        var optionDur = (options.easing && options.easing != 'none' && options.duration) || 0;
+        if(optionDur <= state.used) {
+            $ax.splice(state.queue, 0, 1);
+            state.used = 0;
+        }
+    }
+
+    var _dispatchAction = $ax.action.dispatchAction = function(eventInfo, actions, currentIndex) {
+        currentIndex = currentIndex || 0;
+        //If no actions, you can bubble
+        if(currentIndex >= actions.length) return;
+        //actions are responsible for doing their own dispatching
+        _actionHandlers[actions[currentIndex].action](eventInfo, actions, currentIndex);
+    };
+
+    _actionHandlers.wait = function(eventInfo, actions, index) {
+        var action = actions[index];
+        var infoCopy = $ax.eventCopy(eventInfo);
+        window.setTimeout(function() {
+            infoCopy.now = new Date();
+            infoCopy.idToResizeMoveState = undefined;
+            _dispatchAction(infoCopy, actions, index + 1);
+            _action.flushAllResizeMoveActions(infoCopy);
+        }, action.waitTime);
+    };
+
+    _actionHandlers.expr = function(eventInfo, actions, index) {
+        var action = actions[index];
+
+        $ax.expr.evaluateExpr(action.expr, eventInfo); //this should be a block
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.setFunction = _actionHandlers.expr;
+
+    _actionHandlers.linkWindow = function(eventInfo, actions, index) {
+        linkActionHelper(eventInfo, actions, index);
+    };
+
+    _actionHandlers.closeCurrent = function(eventInfo, actions, index) {
+        $ax.closeWindow();
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.linkFrame = function(eventInfo, actions, index) {
+        linkActionHelper(eventInfo, actions, index);
+    };
+
+    _actionHandlers.setAdaptiveView = function(eventInfo, actions, index) {
+        var action = actions[index];
+        var view = action.setAdaptiveViewTo;
+
+        if(view) $ax.adaptive.setAdaptiveView(view);
+    };
+
+    var linkActionHelper = function(eventInfo, actions, index) {
+        var action = actions[index];
+        eventInfo.link = true;
+
+        if(action.linkType != 'frame') {
+            var includeVars = _includeVars(action.target, eventInfo);
+            if(action.target.targetType == "reloadPage") {
+                $ax.reload(action.target.includeVariables);
+            } else if(action.target.targetType == "backUrl") {
+                $ax.back();
+            }
+
+            var url = action.target.url;
+            if(!url && action.target.urlLiteral) {
+                url = $ax.expr.evaluateExpr(action.target.urlLiteral, eventInfo, true);
+            }
+
+            if(url) {
+                let useStartHtml = shouldUseStartHtml(action);
+                if(useStartHtml) {
+                    //use start.html to load player
+                    url = urlWithStartHtml(url);
+                    //collapse player for popup
+                    if(action.linkType == "popup") url = urlWithCollapseSitemap(url);
+                }
+                
+                //set useGlobalVarNameInUrl to true to use GLOBAL_VAR_NAME in the url, so player knows how to parse it
+                //without this, we are assuming everything after '#' are global vars 
+                if(action.linkType == "popup") {
+                    $ax.navigate({
+                        url: url,
+                        target: action.linkType,
+                        includeVariables: includeVars,
+                        popupOptions: action.popup,
+                        useGlobalVarNameInUrl : useStartHtml
+                    });
+                } else {
+                    $ax.navigate({
+                        url: url,
+                        target: action.linkType,
+                        includeVariables: includeVars,
+                        useGlobalVarNameInUrl : useStartHtml
+                    });
+                }
+            }
+        } else linkFrame(eventInfo, action);
+        eventInfo.link = false;
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+    
+    //use start.html will add a player to the prototype
+    var shouldUseStartHtml = function(linkAction) {
+        return linkAction.target.targetType == 'page' //only adding player for page, not external links
+               && (linkAction.linkType == "popup" || linkAction.linkType == "new") //only add for popup and new tabs
+               && $axure.utils.isInPlayer() //allow user to view without player (maybe useful for user testing)
+               && !$axure.utils.isShareApp() //share app use special handling on its link, add start.html breaks the handling
+    }
+    
+    var urlWithStartHtml = function(url) {
+        var pageName = url.substring(0, url.lastIndexOf('.html'));
+        var pageHash = $axure.utils.setHashStringVar(START_URL_NAME, PAGE_URL_NAME, pageName);
+        return START_URL_NAME + pageHash;
+    }
+    
+    var urlWithCollapseSitemap = function(url) {
+        return url + '&' + SITEMAP_COLLAPSE_VAR_NAME + '=' + SITEMAP_COLLAPSE_VALUE;
+    }
+
+    var _includeVars = function(target, eventInfo) {
+        if(target.includeVariables) return true;
+        // If it is a url literal, that is a string literal, that has only 1 sto, that is an item that is a page, include vars.
+        if(target.urlLiteral) {
+            var literal = target.urlLiteral;
+            var sto = literal.stos[0];
+            if(literal.exprType == 'stringLiteral' && literal.value.indexOf('[[') == 0 && literal.value.indexOf(']]' == literal.value.length - 2) && literal.stos.length == 1 && sto.sto == 'item' && eventInfo.item) {
+                var data = $ax.repeater.getData(eventInfo, eventInfo.item.repeater.elementId, eventInfo.item.index, sto.name, 'data');
+                if (data && $ax.public.fn.IsPage(data.type)) return true;
+            }
+        }
+        return false;
+    };
+
+    var linkFrame = function(eventInfo, action) {
+        for(var i = 0; i < action.framesToTargets.length; i++) {
+            var framePath = action.framesToTargets[i].framePath;
+            var target = action.framesToTargets[i].target;
+            var includeVars = _includeVars(target, eventInfo);
+
+            var url = target.url;
+            if(!url && target.urlLiteral) {
+                url = $ax.expr.evaluateExpr(target.urlLiteral, eventInfo, true);
+            }
+
+            var id = $ax.getElementIdsFromPath(framePath, eventInfo)[0];
+            if(id) $ax('#' + $ax.INPUT(id)).openLink(url, includeVars);
+        }
+    };
+
+    var _repeatPanelMap = {};
+
+    _actionHandlers.setPanelState = function(eventInfo, actions, index) {
+        var action = actions[index];
+
+        for(var i = 0; i < action.panelsToStates.length; i++) {
+            var panelToState = action.panelsToStates[i];
+            var stateInfo = panelToState.stateInfo;
+            var elementIds = $ax.getElementIdsFromPath(panelToState.panelPath, eventInfo);
+
+            for(var j = 0; j < elementIds.length; j++) {
+                var elementId = elementIds[j];
+                // Need new scope for elementId and info
+                (function(elementId, stateInfo) {
+                    _addAnimation(elementId, queueTypes.setState, function() {
+                        var stateNumber = stateInfo.stateNumber;
+                        if(stateInfo.setStateType == "value") {
+                            var oldTarget = eventInfo.targetElement;
+                            eventInfo.targetElement = elementId;
+                            var stateName = $ax.expr.evaluateExpr(stateInfo.stateValue, eventInfo);
+                            eventInfo.targetElement = oldTarget;
+
+                            // Try for state name first
+                            var states = $ax.getObjectFromElementId(elementId).diagrams;
+                            var stateNameFound = false;
+                            for(var k = 0; k < states.length; k++) {
+                                if(states[k].label == stateName) {
+                                    stateNumber = k + 1;
+                                    stateNameFound = true;
+                                }
+                            }
+
+                            // Now check for index
+                            if(!stateNameFound) {
+                                stateNumber = Number(stateName);
+                                var panelCount = $('#' + elementId).children().length;
+
+                                // Make sure number is not NaN, is in range, and is a whole number.
+                                // Wasn't a state name or number, so return
+                                if(isNaN(stateNumber) || stateNumber <= 0 || stateNumber > panelCount || Math.round(stateNumber) != stateNumber) return _fireAnimationFromQueue(elementId, queueTypes.setState);
+                            }
+                        } else if(stateInfo.setStateType == 'next' || stateInfo.setStateType == 'previous') {
+                            var info = $ax.deepCopy(stateInfo);
+                            var repeat = info.repeat;
+
+                            // Only map it, if repeat exists.
+                            if(typeof (repeat) == 'number') _repeatPanelMap[elementId] = info;
+                            return _progessPanelState(elementId, info, info.repeatSkipFirst);
+                        }
+                        delete _repeatPanelMap[elementId];
+
+                        // If setting to current (to stop repeat) break here
+                        if(stateInfo.setStateType == 'current') return _fireAnimationFromQueue(elementId, queueTypes.setState);
+
+                        $ax('#' + elementId).SetPanelState(stateNumber, stateInfo.options, stateInfo.showWhenSet);
+                    });
+                })(elementId, stateInfo);
+            }
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    var _progessPanelState = function(id, info, skipFirst) {
+        var direction = info.setStateType;
+        var loop = info.loop;
+        var repeat = info.repeat;
+        var options = info.options;
+
+        var hasRepeat = typeof (repeat) == 'number';
+        var currentStateId = $ax.visibility.GetPanelState(id);
+        var stateNumber = '';
+        if(currentStateId != '') {
+            currentStateId = $ax.repeater.getScriptIdFromElementId(currentStateId);
+            var currentStateNumber = Number(currentStateId.substr(currentStateId.indexOf('state') + 5));
+            if(direction == "next") {
+                stateNumber = currentStateNumber + 2;
+
+                if(stateNumber > $ax.visibility.GetPanelStateCount(id)) {
+                    if(loop) stateNumber = 1;
+                    else {
+                        delete _repeatPanelMap[id];
+                        return _fireAnimationFromQueue(id, queueTypes.setState);
+                    }
+                }
+            } else if(direction == "previous") {
+                stateNumber = currentStateNumber;
+                if(stateNumber <= 0) {
+                    if(loop) stateNumber = $ax.visibility.GetPanelStateCount(id);
+                    else {
+                        delete _repeatPanelMap[id];
+                        return _fireAnimationFromQueue(id, queueTypes.setState);
+                    }
+                }
+            }
+
+            if(hasRepeat && _repeatPanelMap[id] != info) return _fireAnimationFromQueue(id, queueTypes.setState);
+
+            if (!skipFirst) $ax('#' + id).SetPanelState(stateNumber, options, info.showWhenSet);
+            else _fireAnimationFromQueue(id, queueTypes.setState);
+
+            if(hasRepeat) {
+                var animate = options && options.animateIn;
+                if(animate && animate.easing && animate.easing != 'none' && animate.duration > repeat) repeat = animate.duration;
+                animate = options && options.animateOut;
+                if(animate && animate.easing && animate.easing != 'none' && animate.duration > repeat) repeat = animate.duration;
+
+                window.setTimeout(function() {
+                    // Either new repeat, or no repeat anymore.
+                    if(_repeatPanelMap[id] != info) return;
+                    _addAnimation(id, queueTypes.setState, function() {
+                        _progessPanelState(id, info, false);
+                    });
+                }, repeat);
+            } else delete _repeatPanelMap[id];
+        }
+    };
+
+    _actionHandlers.fadeWidget = function(eventInfo, actions, index) {
+        var action = actions[index];
+
+        for(var i = 0; i < action.objectsToFades.length; i++) {
+            var fadeInfo = action.objectsToFades[i].fadeInfo;
+            var elementIds = $ax.getElementIdsFromPath(action.objectsToFades[i].objectPath, eventInfo);
+
+            for(var j = 0; j < elementIds.length; j++) {
+                var elementId = elementIds[j];
+                // Need new scope for elementId and info
+                (function(elementId, fadeInfo) {
+                    _addAnimation(elementId, queueTypes.fade, function() {
+                        if(fadeInfo.fadeType == "hide") {
+                            $ax('#' + elementId).hide(fadeInfo.options);
+                        } else if(fadeInfo.fadeType == "show") {
+                            $ax('#' + elementId).show(fadeInfo.options, eventInfo);
+                        } else if(fadeInfo.fadeType == "toggle") {
+                            $ax('#' + elementId).toggleVisibility(fadeInfo.options);
+                        }
+                    });
+                })(elementId, fadeInfo);
+            }
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.setOpacity = function(eventInfo, actions, index) {
+        var action = actions[index];
+
+        for(var i = 0; i < action.objectsToSetOpacity.length; i++) {
+            var opacityInfo = action.objectsToSetOpacity[i].opacityInfo;
+            var elementIds = $ax.getElementIdsFromPath(action.objectsToSetOpacity[i].objectPath, eventInfo);
+
+            for(var j = 0; j < elementIds.length; j++) {
+                var elementId = elementIds[j];
+
+                (function(elementId, opacityInfo) {
+                    _addAnimation(elementId, queueTypes.fade, function () {
+                        var oldTarget = eventInfo.targetElement;
+                        eventInfo.targetElement = elementId;
+                        var opacity = $ax.expr.evaluateExpr(opacityInfo.opacity, eventInfo);
+                        eventInfo.targetElement = oldTarget;
+                        opacity = Math.min(100, Math.max(0, opacity));
+                        $ax('#' + elementId).setOpacity(opacity/100, opacityInfo.easing, opacityInfo.duration);
+                    })
+                })(elementId, opacityInfo);
+            }
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    }
+
+    _actionHandlers.moveWidget = function(eventInfo, actions, index) {
+        var action = actions[index];
+        for(var i = 0; i < action.objectsToMoves.length; i++) {
+            var moveInfo = action.objectsToMoves[i].moveInfo;
+            var elementIds = $ax.getElementIdsFromPath(action.objectsToMoves[i].objectPath, eventInfo);
+
+            for(var j = 0; j < elementIds.length; j++) {
+                var elementId = elementIds[j];
+                _queueResizeMove(elementId, queueTypes.move, eventInfo, moveInfo);
+                //_addMove(eventInfo, elementId, moveInfo, eventInfo.dragInfo);
+            }
+        }
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    //var _compoundChildrenShallow = function (id) {
+    //    var deep = [];
+    //    var children = $ax('#' + id).getChildren()[0].children;
+    //    var piecePrefix = id + 'p';
+
+    //    for (var i = 0; i < children.length; i++) {
+    //        if(children[i].substring(0, id.length + 1) == piecePrefix) {
+    //            deep.push(children[i]);
+    //        }
+    //    }
+    //    return deep;
+    //};
+
+    var _addMove = function (elementId, eventInfo, moveInfo, optionsOverride) {
+        var eventInfoCopy = $ax.eventCopy(eventInfo);
+        var idToResizeMoveState = _getIdToResizeMoveState(eventInfoCopy);
+        eventInfoCopy.targetElement = elementId;
+
+        var options = $ax.deepCopy(moveInfo.options);
+        options.easing = optionsOverride.easing;
+        options.duration = optionsOverride.duration;
+        options.dragInfo = eventInfo.dragInfo;
+
+        if($ax.public.fn.IsLayer($obj(elementId).type)) {
+            var childrenIds = $ax.public.fn.getLayerChildrenDeep(elementId, true);
+            if(childrenIds.length == 0) return;
+
+            var animations = [];
+
+            // Get move delta once, then apply to all children
+            animations.push({
+                id: elementId,
+                type: queueTypes.move,
+                func: function () {
+                    var layerInfo = $ax('#' + elementId).offsetBoundingRect();
+                    //var layerInfo = $ax.public.fn.getWidgetBoundingRect(elementId);
+                   var deltaLoc = _getMoveLoc(elementId, moveInfo, eventInfoCopy, optionsOverride.stop, idToResizeMoveState[elementId], options, layerInfo);
+//                    $ax.event.raiseSyntheticEvent(elementId, "onMove");
+                    $ax.visibility.pushContainer(elementId, false);
+
+                    options.onComplete = function () {
+                        _fireAnimationFromQueue(elementId, queueTypes.move);
+                        $ax.visibility.popContainer(elementId, false);
+                    };
+
+                    $ax('#' + elementId).moveBy(deltaLoc.x, deltaLoc.y, options);
+                }
+            });
+
+            //for(var i = 0; i < childrenIds.length; i++) {
+            //    (function(childId) {
+            //        animations.push({
+            //            id: childId,
+            //            type: queueTypes.move,
+            //            func: function () {
+            //                // Nop, while trying to move as container
+            //                //$ax.event.raiseSyntheticEvent(childId, "onMove");
+            //                //if($ax.public.fn.IsLayer($obj(childId).type)) _fireAnimationFromQueue(childId, queueTypes.move);
+            //                //else $ax('#' + childId).moveBy(deltaLoc.x, deltaLoc.y, moveInfo.options);
+            //            }
+            //        });
+            //    })(childrenIds[i]);
+            //}
+            _addAnimations(animations);
+        } else {
+            _addAnimation(elementId, queueTypes.move, function() {
+                var loc = _getMoveLoc(elementId, moveInfo, eventInfoCopy, optionsOverride.stop, idToResizeMoveState[elementId], options);
+
+//                $ax.event.raiseSyntheticEvent(elementId, "onMove");
+                if(loc.moveTo) $ax('#' + elementId).moveTo(loc.x, loc.y, options);
+                else $ax('#' + elementId).moveBy(loc.x, loc.y, options);
+            });
+        }
+    };
+
+    var _moveSingleWidget = function (elementId, delta, options, onComplete) {
+        if(!delta.x && !delta.y) {
+            $ax.action.fireAnimationFromQueue(elementId, $ax.action.queueTypes.move);
+            if (onComplete) onComplete();
+            return;
+        }
+        var fixedInfo = $ax.dynamicPanelManager.getFixedInfo(elementId);
+        var xProp = 'left';
+        var xDiff = '+=';
+        if(fixedInfo) {
+            if(fixedInfo.horizontal == 'right') {
+                xProp = 'right';
+                xDiff = '-=';
+            } else if(fixedInfo.horizontal == 'center') {
+                xProp = 'margin-left';
+            }
+        }
+        var yProp = 'top';
+        var yDiff = '+=';
+        if(fixedInfo) {
+            if(fixedInfo.vertical == 'bottom') {
+                yProp = 'bottom';
+                yDiff = '-=';
+            } else if(fixedInfo.vertical == 'middle') {
+                yProp = 'margin-top';
+            }
+        }
+
+        var css = {};
+        css[xProp] = xDiff + delta.x;
+        css[yProp] = yDiff + delta.y;
+
+        $ax.visibility.moveMovedLocation(elementId, delta.x, delta.y);
+
+        var moveInfo = $ax.move.PrepareForMove(elementId, delta.x, delta.y,false, options);
+        $jobjAll(elementId).animate(css, {
+            duration: options.duration,
+            easing: options.easing,
+            queue: false,
+            complete: function () {
+                if(onComplete) onComplete();
+                if(moveInfo.rootLayer) $ax.visibility.popContainer(moveInfo.rootLayer, false);
+                $ax.dynamicPanelManager.fitParentPanel(elementId);
+                $ax.action.fireAnimationFromQueue(elementId, $ax.action.queueTypes.move);
+            }
+        });
+    }
+
+    var _getMoveLoc = function (elementId, moveInfo, eventInfoCopy, stopInfo, comboState, options, layerInfo) {
+        var moveTo = false;
+        var moveWithThis = false;
+        var xValue = 0;
+        var yValue = 0;
+        var moveResult = comboState.moveResult;
+        var widgetDragInfo = eventInfoCopy.dragInfo;
+        var jobj = $jobj(elementId);
+
+        var startX;
+        var startY;
+
+        switch(moveInfo.moveType) {
+        case "location":
+            // toRatio is ignoring anything before start since that has already taken effect we just know whe have from start to len to finish
+            //  getting to the location we want to get to.
+            var toRatio = stopInfo.instant ? 1 : (stopInfo.end - stopInfo.start) / (stopInfo.len - stopInfo.start);
+
+            // If result already caluculated, don't recalculate again, other calculate and save
+            if (moveResult) {
+                xValue = moveResult.x;
+                yValue = moveResult.y;
+            } else {
+                comboState.moveResult = moveResult = { x: $ax.expr.evaluateExpr(moveInfo.xValue, eventInfoCopy), y: $ax.expr.evaluateExpr(moveInfo.yValue, eventInfoCopy) };
+                xValue = moveResult.x;
+                yValue = moveResult.y;
+            }
+            // If this is final stop for this move, then clear out the result so next move won't use it
+            if(stopInfo.instant || stopInfo.end == stopInfo.len) comboState.moveResult = undefined;
+
+            if (layerInfo) {
+                startX = layerInfo.left;
+                startY = layerInfo.top;
+            //} else if ($ax.public.fn.isCompoundVectorHtml(jobj[0])) {
+            //    var dimensions = $ax.public.fn.compoundWidgetDimensions(jobj);
+            //    startX = dimensions.left;
+            //    startY = dimensions.top;
+            } else {
+                var offsetLocation = $ax('#' + elementId).offsetLocation();
+                startX = offsetLocation.left;
+                startY = offsetLocation.top;
+                //startX = $ax('#' + elementId).locRelativeIgnoreLayer(false);
+                //startY = $ax('#' + elementId).locRelativeIgnoreLayer(true);
+                if(jobj.css('position') == 'fixed') {
+                    startX -= $(window).scrollLeft();
+                    startY -= $(window).scrollTop();
+                }
+            }
+
+            xValue = xValue == '' ? 0 : (xValue - startX) * toRatio;
+            yValue = yValue == '' ? 0 : (yValue - startY) * toRatio;
+
+            break;
+        case "delta":
+            var ratio = stopInfo.instant ? 1 : (stopInfo.end - stopInfo.start) / stopInfo.len;
+
+            // See case location above
+            if(moveResult) {
+                xValue = moveResult.x * ratio;
+                yValue = moveResult.y * ratio;
+            } else {
+                comboState.moveResult = moveResult = { x: $ax.expr.evaluateExpr(moveInfo.xValue, eventInfoCopy), y: $ax.expr.evaluateExpr(moveInfo.yValue, eventInfoCopy) };
+                xValue = moveResult.x * ratio;
+                yValue = moveResult.y * ratio;
+            }
+            if (stopInfo.instant || stopInfo.end == stopInfo.len) comboState.moveResult = undefined;
+
+            break;
+        case "drag":
+            xValue = widgetDragInfo.xDelta;
+            yValue = widgetDragInfo.yDelta;
+            break;
+        case "dragX":
+            xValue = widgetDragInfo.xDelta;
+            yValue = 0;
+            break;
+        case "dragY":
+            xValue = 0;
+            yValue = widgetDragInfo.yDelta;
+            break;
+        case "locationBeforeDrag":
+            var location = widgetDragInfo.movedWidgets[eventInfoCopy.targetElement];
+            if (location) {
+                var axObj = $ax('#' + eventInfoCopy.targetElement);
+                //This may require using the css value
+                var viewportLocation = axObj.viewportLocation();
+                xValue = location.x - viewportLocation.left;
+                yValue = location.y - viewportLocation.top;
+                //xValue = location.x - axObj.left();
+                //yValue = location.y - axObj.top();
+            } else {
+                _fireAnimationFromQueue(eventInfoCopy.srcElement, queueTypes.move);
+                return { x: 0, y: 0 };
+            }
+            //moveTo = true;
+            break;
+        case "withThis":
+            moveWithThis = true;
+            var widgetMoveInfo = $ax.move.GetWidgetMoveInfo();
+            var srcElementId = $ax.getElementIdsFromEventAndScriptId(eventInfoCopy, eventInfoCopy.srcElement)[0];
+            var delta = widgetMoveInfo[srcElementId];
+            options.easing = delta.options.easing;
+            options.duration = delta.options.duration;
+            xValue = delta.x;
+            yValue = delta.y;
+            break;
+        }
+
+        if (options && options.boundaryExpr) {
+            //$ax.public.fn.removeCompound(jobj);
+
+            //if(jobj.css('position') == 'fixed') {
+            //    //swap page coordinates with fixed coordinates
+            //    options.boundaryExpr.leftExpr.value = options.boundaryExpr.leftExpr.value.replace('.top', '.topfixed').replace('.left', '.leftfixed').replace('.bottom', '.bottomfixed').replace('.right', '.rightfixed');
+            //    options.boundaryExpr.leftExpr.stos[0].leftSTO.prop = options.boundaryExpr.leftExpr.stos[0].leftSTO.prop + 'fixed';
+            //    options.boundaryStos.boundaryScope.direcval0.value = options.boundaryStos.boundaryScope.direcval0.value.replace('.top', '.topfixed').replace('.left', '.leftfixed').replace('.bottom', '.bottomfixed').replace('.right', '.rightfixed');
+            //    options.boundaryStos.boundaryScope.direcval0.stos[0].leftSTO.prop = options.boundaryStos.boundaryScope.direcval0.stos[0].leftSTO.prop + 'fixed';
+            //}
+
+            if(moveWithThis && (xValue || yValue)) {
+                _updateLeftExprVariable(options.boundaryExpr, xValue.toString(), yValue.toString());
+            }
+
+            if(!$ax.expr.evaluateExpr(options.boundaryExpr, eventInfoCopy)) {
+                var boundaryStoInfo = options.boundaryStos;
+                if(boundaryStoInfo) {
+                    if(moveWithThis) {
+                        var stoScopes = boundaryStoInfo.boundaryScope;
+                        if(stoScopes) {
+                            for(var s in stoScopes) {
+                                var boundaryScope = stoScopes[s];
+                                if(!boundaryScope.localVariables) continue;
+
+                                if(boundaryScope.localVariables.withx) boundaryScope.localVariables.withx.value = xValue.toString();
+                                if(boundaryScope.localVariables.withy) boundaryScope.localVariables.withy.value = yValue.toString();
+                            }
+                        }
+                    }
+
+                    if(layerInfo) {
+                        startX = layerInfo.left;
+                        startY = layerInfo.top;
+                    } else {
+                        offsetLocation = $ax('#' + elementId).offsetLocation();
+                        startX = offsetLocation.left;
+                        startY = offsetLocation.top;
+                        //startX = $ax('#' + elementId).locRelativeIgnoreLayer(false);
+                        //startY = $ax('#' + elementId).locRelativeIgnoreLayer(true);
+                        if(jobj.css('position') == 'fixed') {
+                            startX -= $(window).scrollLeft();
+                            startY -= $(window).scrollTop();
+                        }
+                    }
+
+                    if(boundaryStoInfo.ySto) {
+                        var currentTop = layerInfo ? layerInfo.top : startY;
+                        var newTop = $ax.evaluateSTO(boundaryStoInfo.ySto, boundaryStoInfo.boundaryScope, eventInfoCopy);
+                        if(moveTo) yValue = newTop;
+                        else yValue = newTop - currentTop;
+                    }
+
+                    if(boundaryStoInfo.xSto) {
+                        var currentLeft = layerInfo ? layerInfo.left : startX;
+                        var newLeft = $ax.evaluateSTO(boundaryStoInfo.xSto, boundaryStoInfo.boundaryScope, eventInfoCopy);
+                        if(moveTo) xValue = newLeft;
+                        else xValue = newLeft - currentLeft;
+                    }
+                }
+            }
+
+            //$ax.public.fn.restoreCompound(jobj);
+        }
+
+        return { x: Number(xValue), y: Number(yValue), moveTo: moveTo };
+    };
+
+    //we will have something like [[Target.right + withX]] for leftExpr, and this function set the value of withX
+    var _updateLeftExprVariable = function (exprTree, xValue, yValue) {
+        if(exprTree.leftExpr && !exprTree.leftExpr.op) {
+            var localVars = exprTree.leftExpr.localVariables;
+            if(localVars) {
+                if(localVars.withx) localVars.withx.value = xValue;
+                if(localVars.withy) localVars.withy.value = yValue;
+            }
+        }
+
+        //traversal
+        if(exprTree.op) {
+            if(exprTree.leftExpr) _updateLeftExprVariable(exprTree.leftExpr, xValue, yValue);
+            if(exprTree.rightExpr) _updateLeftExprVariable(exprTree.rightExpr, xValue, yValue);
+        }
+    }
+    
+    var widgetRotationFilter = [
+        $ax.constants.IMAGE_BOX_TYPE, $ax.constants.IMAGE_MAP_REGION_TYPE, $ax.constants.DYNAMIC_PANEL_TYPE,
+        $ax.constants.VECTOR_SHAPE_TYPE, $ax.constants.VERTICAL_LINE_TYPE, $ax.constants.HORIZONTAL_LINE_TYPE
+    ];
+    _actionHandlers.rotateWidget = function(eventInfo, actions, index) {
+        var action = actions[index];
+
+        for(var i = 0; i < action.objectsToRotate.length; i++) {
+            var rotateInfo = action.objectsToRotate[i].rotateInfo;
+            var elementIds = $ax.getElementIdsFromPath(action.objectsToRotate[i].objectPath, eventInfo);
+
+            for(var j = 0; j < elementIds.length; j++) {
+                var elementId = elementIds[j];
+                _queueResizeMove(elementId, queueTypes.rotate, eventInfo, rotateInfo);
+            }
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    var _addRotate = function (elementId, eventInfo, rotateInfo, options, moveInfo) {
+        var idToResizeMoveState = _getIdToResizeMoveState(eventInfo);
+        rotateInfo = $ax.deepCopy(rotateInfo);
+        rotateInfo.options.easing = options.easing;
+        rotateInfo.options.duration = options.duration;
+
+        var eventInfoCopy = $ax.eventCopy(eventInfo);
+        eventInfoCopy.targetElement = elementId;
+
+        //calculate degree value at start of animation
+        var rotateDegree;
+        var offset = {};
+        var eval = function(boundingRect) {
+            rotateDegree = parseFloat($ax.expr.evaluateExpr(rotateInfo.degree, eventInfoCopy));
+            offset.x = Number($ax.expr.evaluateExpr(rotateInfo.offsetX, eventInfoCopy));
+            offset.y = Number($ax.expr.evaluateExpr(rotateInfo.offsetY, eventInfoCopy));
+            if(!rotateInfo.options.clockwise) rotateDegree = -rotateDegree;
+
+            _updateOffset(offset, rotateInfo.anchor, boundingRect);
+        }
+
+        if(moveInfo) {
+            var moveOptions = { dragInfo: eventInfoCopy.dragInfo, duration: options.duration, easing: options.easing, boundaryExpr: moveInfo.options.boundaryExpr, boundaryStos: moveInfo.options.boundaryStos };
+        }
+
+        var obj = $obj(elementId);
+
+        if($ax.public.fn.IsLayer(obj.type)) {
+            var childrenIds = $ax.public.fn.getLayerChildrenDeep(elementId, true, true);
+            if(childrenIds.length == 0) return;
+
+            var animations = [];
+            //get center point of the group, and degree delta
+            var centerPoint, degreeDelta, moveDelta;
+            animations.push({
+                id: elementId,
+                type: queueTypes.rotate,
+                func: function () {
+                    var boundingRect = $ax('#' + elementId).offsetBoundingRect();
+                    //var boundingRect = $axure.fn.getWidgetBoundingRect(elementId);
+                    eval(boundingRect);
+                    centerPoint = boundingRect.centerPoint;
+                    centerPoint.x += offset.x;
+                    centerPoint.y += offset.y;
+                    degreeDelta = _initRotateLayer(elementId, rotateInfo, rotateDegree, options, options.stop);
+                    _fireAnimationFromQueue(elementId, queueTypes.rotate);
+
+                    moveDelta = { x: 0, y: 0 };
+                    if (moveInfo) {
+                        moveDelta = _getMoveLoc(elementId, moveInfo, eventInfoCopy, options.moveStop, idToResizeMoveState[elementId], moveOptions, boundingRect);
+                        if (moveDelta.moveTo) {
+                            moveDelta.x -= $ax.getNumFromPx($jobj(elementId).css('left'));
+                            moveDelta.y -= $ax.getNumFromPx($jobj(elementId).css('top'));
+                        }
+                        $ax.event.raiseSyntheticEvent(elementId, 'onMove');
+                    }
+                }
+            });
+
+            for(var idIndex = 0; idIndex < childrenIds.length; idIndex++) {
+                var childId = childrenIds[idIndex];
+                (function(id) {
+                    var childObj = $obj(id);
+                    var rotate = $.inArray(childObj.type, widgetRotationFilter) != -1;
+
+                    var isLayer = $ax.public.fn.IsLayer(childObj.type);
+                    animations.push({
+                        id: id,
+                        type: queueTypes.rotate,
+                        func: function() {
+                            $ax.event.raiseSyntheticEvent(id, "onRotate");
+                            if(isLayer) _fireAnimationFromQueue(id, queueTypes.rotate);
+                            else $ax('#' + id).circularMoveAndRotate(degreeDelta, options, centerPoint.x, centerPoint.y, rotate, moveDelta);
+                        }
+                    });
+                    if(!isLayer) animations.push({ id: id, type: queueTypes.move, func: function() {} });
+                })(childId);
+            }
+
+            _addAnimations(animations);
+        } else {
+            animations = [];
+            animations.push({
+                id: elementId,
+                type: queueTypes.rotate,
+                func: function () {
+                    var jobj = $jobj(elementId);
+                    var unrotatedDim = { width: $ax.getNumFromPx(jobj.css('width')), height: $ax.getNumFromPx(jobj.css('height')) };
+                    eval(unrotatedDim);
+                    var delta = { x: 0, y: 0 };
+                    if(moveInfo) {
+                        delta = _getMoveLoc(elementId, moveInfo, eventInfoCopy, options.moveStop, idToResizeMoveState[elementId], moveOptions);
+                        if(delta.moveTo) {
+                            delta.x -= $ax.getNumFromPx($jobj(elementId).css('left'));
+                            delta.y -= $ax.getNumFromPx($jobj(elementId).css('top'));
+                        }
+                    }
+
+                    $ax.event.raiseSyntheticEvent(elementId, 'onRotate');
+                    if(offset.x == 0 && offset.y == 0) _rotateSingle(elementId, rotateDegree, rotateInfo.rotateType == 'location', delta, options, options.stop, true);
+                    else _rotateSingleOffset(elementId, rotateDegree, rotateInfo.rotateType == 'location', delta, { x: offset.x, y: offset.y }, options, options.stop);
+                    if(moveInfo) $ax.event.raiseSyntheticEvent(elementId, 'onMove');
+                }
+            });
+            animations.push({ id: elementId, type: queueTypes.move, func: function () { } });
+
+            _addAnimations(animations);
+        }
+    }
+
+    var _updateOffset = function(offset, anchor, boundingRect) {
+        if (anchor.indexOf('left') != -1) offset.x -= boundingRect.width / 2;
+        if (anchor.indexOf('right') != -1) offset.x += boundingRect.width / 2;
+        if (anchor.indexOf('top') != -1) offset.y -= boundingRect.height / 2;
+        if (anchor.indexOf('bottom') != -1) offset.y += boundingRect.height / 2;
+    }
+
+    var _rotateSingle = function(elementId, rotateDegree, rotateTo, delta, options, stop, handleMove) {
+        var degreeDelta = _applyRotateStop(rotateDegree, $ax.move.getRotationDegree(elementId), rotateTo, stop);
+        $ax('#' + elementId).rotate(degreeDelta, options.easing, options.duration, false, true);
+        if(handleMove) {
+            if (delta.x || delta.y) _moveSingleWidget(elementId, delta, options);
+            else $ax.action.fireAnimationFromQueue(elementId, $ax.action.queueTypes.move);
+        }
+    };
+
+    var _rotateSingleOffset = function (elementId, rotateDegree, rotateTo, delta, offset, options, stop, resizeOffset) {
+        var obj = $obj(elementId);
+        var currRotation = $ax.move.getRotationDegree(elementId);
+
+        // Need to fix offset. Want to to stay same place on widget after rotation, so need to take the offset and rotate it to where it should be.
+        if(currRotation) {
+            offset = $axure.fn.getPointAfterRotate(currRotation, offset, { x: 0, y: 0 });
+        }
+
+        var degreeDelta = _applyRotateStop(rotateDegree, currRotation, rotateTo, stop);
+        var widgetCenter = $ax('#' + elementId).offsetBoundingRect().centerPoint;
+        //var widgetCenter = $axure.fn.getWidgetBoundingRect(elementId).centerPoint;
+        
+        var rotate = $.inArray(obj.type, widgetRotationFilter) != -1;
+        $ax('#' + elementId).circularMoveAndRotate(degreeDelta, options, widgetCenter.x + offset.x, widgetCenter.y + offset.y, rotate, delta, resizeOffset);
+    }
+
+    var _applyRotateStop = function(rotateDegree, currRotation, to, stop) {
+        var degreeDelta;
+        var ratio;
+        if(to) {
+            degreeDelta = rotateDegree - currRotation;
+            ratio = stop.instant ? 1 : (stop.end - stop.start) / (stop.len - stop.start);
+        } else {
+            degreeDelta = rotateDegree;
+            ratio = stop.instant ? 1 : (stop.end - stop.start) / stop.len;
+        }
+
+        return degreeDelta * ratio;
+    }
+
+
+    var _initRotateLayer = function(elementId, rotateInfo, rotateDegree, options, stop) {
+        var layerDegree = $jobj(elementId).data('layerDegree');
+        if (layerDegree === undefined) layerDegree = 0;
+        else layerDegree = parseFloat(layerDegree);
+
+        var to = rotateInfo.rotateType == 'location';
+        var newDegree = to ? rotateDegree : layerDegree + rotateDegree;
+        var degreeDelta = newDegree - layerDegree;
+
+        var ratio = stop.instant ? 1 : (stop.end - stop.start) / (stop.len - stop.start);
+        degreeDelta *= ratio;
+
+        $jobj(elementId).data('layerDegree', newDegree);
+        $ax.event.raiseSyntheticEvent(elementId, "onRotate");
+
+        return degreeDelta;
+    }
+
+    _actionHandlers.setWidgetSize = function(eventInfo, actions, index) {
+        var action = actions[index];
+        for(var i = 0; i < action.objectsToResize.length; i++) {
+            var resizeInfo = action.objectsToResize[i].sizeInfo;
+            var objPath = action.objectsToResize[i].objectPath;
+            if(objPath == 'thisItem') {
+                var thisId = eventInfo.srcElement;
+                var repeaterId = $ax.getParentRepeaterFromElementId(thisId);
+                var itemId = $ax.repeater.getItemIdFromElementId(thisId);
+                var currSize = $ax.repeater.getItemSize(repeaterId, itemId);
+                var newSize = _getSizeFromInfo(resizeInfo, eventInfo, currSize.width, currSize.height);
+                $ax.repeater.setItemSize(repeaterId, itemId, newSize.width, newSize.height);
+
+                continue;
+            }
+
+            var elementIds = $ax.getElementIdsFromPath(objPath, eventInfo);
+
+            for(var j = 0; j < elementIds.length; j++) {
+                var elementId = elementIds[j];
+                _queueResizeMove(elementId, queueTypes.resize, eventInfo, resizeInfo);
+                //_addResize(elementId, resizeInfo);
+            }
+        }
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    // Move info undefined unless this move/resize actions are being merged
+    var _addResize = function(elementId, eventInfo, resizeInfo, options, moveInfo, rotateInfo) {
+        var axObject = $obj(elementId);
+        resizeInfo = $ax.deepCopy(resizeInfo);
+        resizeInfo.easing = options.easing;
+        resizeInfo.duration = options.duration;
+
+        var eventInfoCopy = $ax.eventCopy(eventInfo);
+        eventInfoCopy.targetElement = elementId;
+
+        var moves = moveInfo || resizeInfo.anchor != "top left" || ($ax.public.fn.IsDynamicPanel(axObject.type) &&
+        ((axObject.fixedHorizontal && axObject.fixedHorizontal == 'center') || (axObject.fixedVertical && axObject.fixedVertical == 'middle'))) ||
+        (rotateInfo && (rotateInfo.offsetX || rotateInfo.offsetY));
+
+        if(moveInfo) {
+            var moveOptions = { dragInfo: eventInfoCopy.dragInfo, duration: options.duration, easing: options.easing, boundaryExpr: moveInfo.options.boundaryExpr, boundaryStos: moveInfo.options.boundaryStos };
+        }
+
+        var idToResizeMoveState = _getIdToResizeMoveState(eventInfoCopy);
+
+        var animations = [];
+        if($ax.public.fn.IsLayer(axObject.type)) {
+            moves = true; // Assume widgets will move will layer, even though not all widgets may move
+            var childrenIds = $ax.public.fn.getLayerChildrenDeep(elementId, true, true);
+            if(childrenIds.length === 0) return;
+            // Need to wait to calculate new size, until time to animate, but animates are in separate queues
+            //  best option seems to be to calculate in a "animate" for the layer itself and all children will use that.
+            //  May just have to be redundant if this doesn't work well.
+
+            var boundingRect, widthChangedPercent, heightChangedPercent, unchanged, deltaLoc, degreeDelta, resizeOffset;
+            animations.push({
+                id: elementId,
+                type: queueTypes.resize,
+                func: function () {
+                    $ax.visibility.pushContainer(elementId, false);
+                    boundingRect = $ax('#' + elementId).offsetBoundingRect();
+                    //boundingRect = $ax.public.fn.getWidgetBoundingRect(elementId);
+                    var size = _getSizeFromInfo(resizeInfo, eventInfoCopy, boundingRect.width, boundingRect.height, elementId);
+                    deltaLoc = { x: 0, y: 0 };
+
+                    var stop = options.stop;
+                    var ratio = stop.instant ? 1 : (stop.end - stop.start) / (stop.len - stop.start);
+                    widthChangedPercent = Math.round(size.width - boundingRect.width) / boundingRect.width * ratio;
+                    heightChangedPercent = Math.round(size.height - boundingRect.height) / boundingRect.height * ratio;
+                    resizeOffset = _applyAnchorToResizeOffset(widthChangedPercent * boundingRect.width, heightChangedPercent * boundingRect.height, resizeInfo.anchor);
+                    if(stop.instant || stop.end == stop.len) idToResizeMoveState[elementId].resizeResult = undefined;
+
+                    unchanged = widthChangedPercent === 0 && heightChangedPercent === 0;
+                    $ax.event.raiseSyntheticEvent(elementId, 'onResize');
+                    _fireAnimationFromQueue(elementId, queueTypes.resize);
+                }
+            });
+
+            if(moveInfo) animations.push({
+                id: elementId,
+                type: queueTypes.move,
+                func: function() {
+                    deltaLoc = _getMoveLoc(elementId, moveInfo, eventInfoCopy, options.moveStop, idToResizeMoveState[elementId], moveOptions, boundingRect);
+                    $ax.visibility.pushContainer(elementId, false);
+                    _fireAnimationFromQueue(elementId, queueTypes.move);
+                    $ax.event.raiseSyntheticEvent(elementId, 'onMove');
+                }
+            });
+            if (rotateInfo) animations.push({
+                id: elementId,
+                type: queueTypes.rotate,
+                func: function () {
+                    resizeOffset = _applyAnchorToResizeOffset(widthChangedPercent * boundingRect.width, heightChangedPercent * boundingRect.height, resizeInfo.anchor);
+                    var rotateDegree = parseFloat($ax.expr.evaluateExpr(rotateInfo.degree, eventInfoCopy));
+                    degreeDelta = _initRotateLayer(elementId, rotateInfo, rotateDegree, options, options.rotateStop);
+                    _fireAnimationFromQueue(elementId, queueTypes.rotate);
+                    $ax.event.raiseSyntheticEvent(elementId, 'onRotate');
+                }
+            });
+
+            var completeCount = childrenIds.length*2; // Because there is a resize and move complete, it needs to be doubled
+            for(var idIndex = 0; idIndex < childrenIds.length; idIndex++) {
+                // Need to use scoping trick here to make sure childId doesn't change on next loop
+                (function(childId) {
+                    //use ax obj to get width and height, jquery css give us the value without border
+                    var isLayer = $ax.public.fn.IsLayer($obj(childId).type);
+                    var rotate = $.inArray($obj(childId).type, widgetRotationFilter) != -1;
+                    animations.push({
+                        id: childId,
+                        type: queueTypes.resize,
+                        func: function() {
+                            //$ax.event.raiseSyntheticEvent(childId, 'onResize');
+                            if(isLayer) {
+                                completeCount -= 2;
+                                _fireAnimationFromQueue(childId, queueTypes.resize);
+                                $ax.event.raiseSyntheticEvent(childId, 'onResize');
+                            } else {
+                                var currDeltaLoc = { x: deltaLoc.x, y: deltaLoc.y };
+                                var resizeDeltaMove = { x: 0, y: 0 };
+                                var css = _getCssForResizingLayerChild(childId, resizeInfo.anchor, boundingRect, widthChangedPercent, heightChangedPercent, resizeDeltaMove);
+                                var onComplete = function() {
+                                    if(--completeCount == 0) $ax.visibility.popContainer(elementId, false);
+                                };
+                                $ax('#' + childId).resize(css, resizeInfo, true, moves, onComplete);
+                                if(rotateInfo) {
+                                    var offset = { x: Number($ax.expr.evaluateExpr(rotateInfo.offsetX, eventInfoCopy)), y: Number($ax.expr.evaluateExpr(rotateInfo.offsetY, eventInfo)) };
+                                    _updateOffset(offset, resizeInfo.anchor, boundingRect);
+                                    var centerPoint = { x: boundingRect.centerPoint.x + offset.x, y: boundingRect.centerPoint.y + offset.y };
+                                    $ax('#' + childId).circularMoveAndRotate(degreeDelta, options, centerPoint.x, centerPoint.y, rotate, currDeltaLoc, resizeOffset, resizeDeltaMove, onComplete);
+                                } else {
+                                    currDeltaLoc.x += resizeDeltaMove.x;
+                                    currDeltaLoc.y += resizeDeltaMove.y;
+                                    _moveSingleWidget(childId, currDeltaLoc, options, onComplete);
+                                }
+                            }
+                        }
+                    });
+                    if(!isLayer) animations.push({ id: childId, type: queueTypes.move, func: function () {} });
+                    if(!isLayer && rotateInfo) animations.push({ id: childId, type: queueTypes.rotate, func: function () {} });
+                })(childrenIds[idIndex]);
+            }
+        } else {
+            // Not func, obj with func
+            animations.push({
+                id: elementId,
+                type: queueTypes.resize,
+                func: function() {
+                    //textarea can be resized manully by the user, but doesn't update div size yet, so doing this for now.
+                    //alternatively axquery get for size can account for this
+
+                    var sizeId = $ax.public.fn.IsTextArea(axObject.type) ? $jobj(elementId).children('textarea').attr('id') : elementId;
+                    var oldSize = $ax('#' + sizeId).size();
+                    var oldWidth = oldSize.width;
+                    var oldHeight = oldSize.height;
+
+                    var stop = options.stop;
+                    var ratio = stop.instant ? 1 : (stop.end - stop.start) / (stop.len - stop.start);
+
+                    var size = _getSizeFromInfo(resizeInfo, eventInfoCopy, oldWidth, oldHeight, elementId);
+                    var newWidth = size.width;
+                    var newHeight = size.height;
+                    var deltaWidth = Math.round(newWidth - oldWidth) * ratio;
+                    var deltaHeight = Math.round(newHeight - oldHeight) * ratio;
+                    newWidth = oldWidth + deltaWidth;
+                    newHeight = oldHeight + deltaHeight;
+
+                    var delta = { x: 0, y: 0 };
+                    if(moveInfo) {
+                        delta = _getMoveLoc(elementId, moveInfo, eventInfoCopy, options.moveStop, idToResizeMoveState[elementId], moveOptions);
+                        if (delta.moveTo) {
+                            delta.x -= $ax.getNumFromPx($jobj(elementId).css('left'));
+                            delta.y -= $ax.getNumFromPx($jobj(elementId).css('top'));
+                        }
+                    }
+
+                    var rotateHandlesMove = false;
+                    var offset = { x: 0, y: 0 };
+                    if(rotateInfo) {
+                        offset.x = Number($ax.expr.evaluateExpr(rotateInfo.offsetX, eventInfoCopy));
+                        offset.y = Number($ax.expr.evaluateExpr(rotateInfo.offsetY, eventInfoCopy));
+                        _updateOffset(offset, rotateInfo.anchor, $ax('#' + elementId).offsetBoundingRect());
+                        //_updateOffset(offset, rotateInfo.anchor, $axure.fn.getWidgetBoundingRect(elementId));
+                        rotateHandlesMove = Boolean(rotateInfo && (offset.x || offset.y || rotateInfo.anchor != 'center'));
+                        $ax.event.raiseSyntheticEvent(elementId, 'onRotate');
+                    }
+
+                    var css = null;
+                    var rootLayer = null;
+                    if(deltaHeight != 0 || deltaWidth != 0) {
+                        rootLayer = $ax.move.getRootLayer(elementId);
+                        if(rootLayer) $ax.visibility.pushContainer(rootLayer, false);
+                        css = _getCssForResizingWidget(elementId, eventInfoCopy, resizeInfo.anchor, newWidth, newHeight, oldWidth, oldHeight, delta, options.stop, !rotateHandlesMove);
+                        idToResizeMoveState[elementId].resizeResult = undefined;
+                    }
+
+                    if(rotateInfo) {
+                        var rotateDegree = parseFloat($ax.expr.evaluateExpr(rotateInfo.degree, eventInfoCopy));
+
+                        if(rotateHandlesMove) {
+                            var resizeOffset = _applyAnchorToResizeOffset(deltaWidth, deltaHeight, rotateInfo.anchor);
+                            _rotateSingleOffset(elementId, rotateDegree, rotateInfo.rotateType == 'location', delta, offset, options, options.rotateStop, resizeOffset);
+                        } else {
+                            // Not handling move so pass in nop delta
+                            _rotateSingle(elementId, rotateDegree, rotateInfo.rotateType == 'location', { x: 0, y: 0 }, options, options.rotateStop);
+                            if (moves) _fireAnimationFromQueue(elementId, queueTypes.move);
+                        }
+                    } else if(!css && moves) _moveSingleWidget(elementId, delta, options);
+
+                    // Have to do it down here to make sure move info is registered
+                    if(moveInfo) $ax.event.raiseSyntheticEvent(elementId, 'onMove');
+
+                    //$ax.event.raiseSyntheticEvent(elementId, 'onResize');
+                    if (css) {
+                        $ax('#' + elementId).resize(css, resizeInfo, true, moves, function () {
+                            if(rootLayer) $ax.visibility.popContainer(rootLayer, false);
+                        });
+                    } else {
+                        _fireAnimationFromQueue(elementId, queueTypes.resize);
+
+                        $ax.event.raiseSyntheticEvent(elementId, 'onResize');
+                    }
+                }
+            });
+            // Nop move (move handled by resize)
+            if(rotateInfo) animations.push({ id: elementId, type: queueTypes.rotate, func: function () { } });
+            if(moves) animations.push({ id: elementId, type: queueTypes.move, func: function () { } });
+        }
+
+        _addAnimations(animations);
+    };
+
+    var _applyAnchorToResizeOffset = function (deltaWidth, deltaHeight, anchor) {
+        var offset = {};
+        if (anchor.indexOf('left') != -1) offset.x = -deltaWidth / 2;
+        else if (anchor.indexOf('right') != -1) offset.x = deltaWidth / 2;
+        if (anchor.indexOf('top') != -1) offset.y = -deltaHeight / 2;
+        else if (anchor.indexOf('bottom') != -1) offset.y = deltaHeight / 2;
+
+        return offset;
+    }
+
+    //var _getOldAndNewSize = function (resizeInfo, eventInfo, targetElement) {
+    //    var axObject = $obj(targetElement);
+    //    var oldWidth, oldHeight;
+    //    //textarea can be resized manully by the user, use the textarea child to get the current size
+    //    //because this new size may not be reflected on its parents yet
+    //    if ($ax.public.fn.IsTextArea(axObject.type)) {
+    //        var jObject = $jobj(elementId);
+    //        var textObj = $ax('#' + jObject.children('textarea').attr('id'));
+    //        //maybe we shouldn't use ax obj to get width and height here anymore...
+    //        oldWidth = textObj.width();
+    //        oldHeight = textObj.height();
+    //    } else {
+    //        oldWidth = $ax('#' + elementId).width();
+    //        oldHeight = $ax('#' + elementId).height();
+    //    }
+
+    //    var size = _getSizeFromInfo(resizeInfo, eventInfo, oldHeight, oldWidth, elementId);
+    //    return { oldWidth: oldWidth, oldHeight: oldHeight, newWidth: size.width, newHeight: size.height, change: oldWidth != size.width || oldHeight != size.height };
+    //}
+
+    var _getSizeFromInfo = function(resizeInfo, eventInfo, oldWidth, oldHeight, targetElement) {
+        var oldTarget = eventInfo.targetElement;
+        eventInfo.targetElement = targetElement;
+
+        var state = _getIdToResizeMoveState(eventInfo)[targetElement];
+        if(state && state.resizeResult) return state.resizeResult;
+
+        var width = $ax.expr.evaluateExpr(resizeInfo.width, eventInfo);
+        var height = $ax.expr.evaluateExpr(resizeInfo.height, eventInfo);
+        eventInfo.targetElement = oldTarget;
+
+
+        // If either one is not a number, use the old value
+        width = width != "" ? Number(width) : oldWidth;
+        height = height != "" ? Number(height) : oldHeight;
+
+        width = isNaN(width) ? oldWidth : width;
+        height = isNaN(height) ? oldHeight : height;
+
+        // can't be negative
+        var result = { width: Math.max(width, 0), height: Math.max(height, 0) };
+        if(state) state.resizeResult = result;
+        return result;
+    }
+
+    //var _queueResize = function (elementId, css, resizeInfo) {
+    //    var resizeFunc = function() {
+    //        $ax('#' + elementId).resize(css, resizeInfo, true);
+    //        //$ax.public.fn.resize(elementId, css, resizeInfo, true);
+    //    };
+    //    var obj = $obj(elementId);
+    //    var moves = resizeInfo.anchor != "top left" || ($ax.public.fn.IsDynamicPanel(obj.type) && ((obj.fixedHorizontal && obj.fixedHorizontal == 'center') || (obj.fixedVertical && obj.fixedVertical == 'middle')))
+    //    if(!moves) {
+    //        _addAnimation(elementId, queueTypes.resize, resizeFunc);
+    //    } else {
+    //        var animations = [];
+    //        animations[0] = { id: elementId, type: queueTypes.resize, func: resizeFunc };
+    //        animations[1] = { id: elementId, type: queueTypes.move, func: function() {}}; // Nop func - resize handles move and firing from queue
+    //        _addAnimations(animations);
+    //    }
+    //};
+
+    //should clean this function and 
+    var _getCssForResizingWidget = function (elementId, eventInfo, anchor, newWidth, newHeight, oldWidth, oldHeight, delta, stop, handleMove) {
+        var ratio = stop.instant ? 1 : (stop.end - stop.start) / (stop.len - stop.start);
+        var deltaWidth = (newWidth - oldWidth) * ratio;
+        var deltaHeight = (newHeight - oldHeight) * ratio;
+        if(stop.instant || stop.end == stop.len) {
+            var idToResizeMoveState = _getIdToResizeMoveState(eventInfo);
+            if(idToResizeMoveState[elementId]) idToResizeMoveState[elementId].resizeResult = undefined;
+        }
+
+        var css = {};
+        css.height = oldHeight + deltaHeight;
+
+        var obj = $obj(elementId);
+        //if it's 100% width, don't change its width
+        if($ax.dynamicPanelManager.isPercentWidthPanel(obj)) var is100Dp = true;
+        else css.width = oldWidth + deltaWidth;
+
+        var jobj = $jobj(elementId);
+        //if this is pinned dp, we will mantain the pin, no matter how you resize it; so no need changes left or top
+        //NOTE: currently only pinned DP has position == fixed
+        if(jobj.css('position') == 'fixed') {
+            if(obj.fixedHorizontal && obj.fixedHorizontal == 'center') css['margin-left'] = '+=' + delta.x;
+            if(obj.fixedVertical && obj.fixedVertical == 'middle') css['margin-top'] = '+=' + delta.y;
+            return css;
+        }
+
+        // If it is pinned, but temporarily not fixed because it is wrappen in a container, then just make sure to anchor it correctly
+        if(obj.fixedVertical) {
+            if(obj.fixedVertical == 'middle') anchor = obj.fixedHorizontal;
+            else anchor = obj.fixedVertical + (obj.fixedHorizontal == 'center' ? '' : ' ' + obj.fixedHorizontal);
+            
+        }
+
+        //use position relative to parents
+        //var position = obj.generateCompound ? $ax.public.fn.getWidgetBoundingRect(elementId) : $ax.public.fn.getPositionRelativeToParent(elementId);
+
+
+        var locationShift;
+        switch(anchor) {
+            case "top left":
+                locationShift = { x: 0, y: 0 }; break;
+            case "top":
+                locationShift = { x: -deltaWidth / 2.0, y: 0.0 }; break;
+            case "top right":
+                locationShift = { x: -deltaWidth, y: 0.0 }; break;
+            case "left":
+                locationShift = { x: 0.0, y: -deltaHeight / 2.0 }; break;
+            case "center":
+                locationShift = { x: -deltaWidth / 2.0, y: -deltaHeight / 2.0 }; break;
+            case "right":
+                locationShift = { x: -deltaWidth, y: -deltaHeight / 2.0 }; break;
+            case "bottom left":
+                locationShift = { x: 0.0, y: -deltaHeight }; break;
+            case "bottom":
+                locationShift = { x: -deltaWidth/2.0, y: -deltaHeight }; break;
+            case "bottom right":
+                locationShift = { x: -deltaWidth, y: -deltaHeight }; break;
+        }
+
+        if(handleMove) {
+            if(jobj.css('position') === 'absolute') {
+                css.left = $ax.getNumFromPx(jobj.css('left')) + locationShift.x + delta.x;
+                css.top = $ax.getNumFromPx(jobj.css('top')) + locationShift.y + delta.y;
+            } else {
+                var axQuery = $ax('#' + elementId);
+                var offsetLocation = axQuery.offsetLocation();
+                css.left = offsetLocation.left + locationShift.x + delta.x;
+                css.top = offsetLocation.top + locationShift.y + delta.y;
+                //css.left = axQuery.left(true) + locationShift.x + delta.x;
+                //css.top = axQuery.top(true) + locationShift.y + delta.y;
+            }
+        } else {
+            delta.x += locationShift.x;
+            delta.y += locationShift.y;
+        }
+
+        css.deltaX = locationShift.x + delta.x;
+        css.deltaY = locationShift.y + delta.y;
+
+        return css;
+    };
+
+
+    var _getCssForResizingLayerChild = function (elementId, anchor, layerBoundingRect, widthChangedPercent, heightChangedPercent, deltaLoc) {
+        var boundingRect = $ax('#' + elementId).offsetBoundingRect();
+        //var boundingRect = $ax.public.fn.getWidgetBoundingRect(elementId);
+        var childCenterPoint = boundingRect.centerPoint;
+
+        var currentSize = $ax('#' + elementId).size();
+        var newWidth = currentSize.width + currentSize.width * widthChangedPercent;
+        var newHeight = currentSize.height + currentSize.height * heightChangedPercent;
+
+        var css = {};
+        css.height = newHeight;
+
+        var obj = $obj(elementId);
+        //if it's 100% width, don't change its width and left
+        var changeLeft = true;
+        if($ax.dynamicPanelManager.isPercentWidthPanel(obj)) changeLeft = false;
+        else css.width = newWidth;
+
+        var jobj = $jobj(elementId);
+        //if this is pinned dp, we will mantain the pin, no matter how you resize it; so no need changes left or top
+        //NOTE: currently only pinned DP has position == fixed
+        if(jobj.css('position') == 'fixed') return css;
+        //use bounding rect position relative to parents to calculate delta
+        //var axObj = $ax('#' + elementId);
+        // This will be absolute world coordinates, but we want body coordinates.
+        var offsetLocation = $ax('#' + elementId).offsetLocation();
+        var currentLeft = offsetLocation.left;
+        var currentTop = offsetLocation.top;
+        //var currentLeft = axObj.locRelativeIgnoreLayer(false);
+        //var currentTop = axObj.locRelativeIgnoreLayer(true);
+
+        var resizable = $ax.public.fn.IsResizable(obj.type);
+        if(anchor.indexOf("top") > -1) {
+            var topDelta = (currentTop - layerBoundingRect.top) * heightChangedPercent;
+            if(!resizable && Math.round(topDelta)) topDelta += currentSize.height * heightChangedPercent;
+        } else if(anchor.indexOf("bottom") > -1) {
+            if(resizable) topDelta = (currentTop - layerBoundingRect.bottom) * heightChangedPercent;
+            else {
+                var bottomDelta = Math.round(currentTop + currentSize.height - layerBoundingRect.bottom) * heightChangedPercent;
+                if(bottomDelta) topDelta = bottomDelta - currentSize.height * heightChangedPercent;
+                else topDelta = 0;
+            }
+        } else { //center vertical
+            if(resizable) topDelta = (childCenterPoint.y - layerBoundingRect.centerPoint.y)*heightChangedPercent - currentSize.height*heightChangedPercent/2;
+            else {
+                var centerTopChange = Math.round(childCenterPoint.y - layerBoundingRect.centerPoint.y)*heightChangedPercent;
+                if(centerTopChange > 0) topDelta = centerTopChange + Math.abs(currentSize.height * heightChangedPercent / 2);
+                else if(centerTopChange < 0) topDelta = centerTopChange - Math.abs(currentSize.height * heightChangedPercent / 2);
+                else topDelta = 0;
+            }
+        }
+
+        if(changeLeft) {
+            if(anchor.indexOf("left") > -1) {
+                var leftDelta = (currentLeft - layerBoundingRect.left) * widthChangedPercent;
+                if(!resizable && Math.round(leftDelta)) leftDelta += currentSize.width * widthChangedPercent;
+            } else if(anchor.indexOf("right") > -1) {
+                if(resizable) leftDelta = (currentLeft - layerBoundingRect.right) * widthChangedPercent;
+                else {
+                    var rightDelta = Math.round(currentLeft + currentSize.width - layerBoundingRect.right) * widthChangedPercent;
+                    if(rightDelta) leftDelta = rightDelta - currentSize.width * widthChangedPercent;
+                    else leftDelta = 0;
+                }
+            } else { //center horizontal
+                if(resizable) leftDelta = (childCenterPoint.x - layerBoundingRect.centerPoint.x)*widthChangedPercent - currentSize.width*widthChangedPercent/2;
+                else {
+                    var centerLeftChange = Math.round(childCenterPoint.x - layerBoundingRect.centerPoint.x) * widthChangedPercent;
+                    if(centerLeftChange > 0) leftDelta = centerLeftChange + Math.abs(currentSize.width * widthChangedPercent / 2);
+                    else if(centerLeftChange < 0) leftDelta = centerLeftChange - Math.abs(currentSize.width * widthChangedPercent / 2);
+                    else leftDelta = 0;
+                }
+            }
+        }
+
+        if(topDelta) deltaLoc.y += topDelta;
+        if(leftDelta && changeLeft) deltaLoc.x += leftDelta;
+
+        return css;
+    };
+
+    _actionHandlers.setPanelOrder = function(eventInfo, actions, index) {
+        var action = actions[index];
+        for(var i = 0; i < action.panelPaths.length; i++) {
+            var func = action.panelPaths[i].setOrderInfo.bringToFront ? 'bringToFront' : 'sendToBack';
+            var elementIds = $ax.getElementIdsFromPath(action.panelPaths[i].panelPath, eventInfo);
+            for(var j = 0; j < elementIds.length; j++) $ax('#' + elementIds[j])[func]();
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.modifyDataSetEditItems = function(eventInfo, actions, index) {
+        var action = actions[index];
+        var add = action.repeatersToAddTo;
+        var repeaters = add || action.repeatersToRemoveFrom;
+        var itemId;
+        for(var i = 0; i < repeaters.length; i++) {
+            var data = repeaters[i];
+            // Grab the first one because repeaters must have only element id, as they cannot be inside repeaters
+            //  or none if unplaced
+            var id = $ax.getElementIdsFromPath(data.path, eventInfo)[0];
+            if(!id) continue;
+
+            if(data.addType == 'this') {
+                var scriptId = $ax.repeater.getScriptIdFromElementId(eventInfo.srcElement);
+                itemId = $ax.repeater.getItemIdFromElementId(eventInfo.srcElement);
+                var repeaterId = $ax.getParentRepeaterFromScriptId(scriptId);
+                if(add) $ax.repeater.addEditItems(repeaterId, [itemId]);
+                else $ax.repeater.removeEditItems(repeaterId, [itemId]);
+            } else if(data.addType == 'all') {
+                var allItems = $ax.repeater.getAllItemIds(id);
+                if(add) $ax.repeater.addEditItems(id, allItems);
+                else $ax.repeater.removeEditItems(id, allItems);
+            } else {
+                var oldTarget = eventInfo.targetElement;
+                var itemIds = $ax.repeater.getAllItemIds(id);
+                var itemIdsToAdd = [];
+                for(var j = 0; j < itemIds.length; j++) {
+                    itemId = itemIds[j];
+                    eventInfo.targetElement = $ax.repeater.createElementId(id, itemId);
+                    if($ax.expr.evaluateExpr(data.query, eventInfo) == "true") {
+                        itemIdsToAdd[itemIdsToAdd.length] = String(itemId);
+                    }
+                    eventInfo.targetElement = oldTarget;
+                }
+                if(add) $ax.repeater.addEditItems(id, itemIdsToAdd);
+                else $ax.repeater.removeEditItems(id, itemIdsToAdd);
+            }
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _action.repeaterInfoNames = { addItemsToDataSet: 'dataSetsToAddTo', deleteItemsFromDataSet: 'dataSetItemsToRemove', updateItemsInDataSet: 'dataSetsToUpdate',
+        addFilterToRepeater: 'repeatersToAddFilter', removeFilterFromRepeater: 'repeatersToRemoveFilter',
+        addSortToRepeater: 'repeaterToAddSort', removeSortFromRepeater: 'repeaterToRemoveSort',
+        setRepeaterToPage: 'repeatersToSetPage', setItemsPerRepeaterPage: 'repeatersToSetItemCount'
+    };
+
+    _actionHandlers.addItemsToDataSet = function(eventInfo, actions, index) {
+        var action = actions[index];
+        for(var i = 0; i < action.dataSetsToAddTo.length; i++) {
+            var datasetInfo = action.dataSetsToAddTo[i];
+            // Grab the first one because repeaters must have only element id, as they cannot be inside repeaters
+            //  or none if unplaced
+            var id = $ax.getElementIdsFromPath(datasetInfo.path, eventInfo)[0];
+            if(!id || _ignoreAction(id)) continue;
+            var dataset = datasetInfo.data;
+
+            for(var j = 0; j < dataset.length; j++) $ax.repeater.addItem(id, $ax.deepCopy(dataset[j]), eventInfo);
+            if(dataset.length) _addRefresh(id);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.deleteItemsFromDataSet = function(eventInfo, actions, index) {
+        var action = actions[index];
+        for(var i = 0; i < action.dataSetItemsToRemove.length; i++) {
+            // Grab the first one because repeaters must have only element id, as they cannot be inside repeaters
+            //  or none if unplaced
+            var deleteInfo = action.dataSetItemsToRemove[i];
+            var id = $ax.getElementIdsFromPath(deleteInfo.path, eventInfo)[0];
+            if(!id || _ignoreAction(id)) continue;
+            $ax.repeater.deleteItems(id, eventInfo, deleteInfo.type, deleteInfo.rule);
+            _addRefresh(id);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.updateItemsInDataSet = function(eventInfo, actions, index) {
+        var action = actions[index];
+        for(var i = 0; i < action.dataSetsToUpdate.length; i++) {
+            var dataSet = action.dataSetsToUpdate[i];
+            // Grab the first one because repeaters must have only element id, as they cannot be inside repeaters
+            //  or none if unplaced
+            var id = $ax.getElementIdsFromPath(dataSet.path, eventInfo)[0];
+            if(!id || _ignoreAction(id)) continue;
+
+            $ax.repeater.updateEditItems(id, dataSet.props, eventInfo, dataSet.type, dataSet.rule);
+            _addRefresh(id);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.setRepeaterToDataSet = function(eventInfo, actions, index) {
+        var action = actions[index];
+
+        for(var i = 0; i < action.repeatersToSet.length; i++) {
+            var setRepeaterInfo = action.repeatersToSet[i];
+            // Grab the first one because repeaters must have only element id, as they cannot be inside repeaters
+            //  or none if unplaced
+            var id = $ax.getElementIdsFromPath(setRepeaterInfo.path, eventInfo)[0];
+            if(!id) continue;
+            $ax.repeater.setDataSet(id, setRepeaterInfo.localDataSetId);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.addFilterToRepeater = function(eventInfo, actions, index) {
+        var action = actions[index];
+
+        for(var i = 0; i < action.repeatersToAddFilter.length; i++) {
+            var addFilterInfo = action.repeatersToAddFilter[i];
+            // Grab the first one because repeaters must have only element id, as they cannot be inside repeaters
+            //  or none if unplaced
+            var id = $ax.getElementIdsFromPath(addFilterInfo.path, eventInfo)[0];
+            if(!id || _ignoreAction(id)) continue;
+
+            $ax.repeater.addFilter(id, addFilterInfo.removeOtherFilters, addFilterInfo.label, addFilterInfo.filter, eventInfo.srcElement);
+            _addRefresh(id);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.removeFilterFromRepeater = function(eventInfo, actions, index) {
+        var action = actions[index];
+
+        for(var i = 0; i < action.repeatersToRemoveFilter.length; i++) {
+            var removeFilterInfo = action.repeatersToRemoveFilter[i];
+            // Grab the first one because repeaters must have only element id, as they cannot be inside repeaters
+            //  or none if unplaced
+            var id = $ax.getElementIdsFromPath(removeFilterInfo.path, eventInfo)[0];
+            if(!id || _ignoreAction(id)) continue;
+
+            if(removeFilterInfo.removeAll) $ax.repeater.removeFilter(id);
+            else if(removeFilterInfo.filterName != '') {
+                $ax.repeater.removeFilter(id, removeFilterInfo.filterName);
+            }
+            _addRefresh(id);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.addSortToRepeater = function(eventInfo, actions, index) {
+        var action = actions[index];
+
+        for(var i = 0; i < action.repeatersToAddSort.length; i++) {
+            var addSortInfo = action.repeatersToAddSort[i];
+            // Grab the first one because repeaters must have only element id, as they cannot be inside repeaters
+            //  or none if unplaced
+            var id = $ax.getElementIdsFromPath(addSortInfo.path, eventInfo)[0];
+            if(!id || _ignoreAction(id)) continue;
+
+            $ax.repeater.addSort(id, addSortInfo.label, addSortInfo.columnName, addSortInfo.ascending, addSortInfo.toggle, addSortInfo.sortType);
+            _addRefresh(id);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.removeSortFromRepeater = function(eventInfo, actions, index) {
+        var action = actions[index];
+
+        for(var i = 0; i < action.repeatersToRemoveSort.length; i++) {
+            var removeSortInfo = action.repeatersToRemoveSort[i];
+            // Grab the first one because repeaters must have only element id, as they cannot be inside repeaters
+            //  or none if unplaced
+            var id = $ax.getElementIdsFromPath(removeSortInfo.path, eventInfo)[0];
+            if(!id || _ignoreAction(id)) continue;
+
+            if(removeSortInfo.removeAll) $ax.repeater.removeSort(id);
+            else if(removeSortInfo.sortName != '') $ax.repeater.removeSort(id, removeSortInfo.sortName);
+            _addRefresh(id);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.setRepeaterToPage = function(eventInfo, actions, index) {
+        var action = actions[index];
+
+        for(var i = 0; i < action.repeatersToSetPage.length; i++) {
+            var setPageInfo = action.repeatersToSetPage[i];
+            // Grab the first one because repeaters must have only element id, as they cannot be inside repeaters
+            //  or none if unplaced
+            var id = $ax.getElementIdsFromPath(setPageInfo.path, eventInfo)[0];
+            if(!id || _ignoreAction(id)) continue;
+
+            var oldTarget = eventInfo.targetElement;
+            eventInfo.targetElement = id;
+            $ax.repeater.setRepeaterToPage(id, setPageInfo.pageType, setPageInfo.pageValue, eventInfo);
+            eventInfo.targetElement = oldTarget;
+            _addRefresh(id);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.setItemsPerRepeaterPage = function(eventInfo, actions, index) {
+        var action = actions[index];
+
+        for(var i = 0; i < action.repeatersToSetItemCount.length; i++) {
+            var setItemCountInfo = action.repeatersToSetItemCount[i];
+            // Grab the first one because repeaters must have only element id, as they cannot be inside repeaters
+            //  or none if unplaced
+            var id = $ax.getElementIdsFromPath(setItemCountInfo.path, eventInfo)[0];
+            if(!id || _ignoreAction(id)) continue;
+
+            if(setItemCountInfo.noLimit) $ax.repeater.setNoItemLimit(id);
+            else $ax.repeater.setItemLimit(id, setItemCountInfo.itemCountValue, eventInfo);
+            _addRefresh(id);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.refreshRepeater = function(eventInfo, actions, index) {
+        // We use this as a psudo action now.
+        var action = actions[index];
+        for (var i = 0; i < action.repeatersToRefresh.length; i++) {
+            // Grab the first one because repeaters must have only element id, as they cannot be inside repeaters
+            //  or none if unplaced
+            var id = $ax.getElementIdsFromPath(action.repeatersToRefresh[i], eventInfo)[0];
+            if(id) _tryRefreshRepeater(id, eventInfo);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    var _tryRefreshRepeater = function(id, eventInfo) {
+        var idIndex = _repeatersToRefresh.indexOf(id);
+        if(idIndex == -1) return;
+
+        $ax.splice(_repeatersToRefresh, idIndex, 1);
+        $ax.repeater.refreshRepeater(id, eventInfo);
+    };
+
+    _action.tryRefreshRepeaters = function(ids, eventInfo) {
+        for(var i = 0; i < ids.length; i++) _tryRefreshRepeater(ids[i], eventInfo);
+    };
+
+    _actionHandlers.scrollToWidget = function(eventInfo, actions, index) {
+        var action = actions[index];
+        var elementIds = $ax.getElementIdsFromPath(action.objectPath, eventInfo);
+        if(elementIds.length > 0) $ax('#' + elementIds[0]).scroll(action.options);
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+
+    _actionHandlers.enableDisableWidgets = function(eventInfo, actions, index) {
+        var action = actions[index];
+        for(var i = 0; i < action.pathToInfo.length; i++) {
+            var elementIds = $ax.getElementIdsFromPath(action.pathToInfo[i].objectPath, eventInfo);
+            var enable = action.pathToInfo[i].enableDisableInfo.enable;
+            for(var j = 0; j < elementIds.length; j++) $ax('#' + elementIds[j]).enabled(enable);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.setImage = function(eventInfo, actions, index) {
+        var oldTarget = eventInfo.targetElement;
+        var action = actions[index];
+        var view = $ax.adaptive.currentViewId;
+
+        eventInfo.image = true;
+        for(var i = 0; i < action.imagesToSet.length; i++) {
+            var imgInfo = action.imagesToSet[i];
+            if (view && imgInfo.adaptive[view]) imgInfo = imgInfo.adaptive[view];
+            else imgInfo = imgInfo.base;
+            var elementIds = $ax.getElementIdsFromPath(action.imagesToSet[i].objectPath, eventInfo);
+
+            for(var j = 0; j < elementIds.length; j++) {
+                var elementId = elementIds[j];
+
+                eventInfo.targetElement = elementId;
+                var evaluatedImgs = _evaluateImages(imgInfo, eventInfo);
+
+                var img = evaluatedImgs.normal;
+                if($ax.style.IsWidgetDisabled(elementId)) {
+                    if(imgInfo.disabled) img = evaluatedImgs.disabled;
+                } else if($ax.style.IsWidgetSelected(elementId)) {
+                    if(imgInfo.selected) img = evaluatedImgs.selected;
+                } else if($ax.event.mouseDownObjectId == elementId && imgInfo.mouseDown) img = evaluatedImgs.mouseDown;
+                else if($ax.event.mouseOverIds.indexOf(elementId) != -1 && imgInfo.mouseOver) {
+                    img = evaluatedImgs.mouseOver;
+                    //Update mouseOverObjectId
+                    var currIndex = $ax.event.mouseOverIds.indexOf($ax.event.mouseOverObjectId);
+                    var imgIndex = $ax.event.mouseOverIds.indexOf(elementId);
+                    if(currIndex < imgIndex) $ax.event.mouseOverObjectId = elementId;
+                } else if(imgInfo.mouseOver && elementId == eventInfo.srcElement) {
+                    img = evaluatedImgs.mouseOver;
+                }
+
+                //            $('#' + $ax.repeater.applySuffixToElementId(elementId, '_img')).attr('src', img);
+                $jobj($ax.GetImageIdFromShape(elementId)).attr('src', img);
+
+                //Set up overrides
+                $ax.style.mapElementIdToImageOverrides(elementId, evaluatedImgs);
+                $ax.style.updateElementIdImageStyle(elementId);
+
+                if(evaluatedImgs.mouseOver || evaluatedImgs.mouseDown) $ax.event.updateIxStyleEvents(elementId);
+            }
+        }
+        eventInfo.targetElement = oldTarget;
+        eventInfo.image = false;
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    var _evaluateImages = function(imgInfo, eventInfo) {
+        var retVal = {};
+        for(var state in imgInfo) {
+            if(!imgInfo.hasOwnProperty(state)) continue;
+            var img = imgInfo[state][$ax.adaptive.getSketchKey()] || $ax.expr.evaluateExpr(imgInfo[state].literal, eventInfo);
+            if(!img) img = $axure.utils.getTransparentGifPath();
+            retVal[state] = img;
+        }
+        return retVal;
+    };
+
+    $ax.clearRepeaterImageOverrides = function(repeaterId) {
+        var childIds = $ax.getChildElementIdsForRepeater(repeaterId);
+        for(var i = childIds; i < childIds.length; i++) $ax.style.deleteElementIdToImageOverride(childIds[i]);
+    };
+
+    _actionHandlers.setFocusOnWidget = function(eventInfo, actions, index) {
+        var action = actions[index];
+        if(action.objectPaths.length > 0) {
+            var elementIds = $ax.getElementIdsFromPath(action.objectPaths[0], eventInfo);
+            if(elementIds.length > 0) {
+                $ax('#' + elementIds[0]).focus();
+                //if select text and not in placeholder mode, then select all text
+                if(action.selectText && !$ax.placeholderManager.isActive(elementIds[0])) {
+                    var elementChildren = document.getElementById(elementIds[0]).children;
+                    //find the input or textarea element
+                    for(var i = 0; i < elementChildren.length; i++) {
+                        if (elementChildren[i].id.indexOf('_input') == -1) continue;
+                        var elementTagName = elementChildren[i].tagName;
+                        if(elementTagName && (elementTagName.toLowerCase() == "input" || elementTagName.toLowerCase() == "textarea")) {
+                            elementChildren[i].select();
+                        }
+                    }
+                }
+            }
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.expandCollapseTree = function(eventInfo, actions, index) {
+        var action = actions[index];
+        for(var i = 0; i < action.pathToInfo.length; i++) {
+            var pair = action.pathToInfo[i];
+            var elementIds = $ax.getElementIdsFromPath(pair.treeNodePath, eventInfo);
+            for(var j = 0; j < elementIds.length; j++) $ax('#' + elementIds[j]).expanded(pair.expandCollapseInfo.expand);
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.other = function(eventInfo, actions, index) {
+        var action = actions[index];
+        $ax.navigate({
+            url: $axure.utils.getOtherPath() + "#other=" + encodeURI(action.otherDescription),
+            target: "popup",
+            includeVariables: false,
+            popupOptions: action.popup
+        });
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+
+    _actionHandlers.fireEvents = function(eventInfo, actions, index) {
+        var action = actions[index];
+        //look for the nearest element id
+
+        var objId = eventInfo.srcElement;
+        var thisWidget = eventInfo.thiswidget;
+        var obj = $ax.getObjectFromElementId(objId);
+        var rdoId = obj ? $ax.getRdoParentFromElementId(objId) : "";
+        var rdo = $ax.getObjectFromElementId(rdoId);
+        var page = rdo ? $ax.pageData.masters[rdo.masterId] : $ax.pageData.page;
+
+        // Check if rdo should be this
+        var oldIsMasterEvent = eventInfo.isMasterEvent;
+        if (obj && $ax.public.fn.IsReferenceDiagramObject(obj.type) && eventInfo.isMasterEvent) {
+            rdoId = objId;
+            rdo = obj;
+            page = $ax.pageData.masters[rdo.masterId];
+        }
+
+        for(var i = 0; i < action.firedEvents.length; i++) {
+            var firedEvent = action.firedEvents[i];
+            var isPage = firedEvent.objectPath.length == 0;
+            var targetObjIds = isPage ? [rdoId] : $ax.getElementIdsFromPath(firedEvent.objectPath, eventInfo);
+            for (var j = 0; j < targetObjIds.length; j++) {
+                var targetObjId = targetObjIds[j];
+                var targetObj = isPage ? rdo : $ax.getObjectFromElementId(targetObjId);
+
+                eventInfo.srcElement = targetObjId || '';
+                eventInfo.thiswidget = $ax.getWidgetInfo(eventInfo.srcElement);
+
+                eventInfo.isMasterEvent = false;
+                var raisedEvents = firedEvent.raisedEventIds;
+                if(raisedEvents) {
+                    for(var k = 0; k < raisedEvents.length; k++) {
+                        var event = targetObj.interactionMap && targetObj.interactionMap.raised && targetObj.interactionMap.raised[raisedEvents[k]];
+                        if(event) $ax.event.handleEvent(targetObjId, eventInfo, event, false, true);
+                    }
+                }
+
+                if(isPage) {
+                    eventInfo.isMasterEvent = true;
+                    eventInfo.label = $ax.pageData.page.name;
+                    eventInfo.friendlyType = 'Page';
+                }
+
+                var firedTarget = isPage ? page : targetObj;
+                var firedEventNames = firedEvent.firedEventNames;
+                if(firedEventNames) {
+                    for(k = 0; k < firedEventNames.length; k++) {
+                        event = firedTarget.interactionMap && firedTarget.interactionMap[firedEventNames[k]];
+                        if(event) $ax.event.handleEvent(isPage ? '' : targetObjId, eventInfo, event, false, true);
+                    }
+                }
+                if(isPage) eventInfo.isMasterEvent = oldIsMasterEvent;
+            }
+            eventInfo.srcElement = objId;
+            eventInfo.thiswidget = thisWidget;
+
+            eventInfo.isMasterEvent = oldIsMasterEvent;
+        }
+
+        _dispatchAction(eventInfo, actions, index + 1);
+    };
+});
diff --git a/src_old/resources/scripts/axure/adaptive.js b/src_old/resources/scripts/axure/adaptive.js
new file mode 100644
index 0000000..37a362e
--- /dev/null
+++ b/src_old/resources/scripts/axure/adaptive.js
@@ -0,0 +1,771 @@
+$axure.internal(function($ax) {
+    $ax.adaptive = {};
+
+    $axure.utils.makeBindable($ax.adaptive, ["viewChanged"]);
+
+    var _auto = true;
+    var _autoIsHandledBySidebar = false;
+
+    var _views;
+    var _idToView;
+    var _enabledViews = [];
+
+    var _initialViewToLoad;
+    var _initialViewSizeToLoad;
+
+    var _loadFinished = false;
+    $ax.adaptive.loadFinished = function() {
+        if(_loadFinished) return;
+        _loadFinished = true;
+        if($ax.adaptive.currentViewId) $ax.viewChangePageAndMasters();
+        else $ax.postAdaptiveViewChanged();
+    };
+
+    var _handleResize = function(forceSwitchTo) {
+        if(!_auto) return;
+        if(_auto && _autoIsHandledBySidebar && !forceSwitchTo) return;
+
+        var $window = $(window);
+        var height = $window.height();
+        var width = $window.width();
+
+        var toView = _getAdaptiveView(width, height);
+        var toViewId = toView && toView.id;
+
+        _switchView(toViewId, forceSwitchTo);
+    };
+
+    var _setAuto = $ax.adaptive.setAuto = function(val) {
+        if(_auto != val) {
+            _auto = Boolean(val);
+        }
+    };
+
+    var _setLineImage = function(id, imageUrl) {
+        $jobj(id).attr('src', imageUrl);
+    };
+
+    var _switchView = function (viewId, forceSwitchTo) {
+        //if(!$ax.pageData.isAdaptiveEnabled) return;
+
+        var previousViewId = $ax.adaptive.currentViewId;
+        if(typeof previousViewId == 'undefined') previousViewId = '';
+        if(typeof viewId == 'undefined') viewId = '';
+        if (viewId == previousViewId) {
+            if(forceSwitchTo) $ax.postAdaptiveViewChanged(forceSwitchTo);
+            return;
+        }
+
+        $ax('*').each(function(obj, elementId) {
+            if (!$ax.public.fn.IsTreeNodeObject(obj.type)) return;
+            if(!obj.hasOwnProperty('isExpanded')) return;
+
+            var query = $ax('#' + elementId);
+            var defaultExpanded = obj.isExpanded;
+
+            query.expanded(defaultExpanded);
+        });
+
+        // reset all the inline positioning from move and rotate actions including size and transformation
+        $axure('*').each(function (diagramObject, elementId) {
+            if(diagramObject.isContained) return;
+            if($ax.getParentRepeaterFromElementIdExcludeSelf(elementId)) return;
+
+            var element = document.getElementById(elementId);
+            if(element) {
+                var resetCss = {
+                    top: "", left: "", width: "", height: "", opacity: "",
+                    transform: "", webkitTransform: "", MozTransform: "", msTransform: "", OTransform: ""
+                };
+                var query = $(element);
+                query.css(resetCss);
+                var isPanel = $ax.public.fn.IsDynamicPanel(diagramObject.type);
+                if(!isPanel || diagramObject.fitToContent) { //keeps size on the panel states when switching adaptive views to optimize fit to panel
+                    if(diagramObject.fitToContent) $ax.dynamicPanelManager.setFitToContentCss(elementId, true);
+                    var children = query.children();
+                    if(children.length) children.css(resetCss);
+                }
+
+                $ax.dynamicPanelManager.resetFixedPanel(diagramObject, element);
+                $ax.dynamicPanelManager.resetAdaptivePercentPanel(diagramObject, element);
+            }
+        });
+
+        $ax.adaptive.currentViewId = viewId; // we need to set this so the enabled and selected styles will apply properly
+        if(previousViewId) {
+            $ax.style.clearAdaptiveStyles();
+            $('*').removeClass(previousViewId);
+        } else {
+            $ax.style.reselectElements();
+        }
+
+        $axure('*').each(function (obj, elementId) {
+            if($ax.getParentRepeaterFromElementIdExcludeSelf(elementId)) return;
+
+            $ax.style.updateElementIdImageStyle(elementId); // When image override exists, fix styling/borders
+        });
+
+        //$ax.style.startSuspendTextAlignment();
+
+        // reset all the images only if we're going back to the default view
+        if(!viewId) {
+            $axure('*').each(function (diagramObject, elementId) {
+                if($ax.getParentRepeaterFromElementIdExcludeSelf(elementId)) return;
+
+                $ax.placeholderManager.refreshPlaceholder(elementId);
+
+                var images = diagramObject.images;
+                if(diagramObject.type == 'horizontalLine' || diagramObject.type == 'verticalLine') {
+                    var startImg = images['start~'];
+                    _setLineImage(elementId + "_start", startImg);
+                    var endImg = images['end~'];
+                    _setLineImage(elementId + "_end", endImg);
+                    var lineImg = images['line~'];
+                    _setLineImage(elementId + "_line", lineImg);
+                } else if(diagramObject.type == $ax.constants.CONNECTOR_TYPE) {
+                    _setAdaptiveConnectorImages(elementId, images, '');
+                } else if(images) {
+                    if (diagramObject.generateCompound) {
+
+                        if($ax.style.IsWidgetDisabled(elementId)) {
+                            disabledImage = _getImageWithTag(images, 'disabled~');
+                            if(disabledImage) $ax.style.applyImage(elementId, disabledImage, 'disabled');
+                            return;
+                        }
+                        if($ax.style.IsWidgetSelected(elementId)) {
+                            selectedImage = _getImageWithTag(images, 'selected~');
+                            if(selectedImage) $ax.style.applyImage(elementId, selectedImage, 'selected');
+                            return;
+                        }
+                        $ax.style.applyImage(elementId, _getImageWithTag(images, 'normal~'), 'normal');
+                    } else {
+                        if ($ax.style.IsWidgetDisabled(elementId)) {
+                            var disabledImage = _matchImage(elementId, images, [], 'disabled', true);                            
+                            if (disabledImage) $ax.style.applyImage(elementId, disabledImage, 'disabled');
+                            return;
+                        }
+                        if ($ax.style.IsWidgetSelected(elementId)) {
+                            var selectedImage = _matchImage(elementId, images, [], 'selected', true);  
+                            if (selectedImage) $ax.style.applyImage(elementId, selectedImage, 'selected');
+                            return;
+                        }
+                        var normalImage = _matchImage(elementId, images, [], 'normal', true);  
+                        $ax.style.applyImage(elementId, normalImage, 'normal');
+                    }
+                }
+
+                //align all text
+                var child = $jobj(elementId).children('.text');
+                if(child.length) $ax.style.transformTextWithVerticalAlignment(child[0].id, function() { });
+            });
+            // we have to reset visibility if we aren't applying a new view
+            $ax.visibility.resetLimboAndHiddenToDefaults();
+            $ax.visibility.clearMovedAndResized();
+            $ax.repeater.refreshAllRepeaters();
+            $ax.dynamicPanelManager.updateParentsOfNonDefaultFitPanels();
+            $ax.dynamicPanelManager.updatePercentPanelCache($ax('*'));
+        } else {
+            $ax.visibility.clearLimboAndHidden();
+            $ax.visibility.clearMovedAndResized();
+            _applyView(viewId);
+            $ax.repeater.refreshAllRepeaters();
+            $ax.dynamicPanelManager.updateAllLayerSizeCaches();
+            $ax.dynamicPanelManager.updateParentsOfNonDefaultFitPanels();
+        }
+
+        $ax.annotation.updateAllFootnotes();
+        //$ax.style.resumeSuspendTextAlignment();
+
+        $ax.adaptive.triggerEvent('viewChanged', {});
+        if(_loadFinished) $ax.viewChangePageAndMasters(forceSwitchTo);
+    };
+
+    var _getImageWithTag  = function(image, tag) {
+        var flattened = {};
+        for (var component in image) {
+            var componentImage = image[component][tag];
+            if(componentImage) flattened[component] = componentImage;
+        }
+        return flattened;
+    }
+
+    // gets the inheritance chain of a particular view.
+    var _getAdaptiveIdChain = $ax.adaptive.getAdaptiveIdChain = function(viewId) {
+        if(!viewId) return [];
+        var view = _idToView[viewId];
+        var chain = [];
+        var current = view;
+        while(current) {
+            chain[chain.length] = current.id;
+            current = _idToView[current.baseViewId];
+        }
+        return chain.reverse();
+    };
+
+    var _getMasterAdaptiveIdChain = $ax.adaptive.getMasterAdaptiveIdChain = function (masterId, viewId) {
+        if (!viewId) return [];
+
+        var master = $ax.pageData.masters[masterId];
+        var masterViews = master.adaptiveViews;
+        var idToMasterView = {};
+        if (masterViews && masterViews.length > 0) {
+            for (var i = 0; i < masterViews.length; i++) {
+                var view = masterViews[i];
+                idToMasterView[view.id] = view;
+            }
+        }
+
+        if (!idToMasterView) return [];
+
+        var view = idToMasterView[viewId];
+        var chain = [];
+        var current = view;
+        while (current) {
+            chain[chain.length] = current.id;
+            current = idToMasterView[current.baseViewId];
+        }
+        return chain.reverse();
+    };
+
+    var _getPageStyle = $ax.adaptive.getPageStyle = function() {
+        var currentViewId = $ax.adaptive.currentViewId;
+        var adaptiveChain = _getAdaptiveIdChain(currentViewId);
+
+        var currentStyle = $.extend({}, $ax.pageData.page.style);
+        for(var i = 0; i < adaptiveChain.length; i++) {
+            var viewId = adaptiveChain[i];
+            $.extend(currentStyle, $ax.pageData.page.adaptiveStyles[viewId]);
+        }
+
+        return currentStyle;
+    };
+
+    var _setAdaptiveLineImages = function(elementId, images, viewIdChain) {
+        for(var i = viewIdChain.length - 1; i >= 0; i--) {
+            var viewId = viewIdChain[i];
+            var startImg = images['start~' + viewId];
+            if(startImg) {
+                _setLineImage(elementId + "_start", startImg);
+                var endImg = images['end~' + viewId];
+                _setLineImage(elementId + "_end", endImg);
+                var lineImg = images['line~' + viewId];
+                _setLineImage(elementId + "_line", lineImg);
+                break;
+            }
+        }
+    };
+
+    var _setAdaptiveConnectorImages = function (elementId, images, view) {
+        var conn = $jobj(elementId);
+        var count = conn.children().length-1; // -1 for rich text panel
+        for(var i = 0; i < count; i++) {
+            var img = images['' + i + '~' + view];
+            $jobj(elementId + '_seg' + i).attr('src', img);
+        }
+    };
+
+    var _applyView = $ax.adaptive.applyView = function(viewId, query) {
+        var limboIds = {};
+        var hiddenIds = {};
+
+        var jquery;
+        if(query) {
+            jquery = query.jQuery();
+            jquery = jquery.add(jquery.find('*'));
+            var jqueryAnn = $ax.annotation.jQueryAnn(query);
+            jquery = jquery.add(jqueryAnn);
+        } else {
+            jquery = $('*').not('#ios-safari-fixed');
+            query = $ax('*');
+        }
+        jquery.addClass(viewId);
+        var viewIdChain = _getAdaptiveIdChain(viewId);
+        // this could be made more efficient by computing it only once per object
+        query.each(function(diagramObject, elementId) {
+            _applyAdaptiveViewOnObject(diagramObject, elementId, viewIdChain, viewId, limboIds, hiddenIds);
+        });
+
+        $ax.visibility.addLimboAndHiddenIds(limboIds, hiddenIds, query);
+        //$ax.dynamicPanelManager.updateAllFitPanelsAndLayerSizeCaches();
+        $ax.dynamicPanelManager.updatePercentPanelCache(query);
+    };
+
+    var _applyAdaptiveViewOnObject = function(diagramObject, elementId, viewIdChain, viewId, limboIds, hiddenIds) {
+        var adaptiveChain = [];
+        for(var i = 0; i < viewIdChain.length; i++) {
+            var viewId = viewIdChain[i];
+            var viewStyle = diagramObject.adaptiveStyles[viewId];
+            if(viewStyle) {
+                adaptiveChain[adaptiveChain.length] = viewStyle;
+                if (viewStyle.size) $ax.public.fn.convertToSingleImage($jobj(elementId));
+            }
+        }
+
+        var state = $ax.style.generateState(elementId);
+
+        // set the image
+        var images = diagramObject.images;
+        if(images) {
+            if(diagramObject.type == 'horizontalLine' || diagramObject.type == 'verticalLine') {
+                _setAdaptiveLineImages(elementId, images, viewIdChain);
+            } else if (diagramObject.type == $ax.constants.CONNECTOR_TYPE) {
+                _setAdaptiveConnectorImages(elementId, images, viewId);
+            } else if (diagramObject.generateCompound) {
+                var compoundUrl = _matchImageCompound(diagramObject, elementId, viewIdChain, state);
+                if (compoundUrl) $ax.style.applyImage(elementId, compoundUrl, state);
+            }else {
+                var imgUrl = _matchImage(elementId, images, viewIdChain, state);
+                if(imgUrl) $ax.style.applyImage(elementId, imgUrl, state);
+            }
+        }
+        // addaptive override style (not including default style props)
+        var adaptiveStyle = $ax.style.computeAllOverrides(elementId, undefined, state, viewId);
+
+        // this style INCLUDES the object's my style
+        var compoundStyle = $.extend({}, diagramObject.style, adaptiveStyle);
+
+        // if (diagramObject.owner.type == 'Axure:Master' && diagramObject.adaptiveStyles) {
+        //     adaptiveStyle = $ax.style.computeFullStyle(elementId, state, viewId);
+        // }
+
+        if(!diagramObject.isContained) {
+            $ax.style.setAdaptiveStyle(elementId, adaptiveStyle);
+        }
+
+        var scriptId = $ax.repeater.getScriptIdFromElementId(elementId);
+        if(compoundStyle.limbo && !diagramObject.isContained) limboIds[scriptId] = true;
+        // sigh, javascript. we need the === here because undefined means not overriden
+        if(compoundStyle.visible === false) hiddenIds[scriptId] = true;
+    };
+
+    var _matchImage = function(id, images, viewIdChain, state, doNotProgress) {
+        var override = $ax.style.getElementImageOverride(id, state);
+        if(override) return override;
+
+        if(!images) return undefined;
+
+        let scriptId = $ax.repeater.getScriptIdFromElementId(id);
+        
+        if(state == 'disabled' && $ax.style.IsWidgetSelected(id) || state == 'selected' && $ax.style.IsWidgetDisabled(id)) {
+            let diagramObject = $ax.getObjectFromElementId(id);
+            if(diagramObject && $ax.public.fn.IsSelectionButton(diagramObject.type)) {
+                var selectedDisabled = $ax.constants.SELECTED_DISABLED;
+            }
+        }
+
+        // first check all the images for this state
+        for(let i = viewIdChain.length - 1; i >= 0; i--) {
+            let viewId = viewIdChain[i];
+            if(selectedDisabled) {
+                let img = findImage(images, scriptId, selectedDisabled, viewId)
+                if(img) return img;
+            } else {
+                let img = findImage(images, scriptId, state, viewId);
+                if (img) return img;
+            }
+        }
+        // check for the default state style
+        if(selectedDisabled) {
+            let defaultStateImage = findImage(images, scriptId, selectedDisabled)
+            if(defaultStateImage) return defaultStateImage;
+        } else {
+            let defaultStateImage = findImage(images, scriptId, state);
+            if (defaultStateImage) return defaultStateImage;
+        }
+        
+        if(doNotProgress) return undefined;
+
+        state = $ax.style.progessState(state);
+        if (state) return _matchImage(scriptId, images, viewIdChain, state);
+
+        // SHOULD NOT REACH HERE! NORMAL SHOULD ALWAYS CATCH AT THE DEFAULT!
+        return images['normal~']; // this is the default
+    };
+    
+    let findImage = function(images, scriptId, state, viewId) {
+        if(!images) return undefined;
+
+        if(!viewId) viewId = "";
+        let withScript = scriptId + "~" + state + "~" + viewId;
+        let img = images[withScript];
+        if(!img) img = images[state + "~" + viewId];
+        return img;
+    }
+
+    var _matchImageCompound = function(diagramObject, id, viewIdChain, state) {
+        var images = [];
+        for(var i = 0; i < diagramObject.compoundChildren.length; i++) {
+            var component = diagramObject.compoundChildren[i];
+            images[component] = _matchImage(id, diagramObject.images[component], viewIdChain, state);
+        }
+        return images;
+    };
+
+
+
+    $ax.adaptive.getImageForStateAndView = function(id, state) {
+        var viewIdChain = _getAdaptiveIdChain($ax.adaptive.currentViewId);
+        var diagramObject = $ax.getObjectFromElementId(id);
+        if (diagramObject.generateCompound) return _matchImageCompound(diagramObject, id, viewIdChain, state);
+        else return _matchImage(id, diagramObject.images, viewIdChain, state);
+    };
+
+    var _getAdaptiveView = function(winWidth, winHeight) {
+        var _isViewOneGreaterThanTwo = function (view1, view2, winHeight) {
+            if (view1.size.width > view2.size.width) return true;
+            if (view1.size.width == view2.size.width) {
+                if (view2.size.height <= winHeight) return view1.size.height > view2.size.height && view1.size.height <= winHeight;
+                else return view1.size.height < view2.size.height;
+            }
+            return false;
+        };
+
+        var _isViewOneLessThanTwo = function(view1, view2) {
+            var width2 = view2.size.width || 1000000; // artificially large number
+            var height2 = view2.size.height || 1000000;
+
+            var width1 = view1.size.width || 1000000;
+            var height1 = view1.size.height || 1000000;
+
+            return width1 < width2 || (width1 == width2 && height1 < height2);
+        };
+
+        var _isWindowWidthGreaterThanViewWidth = function(view, width) {
+            return width >= view.size.width;
+        };
+
+        var _isWindowWidthLessThanViewWidth = function(view1, width) {
+            var viewWidth = view1.size.width || 1000000;
+
+            return width <= viewWidth;
+        };
+
+        var greater = undefined;
+        var less = undefined;
+
+        var defaultView = $ax.pageData.defaultAdaptiveView;
+        if (_isWindowWidthGreaterThanViewWidth(defaultView, winWidth, winHeight)) greater = defaultView;
+        less = defaultView;
+        for(var i = 0; i < _enabledViews.length; i++) {
+            var view = _enabledViews[i];
+            if(_isWindowWidthGreaterThanViewWidth(view, winWidth, winHeight)) {
+                if(!greater || _isViewOneGreaterThanTwo(view, greater, winHeight)) greater = view;
+            }
+            if(_isWindowWidthLessThanViewWidth(view, winWidth, winHeight)) {
+                if(!less || _isViewOneLessThanTwo(view, less)) less = view;
+            }
+        }
+        return greater || less;
+    };
+
+    var _isAdaptiveInitialized = function() {
+        return typeof _idToView != 'undefined';
+    };
+
+
+    $ax.messageCenter.addMessageListener(function(message, data) {
+        //If the adaptive plugin hasn't been initialized yet then 
+        //save the view to load so that it can get set when initialize occurs
+        if (message == 'switchAdaptiveView') {
+            if (!$axure.utils.isInPlayer()) return;
+
+            var href = window.location.href.split('#')[0];
+            var lastSlash = href.lastIndexOf('/');
+            href = href.substring(lastSlash + 1);
+            if(href != data.src) return;
+
+            var view = data.view == 'auto' ? undefined : (data.view == 'default' ? '' : data.view);
+
+            if(!_isAdaptiveInitialized()) {
+                _initialViewToLoad = view;
+            } else _handleLoadViewId(view);
+        } else if (message == 'setAdaptiveViewForSize') {
+            if (!$axure.utils.isInPlayer()) return;
+
+            _autoIsHandledBySidebar = true;
+            if(!_isAdaptiveInitialized()) {
+                _initialViewSizeToLoad = data;
+            } else _handleSetViewForSize(data.width, data.height);
+        } else if (message == 'getScale') {
+            if (!$axure.utils.isInPlayer()) return;
+
+            var prevScaleN = data.prevScaleN;
+            var newScaleN = 1;
+            var contentOriginOffset = 0;
+            
+            var $body = $('body');
+            $body.css('height', '');
+
+            if (data.scale != 0) {
+                var adjustScrollScale = false;
+                if ($('html').getNiceScroll().length == 0 && !MOBILE_DEVICE) {
+                    //adding nicescroll so width is correct when getting scale
+                    _addNiceScroll($('html'), { emulatetouch: false, horizrailenabled: false });
+                    adjustScrollScale = true;
+                }
+                
+                $('html').css('overflow-x', 'hidden');
+
+                var bodyWidth = $body.width();
+                var isCentered = $body.css('position') == 'relative';
+                
+                // screen width does not adjust on screen rotation for iOS (width is always shorter screen measurement)
+                var isLandscape = window.orientation != 0 && window.orientation != 180;
+                var mobileWidth = (IOS ? (isLandscape ? window.screen.height : window.screen.width) : window.screen.width) - data.panelWidthOffset;
+                var scaleN = newScaleN = (MOBILE_DEVICE ? mobileWidth : $(window).width()) / bodyWidth;
+
+                if (data.scale == 2) {
+                    var pageSize = $ax.public.fn.getPageSize();
+                    var hScaleN = (MOBILE_DEVICE ? data.viewportHeight : $(window).height()) / Math.max(1, pageSize.bottom);
+                    if (hScaleN < scaleN) {
+                        scaleN = newScaleN = hScaleN;
+                    }
+                    if (isCentered) contentOriginOffset = scaleN * (bodyWidth / 2);
+                }
+
+                if ((SAFARI && IOS) || SHARE_APP) {
+                    var pageSize = $ax.public.fn.getPageSize();
+                    $body.first().css('height', pageSize.bottom + 'px');
+                } //else $body.css('height', $body.height() + 'px');
+
+                if (adjustScrollScale) {
+                    _removeNiceScroll($('html'));
+                    _addNiceScroll($('html'), { emulatetouch: false, horizrailenabled: false, cursorwidth: Math.ceil(6 / newScaleN) + 'px', cursorborder: 1 / newScaleN + 'px solid #fff', cursorborderradius: 5 / newScaleN + 'px' });
+                }
+            }
+            var contentScale = {
+                scaleN: newScaleN,
+                prevScaleN: prevScaleN,
+                contentOriginOffset: contentOriginOffset,
+                clipToView: data.clipToView,
+                viewportHeight: data.viewportHeight,
+                viewportWidth: data.viewportWidth,
+                panelWidthOffset: data.panelWidthOffset,
+                scale: data.scale
+            };
+            $axure.messageCenter.postMessage('setContentScale', contentScale);
+
+        } else if (message == 'setDeviceMode') {
+            if (!$axure.utils.isInPlayer()) return;
+
+            _isDeviceMode = data.device;
+            if (data.device) {
+                // FIXES firefox cursor not staying outside initial device frame border
+                // SAFARI needs entire content height so that trackpad can be disabled
+                //if (FIREFOX || (SAFARI && !IOS)) {
+                //    var pageSize = $ax.public.fn.getPageSize();
+                //    $('html').css('height', pageSize.bottom + 'px');
+                //}
+                
+                _removeNiceScroll($('html'), true);
+                if (!MOBILE_DEVICE) {
+                    _addNiceScroll($('html'), { emulatetouch: true, horizrailenabled: false }, true);
+                    $('html').addClass('mobileFrameCursor');
+                    $('html').css('cursor', 'url(resources/css/images/touch.cur), auto');
+                    $('html').css('cursor', 'url(resources/css/images/touch.svg) 32 32, auto');
+                    $('html').css('overflow-x', 'hidden');
+
+                    if (IE) {
+                        document.addEventListener("click", function () {
+                            // IE still sometimes wants an argument here
+                            this.activeElement.releasePointerCapture();
+                        }, false);
+                    }
+
+                    if ($axure.browser.isEdge) {
+                        document.addEventListener("pointerdown", function (e) {
+                            this.activeElement.releasePointerCapture(e.pointerId);
+                        }, false);
+                    }
+
+                    $ax.dynamicPanelManager.initMobileScroll();
+                }
+
+                // Gives horizontal scroll to android in 100% (handled outside of iframe)
+                $('html').css('overflow-x', 'hidden');
+                $('body').css('margin', '0px');
+                $(function () { _setHorizontalScroll(false); });
+            } else {
+                _removeNiceScroll($('html'), true);
+                $('html').css('overflow-x', '');
+                $('html').css('cursor', '');
+                //$('html').removeAttr('style');
+                $('body').css('margin', '');
+                $('html').removeClass('mobileFrameCursor');
+                $(function () { _setHorizontalScroll(!data.scaleToWidth); });
+
+                $ax.dynamicPanelManager.initMobileScroll();
+            }
+        }
+    });
+
+    var _isDeviceMode = false;
+    $ax.adaptive.isDeviceMode = function () {
+        return _isDeviceMode;
+    }
+
+    var _isHtmlQuery = function ($container) { return $container.length > 0 && $container[0] == $('html')[0]; }
+    
+    var _removeNiceScroll = $ax.adaptive.removeNiceScroll = function ($container, blockResetScroll) {
+        if (!blockResetScroll) {
+            $container.scrollLeft(0);
+            $container.scrollTop(0);
+        }
+        var nS = $container.getNiceScroll();
+        var emulateTouch = nS.length > 0 && nS[0].opt.emulateTouch;
+        nS.remove();
+        //clean up nicescroll css
+        if (IE) $container.css({ '-ms-overflow-y': '', 'overflow-y': '', '-ms-overflow-style': '', '-ms-touch-action': '' });
+        if (!emulateTouch) return; 
+        if (_isHtmlQuery($container)) {
+            $('#scrollContainer').remove();
+            $('#base').off('mouseleave.ax');
+        } else {
+            $container.off('mouseleave.ax');
+        }
+    }
+
+    var _addNiceScrollExitDetector = function ($container) {
+        if (_isHtmlQuery($container)) {
+
+            // add a fixed div the size of the frame that will not move as we scroll like html,body,#base,children
+            // so we are able to detect when the mouse leaves that frame area if there is no existing DOM element
+            var $scrollContainer = $("<div id='scrollContainer'></div>");
+            var $body = $('body');
+            $scrollContainer.css({
+                'position': 'fixed',
+                'width': $body.width(),
+                'height': $body.height()
+            });
+
+            // we want #base div to handle the event so that it bubbles up from the scrollContainer div which
+            // handles the bounds of the frame in case there was no previously exisiting child to bubble up the
+            // event or if the user has clicked on an existing child node to start the emulated touch scroll
+            var $base = $('#base');
+            $base.on('mouseleave.ax', function (e) {
+                var nS = $container.getNiceScroll();
+                for (var i = 0; i < nS.length; ++i)
+                    nS[i].ontouchend(e);
+            });
+            // need to prepend so it is first child in DOM and doesn't block mouse events to other children which
+            // would make them unable to scroll
+            $base.prepend($scrollContainer);
+        } else {
+            $container.on('mouseleave.ax', function (e) {
+                var nS = $container.getNiceScroll();
+                for (var i = 0; i < nS.length; ++i)
+                    nS[i].ontouchend(e);
+            });
+        }
+    }
+
+    var _addNiceScroll = $ax.adaptive.addNiceScroll = function ($container, options, blockResetScroll) {
+        if (!blockResetScroll) {
+            $container.scrollLeft(0);
+            $container.scrollTop(0);
+        }
+        $container.niceScroll(options);
+        // RP-581 add handling to stop scroll on mouse leave if enable cursor-drag scrolling like touch devices in desktop computer
+        if (options.emulatetouch) _addNiceScrollExitDetector($container);
+        //clean up nicescroll css so child scroll containers show scrollbars in IE
+        if (IE) $container.css({ '-ms-overflow-y': '', '-ms-overflow-style': '' });
+        if(IOS) $container.css({ 'overflow-y': ''});
+    }
+
+    //given the element, find the container that's using nice scroll (including the element itself)
+    $ax.adaptive.getNiceScrollContainer = function(element) {
+        var parent = element;
+        while(parent) {
+            if($(parent).getNiceScroll().length > 0) return parent;
+            parent = parent.parentElement;
+        }
+        return undefined;
+    }
+
+
+    $ax.adaptive.updateMobileScrollOnBody = function () {
+        var niceScroll = $('html').getNiceScroll();
+        if (niceScroll.length == 0) return;
+        niceScroll.resize();
+    }
+
+    var _setTrackpadHorizontalScroll = function (active) {
+        var preventScroll = function (e) {
+            if (Math.abs(e.wheelDeltaX) != 0) {
+                e.preventDefault();
+            }
+        }
+
+        if (!active) {
+            document.body.addEventListener("mousewheel", preventScroll, { passive: false });
+            document.getElementById('html').addEventListener("mousewheel", preventScroll, { passive: false });
+        } else {
+            document.body.removeEventListener("mousewheel", preventScroll, { passive: false });
+            document.getElementById('html').removeEventListener("mousewheel", preventScroll, { passive: false });
+        }
+    }
+
+    var _setHorizontalScroll = function (active) {
+        var $body = $(document);
+        if (!active) {
+            $body.bind('scroll', function () {
+                if ($body.scrollLeft() !== 0) {
+                    $body.scrollLeft(0);
+                }
+            });
+        } else {
+            $body.unbind('scroll');
+        }
+    }
+
+    $ax.adaptive.setAdaptiveView = function(view) {
+        var viewIdForSitemapToUnderstand = view == 'auto' ? undefined : (view == 'default' ? '' : view);
+
+        if(!_isAdaptiveInitialized()) {
+            _initialViewToLoad = viewIdForSitemapToUnderstand;
+        } else _handleLoadViewId(viewIdForSitemapToUnderstand);
+    };
+
+    $ax.adaptive.initialize = function() {
+        _views = $ax.pageData.adaptiveViews;
+        _idToView = {};
+
+        var useViews = $ax.document.configuration.useViews;
+
+        if(_views && _views.length > 0) {
+            for(var i = 0; i < _views.length; i++) {
+                var view = _views[i];
+                _idToView[view.id] = view;
+                if(useViews) _enabledViews[_enabledViews.length] = view;
+            }
+
+            if(_autoIsHandledBySidebar && _initialViewSizeToLoad) _handleSetViewForSize(_initialViewSizeToLoad.width, _initialViewSizeToLoad.height);
+            else _handleLoadViewId(_initialViewToLoad);
+        }
+
+        $axure.resize(function(e) {
+            _handleResize();
+            $ax.postResize(e); //window resize fires after view changed
+        });
+    };
+
+    var _handleLoadViewId = function (loadViewId, forceSwitchTo) {
+        if(typeof loadViewId != 'undefined') {
+            _setAuto(false);
+            _switchView(loadViewId != 'default' ? loadViewId : '', forceSwitchTo);
+        } else {
+            _setAuto(true);
+            _handleResize(forceSwitchTo);
+        }
+    };
+
+    var _handleSetViewForSize = function (width, height) {
+        var toView = _getAdaptiveView(width, height);
+        var toViewId = toView && toView.id;
+        _switchView(toViewId, "auto");
+    };
+
+    $ax.adaptive.getSketchKey = function() {
+        return $ax.pageData.sketchKeys[$ax.adaptive.currentViewId || ''];
+    }
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/annotation.js b/src_old/resources/scripts/axure/annotation.js
new file mode 100644
index 0000000..f4ec9d1
--- /dev/null
+++ b/src_old/resources/scripts/axure/annotation.js
@@ -0,0 +1,178 @@
+// ******* Annotation MANAGER ******** //
+$axure.internal(function($ax) {
+    var NOTE_SIZE = 10;
+
+    var _annotationManager = $ax.annotation = {};
+
+    var _updateLinkLocations = $ax.annotation.updateLinkLocations = function(elementId) {
+        var textId = $ax.GetTextPanelId(elementId);
+        if(!textId) return;
+
+        var rotation = $ax.getObjectFromElementId(elementId).style.rotation;
+        //we have to do this because webkit reports the post-transform position but when you set positions it's pre-transform
+        if(WEBKIT && rotation) {
+            //we can dynamiclly rotate a widget now, show need to remember the transform rather than just remove it
+            //here jquery.css will return 'none' if element is display none
+            var oldShapeTransform = document.getElementById(elementId).style['-webkit-transform'];
+            var oldTextTransform = document.getElementById(textId).style['-webkit-transform'];
+            $('#' + elementId).css('-webkit-transform', 'scale(1)');
+            $('#' + textId).css('-webkit-transform', 'scale(1)');
+        }
+
+        $('#' + textId).find('div[id$="_ann"]').each(function(index, value) {
+            var elementId = value.id.replace('_ann', '');
+            var $link = $('#' + elementId);
+            var annPos = $link.position();
+            annPos.left += $link.width();
+            //var annPos = $(value).position();
+            var left = annPos.left;// - NOTE_SIZE;
+            var top = annPos.top - 5;
+
+            $(value).css('left', left).css('top', top);
+        });
+
+        //undo the transform reset
+        if(WEBKIT && rotation) {
+            $('#' + elementId).css('-webkit-transform', oldShapeTransform || '');
+            $('#' + textId).css('-webkit-transform', oldTextTransform || '');
+        }
+    };
+
+    var _toggleAnnotationDialog = function (elementId, event) {
+        let win = $(window);
+        let scrollY = win.scrollTop();
+        let scrollX = win.scrollLeft();
+        
+        let x = event.pageX - scrollX;
+        let y = event.pageY - scrollY;
+
+        let frameElement = window.frameElement;
+        let parent = window.parent;
+        //ann dialog is relative to mainFrame, exclude the mainFrame location so the notes shows up correctly in device mode
+        while(frameElement && frameElement.name !== 'mainFrame') {
+            let rect = frameElement.getBoundingClientRect();
+            x += rect.x;
+            y += rect.y;
+            
+            if(!parent) break;
+
+            frameElement = parent.frameElement;
+            parent = parent.parent;
+        }
+        
+        let messageData = { id: elementId, x: x, y: y }
+        if (!$axure.utils.isInPlayer()) messageData.page = $ax.pageData.notesData;
+        $ax.messageCenter.postMessage('toggleAnnDialog', messageData);
+    }
+    
+    $ax.annotation.initialize = function () {
+        _createFootnotes($ax('*'), true);
+    }
+
+    var _createFootnotes = $ax.annotation.createFootnotes = function(query, create) {
+        if(!$ax.document.configuration.showAnnotations) return;
+        
+        var widgetNotes = $ax.pageData.notesData.widgetNotes;
+        if (widgetNotes) {
+            var ownerToFns = $ax.pageData.notesData.ownerToFns;
+            if(!$.isEmptyObject(ownerToFns)) {
+                query.each(function(dObj, elementId) {
+                    var fns = ownerToFns[dObj.id];
+                    if (fns !== undefined) {
+                        var elementIdQuery = $('#' + elementId);
+                        if (dObj.type == 'hyperlink') {
+                            var parentId = $ax.GetParentIdFromLink(elementId);
+                            if (create) {
+                                elementIdQuery.after("<div id='" + elementId + "_ann' class='annnote'>&#8203;</div>");
+                                appendFns($('#' + elementId + "_ann"), fns);
+                            }
+                            _updateLinkLocations(parentId);
+                        } else {
+                            if (create) {
+                                elementIdQuery.after("<div id='" + elementId + "_ann' class='annnote'>&#8203;</div>");
+                                appendFns($('#' + elementId + "_ann"), fns);
+                            }
+                            _adjustIconLocation(elementId, dObj);
+                        }
+
+                        if (create) {
+                            $('#' + elementId + "_ann").click(function (e) {
+                                _toggleAnnotationDialog(dObj.id, e);
+                                return false;
+                            });
+
+                            var isVisible = true;
+                            var isMaster = $ax.public.fn.IsReferenceDiagramObject(dObj.type);
+                            if (isMaster) isVisible = dObj.visible;
+                            else isVisible = $ax.visibility.IsIdVisible(elementId);
+                            if (!isVisible) {
+                                var ann = document.getElementById(elementId + "_ann");
+                                if (ann) $ax.visibility.SetVisible(ann, false);
+                            }
+                        }
+                    }
+                });
+            }
+        }
+
+        function appendFns($parent, fns) {
+            for (var index = 0; index < fns.length; index++) {
+                $parent.append("<div class='annnotelabel' >" + fns[index] + "</div>");
+            }
+        }
+    };
+
+    $ax.annotation.updateAllFootnotes = function () {
+        _createFootnotes($ax('*'), false);
+    }
+
+    $ax.annotation.jQueryAnn = function(query) {
+        var elementIds = [];
+        query.each(function(diagramObject, elementId) {
+            if(diagramObject.annotation) elementIds[elementIds.length] = elementId;
+        });
+        var elementIdSelectors = jQuery.map(elementIds, function(elementId) { return '#' + elementId + '_ann'; });
+        var jQuerySelectorText = (elementIdSelectors.length > 0) ? elementIdSelectors.join(', ') : '';
+        return $(jQuerySelectorText);
+    };
+
+    $(window.document).ready(function() {
+        //$ax.annotation.InitializeAnnotations($ax(function(dObj) { return dObj.annotation; }));
+
+        $ax.messageCenter.addMessageListener(function(message, data) {
+            //If the annotations are being hidden via the Sitemap toggle button, hide any open dialogs
+            if(message == 'annotationToggle') {
+                if (data == true) {
+                    $('div.annnote').show();
+                } else {
+                    $('div.annnote').hide();
+                }
+            }
+        });
+    });
+
+    //adjust annotation location to a element's top right corner
+    var _adjustIconLocation = $ax.annotation.adjustIconLocation = function(id, dObj) {
+        var ann = document.getElementById(id + "_ann");
+        if(ann) {
+            var corners = $ax.public.fn.getCornersFromComponent(id);
+            var width = $(ann).width();
+            var newTopRight = $ax.public.fn.vectorPlus(corners.relativeTopRight, corners.centerPoint);
+            //note size is 14x8, this is how rp calculated it as well
+            ann.style.left = (newTopRight.x - width) + "px";
+
+            var elementType = dObj ? dObj.type : $ax.getTypeFromElementId(id);
+            var yOffset = $ax.public.fn.IsTableCell(elementType) ? 0 : -8;
+            ann.style.top = (newTopRight.y + yOffset) + "px";
+        }
+
+        var ref = document.getElementById(id + "_ref");
+        if(ref) {
+            if(!corners) corners = $ax.public.fn.getCornersFromComponent(id);
+            var newBottomRight = $ax.public.fn.vectorPlus(corners.relativeBottomRight, corners.centerPoint);
+
+            ref.style.left = (newBottomRight.x - 8) + 'px';
+            ref.style.top = (newBottomRight.y - 10) + 'px';
+        }
+    }
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/axQuery.js b/src_old/resources/scripts/axure/axQuery.js
new file mode 100644
index 0000000..0540c82
--- /dev/null
+++ b/src_old/resources/scripts/axure/axQuery.js
@@ -0,0 +1,404 @@
+$axure = function(query) {
+    return $axure.query(query);
+};
+ 
+// ******* AxQuery and Page metadata ******** //
+(function() {
+    var $ax = function() {
+        var returnVal = $axure.apply(this, arguments);
+        var axFn = $ax.fn;
+        for (var key in axFn) {
+            returnVal[key] = axFn[key];
+        }
+
+        return returnVal;
+    };
+
+    $ax.public = $axure;
+    $ax.fn = {};
+
+    $axure.internal = function(initFunction) {
+        //Attach messagecenter to $ax object so that it can be used in viewer.js, etc in internal scope
+        if(!$ax.messageCenter) $ax.messageCenter = $axure.messageCenter;
+
+        return initFunction($ax);
+    };
+    
+   var _lastFiredResize = 0; 
+   var _resizeFunctions = []; 
+   var _lastTimeout;
+   var _fireResize = function() {
+       if (_lastTimeout) window.clearTimeout(_lastTimeout);       
+       _lastTimeout = undefined;
+       _lastFiredResize = new Date().getTime(); 
+       for(var i = 0; i < _resizeFunctions.length; i++) _resizeFunctions[i](); 
+   };
+    
+   $axure.resize = function(fn) { 
+       if(fn) _resizeFunctions[_resizeFunctions.length] = fn; 
+       else $(window).resize(); 
+   };
+
+    $(window).resize(function() {
+        var THRESHOLD = 50;
+        _updateWindowInfo();
+        var now = new Date().getTime();
+        if(now - _lastFiredResize > THRESHOLD) {
+            _fireResize();
+        } else if(!_lastTimeout) {
+            _lastTimeout = window.setTimeout(_fireResize, THRESHOLD);
+        }
+   });
+
+    $(window).scroll(function () {
+        _updateWindowInfo();
+    });
+
+    var _windowInfo;
+    var _updateWindowInfo = $axure.updateWindowInfo = function () {
+        var win = {};
+        var jWin = $(window);
+        var scrollWin = $('#ios-safari-html').length > 0 ? $('#ios-safari-html') : jWin;
+        win.width = jWin.width();
+        win.height = jWin.height();
+        win.scrollx = scrollWin.scrollLeft();
+        win.scrolly = scrollWin.scrollTop();
+        _windowInfo = win;
+    };
+    $ax.getWindowInfo = function () {
+        if(!_windowInfo) _updateWindowInfo();
+        return _windowInfo;
+    };
+
+    
+    window.$obj = function(id) {
+        return $ax.getObjectFromElementId(id);
+    };
+
+    window.$id = function(obj) {
+        return obj.scriptIds[0];
+    };
+
+    window.$jobj = function(id) {
+        return $(document.getElementById(id));
+    };
+
+    window.$jobjAll = function(id) {
+        return $addAll($jobj(id), id);
+    };
+
+    window.$addAll = function(jobj, id) {
+        return jobj.add($jobj(id + '_ann')).add($jobj(id + '_ref'));
+    };
+
+    $ax.INPUT = function(id) { return id + "_input"; };
+    $ax.IsImageFocusable = function (type) { return $ax.public.fn.IsImageBox(type) || $ax.public.fn.IsVector(type) || $ax.public.fn.IsTreeNodeObject(type) || $ax.public.fn.IsTableCell(type); };
+    $ax.IsTreeNodeObject = function (type) { return $ax.public.fn.IsTreeNodeObject(type); };
+    $ax.IsSelectionButton = function (type) { return $ax.public.fn.IsCheckBox(type) || $ax.public.fn.IsRadioButton(type); };
+
+    var _fn = {};
+    $axure.fn = _fn;
+    $axure.fn.jQuery = function() {
+        var elements = this.getElements();
+        return $(elements);
+    };
+    $axure.fn.$ = $axure.fn.jQuery;
+
+    var _query = function(query, queryArg) {
+        var returnVal = {};
+        var _axQueryObject = returnVal.query = { };
+        _axQueryObject.filterFunctions = [];
+
+        if (query == '*') {
+            _axQueryObject.filterFunctions[0] = function() { return true; };
+        } else if (typeof(query) === 'function') {
+            _axQueryObject.filterFunctions[0] = query;
+        } else {
+            var firstString = $.trim(query.toString());
+            if (firstString.charAt(0) == '@') {
+                _axQueryObject.filterFunctions[0] = function(diagramObject) {
+                    return diagramObject.label == firstString.substring(1);
+                };
+            } else if (firstString.charAt(0) == '#') {
+                _axQueryObject.elementId = firstString.substring(1);
+            } else {
+                if (firstString == 'label') {
+                    _axQueryObject.filterFunctions[0] = function(diagramObject) {
+                        return queryArg instanceof Array && queryArg.indexOf(diagramObject.label) > 0 ||
+                            queryArg instanceof RegExp && queryArg.test(diagramObject.label) ||
+                            diagramObject.label == queryArg;
+                    };
+                } else if(firstString == 'elementId') {
+                    _axQueryObject.filterFunctions[0] = function(diagramObject, elementId) {
+                        return queryArg instanceof Array && queryArg.indexOf(elementId) > 0 ||
+                            elementId == queryArg;
+                    };
+                }
+            }
+        }
+
+        var axureFn = $axure.fn;
+        for (var key in axureFn) {
+            returnVal[key] = axureFn[key];
+        }
+        return returnVal;
+    };
+    $axure.query = _query;
+
+    var _getFilterFnFromQuery = function(query) {
+        var filter = function(diagramObject, elementId) {
+            // Non diagram objects are allowed to be queryed, such as text inputs.
+            if (diagramObject && !$ax.public.fn.IsReferenceDiagramObject(diagramObject.type) && !document.getElementById(elementId)) return false;
+            var retVal = true;
+            for(var i = 0; i < query.filterFunctions.length && retVal; i++) {
+                retVal = query.filterFunctions[i](diagramObject, elementId);
+            }
+            return retVal;
+        };
+        return filter;
+    };
+
+    $ax.public.fn.filter = function(query, queryArg) {
+        var returnVal = _query(query, queryArg);
+        
+        if(this.query.elementId) returnVal.query.elementId = this.query.elementId;
+        
+        //If there is already a function, offset by 1 when copying other functions over.
+        var offset = returnVal.query.filterFunctions[0] ? 1 : 0;
+        
+        //Copy all functions over to new array.
+        for(var i = 0; i < this.query.filterFunctions.length; i++) returnVal.query.filterFunctions[i+offset] = this.query.filterFunctions[i];
+        
+        //Functions are in reverse order now
+        returnVal.query.filterFunctions.reverse();
+
+        return returnVal;
+    };
+
+    $ax.public.fn.each = function(fn) {
+        var filter = _getFilterFnFromQuery(this.query);
+        var elementIds = this.query.elementId ? [this.query.elementId] : $ax.getAllElementIds();
+        for (var i = 0; i < elementIds.length; i++) {
+            var elementId = elementIds[i];
+            var diagramObject = $ax.getObjectFromElementId(elementId);
+            if (filter(diagramObject, elementId)) {
+                fn.apply(diagramObject, [diagramObject, elementId]);
+            }
+        }
+    };
+
+    $ax.public.fn.getElements = function() {
+        var elements = [];
+        this.each(function(dObj, elementId) {
+            var elementById = document.getElementById(elementId);
+            if(elementById) elements[elements.length] = elementById;
+        });
+        return elements;
+    };
+    
+    $ax.public.fn.getElementIds = function() {
+        var elementIds = [];
+        this.each(function(dObj, elementId) { elementIds[elementIds.length] = elementId; });
+        return elementIds;
+    };
+
+    // Deep means to keep getting parents parent until at the root parent. Parent is then an array instead of an id.
+    // Filter options: layer, rdo, repeater, item, dynamicPanel, state
+    $ax.public.fn.getParents = function (deep, filter) {
+        if(filter == '*') filter = ['layer', 'rdo', 'repeater', 'item', 'dynamicPanel', 'state'];
+        var elementIds = this.getElementIds();
+        var parentIds = [];
+
+        var getParent = function(elementId) {
+            var containerIndex = elementId.indexOf('_container');
+            if(containerIndex !== -1) elementId = elementId.substring(0, containerIndex);
+            if(elementId.indexOf('_text') !== -1) elementId = $ax.GetShapeIdFromText(elementId);
+
+            // Check repeater item before layer, because repeater item detects it's parent layer, but wants to go directly to it's repeater first.
+            // if repeater item, then just return repeater
+            var scriptId = $ax.repeater.getScriptIdFromElementId(elementId);
+            var itemNum = $ax.repeater.getItemIdFromElementId(elementId);
+            var parentRepeater = $ax.getParentRepeaterFromScriptId(scriptId);
+
+            // scriptId is item or repeater itself
+            if (parentRepeater == scriptId) {
+                // If you are repeater item, return your repeater
+                if (itemNum) return filter.indexOf('repeater') != -1 ? scriptId : getParent(scriptId);
+                // Otherwise you are actually at repeater, clean parentRepeater, or else you loop
+                parentRepeater = undefined;
+            }
+
+            // Layer only references it if it is a direct layer to it
+            var parent = $ax.getLayerParentFromElementId(elementId);
+            // If layer is allowed we found parent, otherwise ignore and keep climbing
+            if (parent) return filter.indexOf('layer') != -1 ? parent : getParent(parent);
+            
+            // if state, then just return panel
+            if(scriptId.indexOf('_state') != -1) {
+                var panelId = $ax.repeater.createElementId(scriptId.split('_')[0], itemNum);
+                // If dynamic panel is allowed we found parent, otherwise ignore and keep climbing
+                return filter.indexOf('dynamicPanel') != -1 ? panelId : getParent(panelId);
+            }
+
+            var parentType = '';
+            if(parentRepeater) {
+                parentType = 'item';
+                parent = $ax.repeater.createElementId(parentRepeater, itemNum);
+            }
+
+            var masterPath = $ax.getPathFromScriptId($ax.repeater.getScriptIdFromElementId(elementId));
+            masterPath.pop();
+            if(masterPath.length > 0) {
+                var masterId = $ax.getElementIdFromPath(masterPath, { itemNum: itemNum }, true);
+                if(!masterId) return undefined;
+                var masterRepeater = $ax.getParentRepeaterFromElementId($ax.repeater.getScriptIdFromElementId(masterId));
+                if(!parentRepeater || masterRepeater) {
+                    parentType = 'rdo';
+                    parent = masterId;
+                }
+            }
+
+            var obj = $obj(elementId);
+            var parentDynamicPanel = obj.parentDynamicPanel;
+            if(parentDynamicPanel) {
+                // Make sure the parent if not parentRepeater, or dynamic panel is also in that repeater
+                // If there is a parent master, the dynamic panel must be in it, otherwise parentDynamicPanel would be undefined.
+                var panelPath = masterPath;
+                panelPath[panelPath.length] = parentDynamicPanel;
+                panelId = $ax.getElementIdFromPath(panelPath, { itemNum: itemNum }, true);
+                if(!panelId) return undefined;
+                var panelRepeater = $ax.getParentRepeaterFromElementId(panelId);
+                if(!parentRepeater || panelRepeater) {
+                    parentType = 'state';
+                    parent = panelId + '_state' + obj.panelIndex;
+                }
+            }
+
+            // If at top or parent type is desired, then return parent, otherwise keep climbing
+            return !parent || filter.indexOf(parentType) != -1 ? parent : getParent(parent);
+        };
+
+        for(var i = 0; i < elementIds.length; i++) {
+            var parent = getParent(elementIds[i]);
+            if(deep) {
+                var parents = [];
+                while(parent) {
+                    parents[parents.length] = parent;
+                    // If id is not a valid object, you are either repeater item or dynamic panel state
+                    //if(!$obj(parent)) parent = $ax.visibility.getWidgetFromContainer($jobj(parent).parent().attr('id'));
+
+                    parent = getParent(parent);
+                }
+                parent = parents;
+            }
+            parentIds[parentIds.length] = parent;
+        }
+        return parentIds;
+    };
+
+    // Get the path to the child, where non leaf nodes can be masters, layers, dynamic panels, and repeaters.
+    $ax.public.fn.getChildren = function(deep, ignoreUnplaced) { // ignoreUnplaced should probably be the default, but when that is done a full audit of usages should be done
+        var elementIds = this.getElementIds();
+        var children = [];
+
+        var getChildren = function (elementId) {
+            var obj = $obj(elementId);
+            //if(!obj) return undefined;
+
+            var isRepeater = obj && obj.type == $ax.constants.REPEATER_TYPE;
+            if (isRepeater && $ax.repeater.getScriptIdFromElementId(elementId) != elementId) {
+                //prevent repeater items from being marked as isRepeater
+                //TODO: evaluate changing the naming convention to be more like panel states which don't seem to have this problem
+                obj = undefined;
+                isRepeater = false;
+            }
+            var isDynamicPanel = obj && obj.type == $ax.constants.DYNAMIC_PANEL_TYPE;
+            //var isLayer = obj.type == $ax.constants.LAYER_TYPE;
+            //var isMaster = obj.type == $ax.constants.MASTER_TYPE || obj.type == $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE;
+            
+            var isMenu = obj && obj.type == $ax.constants.MENU_OBJECT_TYPE;
+            var isTreeNode = obj && obj.type == $ax.constants.TREE_NODE_OBJECT_TYPE;
+            //var isTable = obj.type == $ax.constants.TABLE_TYPE;
+            //var isCompoundVector = obj.type == $ax.constants.VECTOR_SHAPE_TYPE && obj.generateCompound;
+
+            //if (isRepeater || isDynamicPanel || isLayer || isMaster || isMenu || isTreeNode || isTable) {// || isCompoundVector) {
+                // Find parent that children should be pulled from. Default is just the elementId query (used by table and master)
+                var parent = $jobj(elementId);
+                if(isRepeater) {
+                    parent = $();
+                    var itemIds = $ax.getItemIdsForRepeater(elementId);
+                    for(var itemIndex = 0; itemIndex < itemIds.length; itemIndex++) parent = parent.add($jobj($ax.repeater.createElementId(elementId, itemIds[itemIndex])));
+                } else if(isDynamicPanel) {
+                    // Really only need to do active state probably...
+                    parent = $jobj(elementId).children();
+                    // Get through all containers
+                    while ($(parent[0]).attr('id').indexOf('container') != -1) parent = parent.children();
+                    // Now at states, but want states content
+                    parent = parent.children();
+                } else if(isTreeNode) parent = $jobj($ax.repeater.applySuffixToElementId(elementId, '_children'));
+
+                // Menu doesn't want all children, only tables and menus, so it must be handled specially
+                var children = isMenu ? parent.children('.ax_table').add(parent.children('.ax_menu')) : parent.children();
+                children = $ax.visibility.getRealChildren(_fixForBasicLinks(children));
+                
+                // For tree nodes you want the the button shape contained by the elementQuery too
+                if(isTreeNode) {
+                    var treeNodeChildren = $jobj(elementId).children();
+                    for(var treeNodeIndex = 0; treeNodeIndex < treeNodeChildren.length; treeNodeIndex++) {
+                        var treeNodeChild = $(treeNodeChildren[treeNodeIndex]);
+                        var childObj = $obj(treeNodeChild.attr('id'));
+                        if (childObj && $ax.public.fn.IsVector(childObj.type)) children = children.add(treeNodeChild);
+                    }
+                }
+                
+
+                var childrenIds = [];
+                for(var childIndex = 0; childIndex < children.length; childIndex++) {
+                    var childObj = $(children[childIndex]);
+                    var id = childObj.attr('id');
+                    if(typeof(id) == 'undefined' && childObj.is('a')) id = $(childObj.children()[0]).attr('id');
+                    // Ignore annotations and any other children that are not elements
+                    if (id.split('_').length > 1) continue;
+                    // Ignore Unplaced
+                    if(ignoreUnplaced && $ax.visibility.isScriptIdLimbo($ax.repeater.getScriptIdFromElementId(id))) continue;
+                    childrenIds.push(id);
+                }
+                
+                if(deep) {
+                    var childObjs = [];
+                    for(var i = 0; i < childrenIds.length; i++) {
+                        var childId = childrenIds[i];
+                        childObjs[i] = { id: childId, children: getChildren(childId) };
+                    }
+                    childrenIds = childObjs;
+                }
+                
+                return childrenIds;
+            //}
+
+            //return undefined;
+        };
+
+        for(var i = 0; i < elementIds.length; i++) {
+            var elementId = elementIds[i];
+            //if the state is passed in, look for children in the content element
+            if (elementId.indexOf('_state') > -1 && elementId.indexOf('_content') < 0) elementId = elementId + '_content';
+            children[children.length] = { id: elementId, children: getChildren(elementId)};
+        }
+        return children;
+    };
+
+    var _fixForBasicLinks = function(query) {
+        var hasBasicLinks = query.filter('.basiclink').length > 0;
+        if(!hasBasicLinks) return query;
+
+        var retval = $();
+        for(var i = 0; i < query.length; i++) {
+            var child = $(query[i]);
+            if(child.hasClass('basiclink')) retval = retval.add(child.children());
+            else retval = retval.add(child);
+        }
+        return retval;
+    };
+
+})();
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/axQuery.std.js b/src_old/resources/scripts/axure/axQuery.std.js
new file mode 100644
index 0000000..7aac1ee
--- /dev/null
+++ b/src_old/resources/scripts/axure/axQuery.std.js
@@ -0,0 +1,1834 @@
+// ******* AxQuery Plugins ******** //
+
+$axure.internal(function($ax) {
+    $ax.constants = {};
+
+    $ax.constants.TABLE_TYPE = 'table';
+    $ax.constants.MENU_OBJECT_TYPE = 'menuObject';
+    $ax.constants.MASTER_TYPE = 'master';
+    $ax.constants.PAGE_TYPE = 'page';
+    $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE = 'referenceDiagramObject';
+    $ax.constants.REPEATER_TYPE = 'repeater';
+    $ax.constants.DYNAMIC_PANEL_TYPE = 'dynamicPanel';
+    $ax.constants.LAYER_TYPE = 'layer';
+    $ax.constants.TEXT_BOX_TYPE = 'textBox';
+    $ax.constants.TEXT_AREA_TYPE = 'textArea';
+    $ax.constants.LIST_BOX_TYPE = 'listBox';
+    $ax.constants.COMBO_BOX_TYPE = 'comboBox';
+    $ax.constants.CHECK_BOX_TYPE = 'checkbox';
+    $ax.constants.RADIO_BUTTON_TYPE = 'radioButton';
+    $ax.constants.BUTTON_TYPE = 'button'; //html button
+    $ax.constants.IMAGE_MAP_REGION_TYPE = 'imageMapRegion';
+    $ax.constants.IMAGE_BOX_TYPE = 'imageBox';
+    $ax.constants.VECTOR_SHAPE_TYPE = 'vectorShape';
+    $ax.constants.SNAPSHOT_TYPE = 'screenshot';
+    $ax.constants.TREE_NODE_OBJECT_TYPE = 'treeNodeObject';
+    $ax.constants.TABLE_CELL_TYPE = 'tableCell';
+    $ax.constants.VERTICAL_LINE_TYPE = 'verticalLine';
+    $ax.constants.HORIZONTAL_LINE_TYPE = 'horizontalLine';
+    $ax.constants.INLINE_FRAME_TYPE = 'inlineFrame';
+    $ax.constants.CONNECTOR_TYPE = 'connector';
+    $ax.constants.ALL_TYPE = '*';
+
+    $ax.constants.TEXT_TYPE = 'richTextPanel';
+    $ax.constants.LINK_TYPE = 'hyperlink';
+
+    // TODO: Need solid passo f this. Constants should be able to bemade local, may need some public lists or something.
+    //       public.fn function should take not arg and use this. May need some $ax.IsType fuctions that will take a type arg and be static
+    $ax.public.fn.IsTable = function (type) { return type == $ax.constants.TABLE_TYPE; }
+    $ax.public.fn.IsMenuObject = function (type) { return type == $ax.constants.MENU_OBJECT_TYPE; }
+    $ax.public.fn.IsMaster = function (type) { return type == $ax.constants.MASTER_TYPE; }
+    $ax.public.fn.IsPage = function (type) { return type == $ax.constants.PAGE_TYPE; }
+    $ax.public.fn.IsReferenceDiagramObject = function (type) { return type == $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE; }
+    $ax.public.fn.IsRepeater = function (type) { return type == $ax.constants.REPEATER_TYPE; }
+    $ax.public.fn.IsDynamicPanel = $ax.IsDynamicPanel = function (type) { return type == $ax.constants.DYNAMIC_PANEL_TYPE; }
+    $ax.public.fn.IsLayer = $ax.IsLayer = function (type) { return type == $ax.constants.LAYER_TYPE; }
+    $ax.public.fn.IsTextBox = function (type) { return type == $ax.constants.TEXT_BOX_TYPE; }
+    $ax.public.fn.IsTextArea = function (type) { return type == $ax.constants.TEXT_AREA_TYPE; }
+    $ax.public.fn.IsListBox = function (type) { return type == $ax.constants.LIST_BOX_TYPE; }
+    $ax.public.fn.IsComboBox = function (type) { return type == $ax.constants.COMBO_BOX_TYPE; }
+    $ax.public.fn.IsCheckBox = function (type) { return type == $ax.constants.CHECK_BOX_TYPE; }
+    $ax.public.fn.IsRadioButton = function (type) { return type == $ax.constants.RADIO_BUTTON_TYPE; }
+    $ax.public.fn.IsButton = function (type) { return type == $ax.constants.BUTTON_TYPE; }
+    $ax.public.fn.IsIamgeMapRegion = function (type) { return type == $ax.constants.IMAGE_MAP_REGION_TYPE; }
+    $ax.public.fn.IsImageBox = function (type) { return type == $ax.constants.IMAGE_BOX_TYPE; }
+    $ax.public.fn.IsVector = function (type) { return type == $ax.constants.VECTOR_SHAPE_TYPE; }
+    $ax.public.fn.IsSnapshot = function (type) { return type == $ax.constants.SNAPSHOT_TYPE; }
+    $ax.public.fn.IsTreeNodeObject = function (type) { return type == $ax.constants.TREE_NODE_OBJECT_TYPE; }
+    $ax.public.fn.IsTableCell = function (type) { return type == $ax.constants.TABLE_CELL_TYPE; }
+    $ax.public.fn.IsInlineFrame = function (type) { return type == $ax.constants.INLINE_FRAME_TYPE; }
+    $ax.public.fn.IsConnector = function (type) { return type == $ax.constants.CONNECTOR_TYPE; }
+    $ax.public.fn.IsContainer = function (type) { return type== $ax.constants.VECTOR_SHAPE_TYPE || type == $ax.constants.TABLE_TYPE || type == $ax.constants.MENU_OBJECT_TYPE || type == $ax.constants.TREE_NODE_OBJECT_TYPE; }
+
+    var PLAIN_TEXT_TYPES = [$ax.constants.TEXT_BOX_TYPE, $ax.constants.TEXT_AREA_TYPE, $ax.constants.LIST_BOX_TYPE,
+        $ax.constants.COMBO_BOX_TYPE, $ax.constants.CHECK_BOX_TYPE, $ax.constants.RADIO_BUTTON_TYPE, $ax.constants.BUTTON_TYPE];
+
+    $ax.public.fn.IsResizable = function (type) { return $.inArray(type, RESIZABLE_TYPES) !== -1; }
+    var RESIZABLE_TYPES = [
+        $ax.constants.BUTTON_TYPE, $ax.constants.DYNAMIC_PANEL_TYPE, $ax.constants.IMAGE_BOX_TYPE, $ax.constants.IMAGE_MAP_REGION_TYPE,
+        $ax.constants.INLINE_FRAME_TYPE, $ax.constants.LAYER_TYPE, $ax.constants.LIST_BOX_TYPE, $ax.constants.COMBO_BOX_TYPE,
+        $ax.constants.VECTOR_SHAPE_TYPE, $ax.constants.TEXT_AREA_TYPE, $ax.constants.TEXT_BOX_TYPE, $ax.constants.SNAPSHOT_TYPE
+    ];
+
+    $ax.public.fn.IsSelectionButton = function(type) {
+        return type == $ax.constants.RADIO_BUTTON_TYPE || type == $ax.constants.CHECK_BOX_TYPE;
+    };
+    
+    $ax.public.fn.SupportsRichText = function() {
+        var obj = $obj(this.getElementIds()[0]);
+        // Catch root tree nodes as they are not supported.
+        if(obj.type == $ax.constants.TREE_NODE_OBJECT_TYPE) return obj.friendlyType == 'Tree Node';
+        // Do the same for tree node icons maybe?
+
+        return $.inArray(obj.type, SUPPORTS_RICH_TEXT_TYPES) != -1;
+    }
+    var SUPPORTS_RICH_TEXT_TYPES = [$ax.constants.CHECK_BOX_TYPE, $ax.constants.RADIO_BUTTON_TYPE,
+        $ax.constants.IMAGE_BOX_TYPE, $ax.constants.VECTOR_SHAPE_TYPE, $ax.constants.TABLE_CELL_TYPE, $ax.constants.CONNECTOR_TYPE];
+
+    var _addJQueryFunction = function(name) {
+        $ax.public.fn[name] = function() {
+            var val = $.fn[name].apply(this.jQuery(), arguments);
+            return arguments[0] ? this : val;
+        };
+    };
+    var _jQueryFunctionsToAdd = ['text', 'val', 'css'];
+    for (var jqueryFunctionIndex = 0; jqueryFunctionIndex < _jQueryFunctionsToAdd.length; jqueryFunctionIndex++) _addJQueryFunction(_jQueryFunctionsToAdd[jqueryFunctionIndex]);
+
+
+    //    var _addJQueryEventFunction = function(name) {
+    //        $ax.public.fn[name] = function() {
+    //            $.fn[name].apply(this.jQuery(), arguments);
+    //            return this;
+    //        };
+    //    };
+
+    //    var _addJQueryEventFunction = function(name) {
+    //        $ax.public.fn[name] = (function(nn) {
+    //            return function() {
+    //                $.fn[nn].apply(this.jQuery(), arguments);
+    //                return this;
+    //            };
+    //        })(name);
+    //    };
+
+    var _addJQueryEventFunction = function(name) {
+        $ax.public.fn[name] = function() {
+            //With Martin - No idea why this is necessary. We tried encapsulating the function thinking it was related to closure (above),
+            //but that didn't fix the problem. If we don't add this Repeaters will give "Uncaught TypeError: Object #<Object> has no method 'apply'"
+            //here (but Indeterminately, often on larger/slower Repeaters) because it is Undefined. However it seems the catch is never hit
+            //if we surround the statement with the try/catch. Perhaps the try/catch block creates a scope or closure.
+            try {
+                $.fn[name].apply(this.jQuery(), arguments);
+            } catch(e) {
+                console.log("Couldn't find the event: " + name);
+            }
+
+            return this;
+        };
+    };
+    var _jQueryEventFunctionsToAdd = ['click', 'mouseenter', 'mouseleave', 'bind'];
+    for(var jqueryEventIndex = 0; jqueryEventIndex < _jQueryEventFunctionsToAdd.length; jqueryEventIndex++) _addJQueryEventFunction(_jQueryEventFunctionsToAdd[jqueryEventIndex]);
+
+
+    $ax.public.fn.openLink = function(url, includeVariables) {
+        this.jQuery().each(function() {
+            if(!($(this).is('iframe'))) {
+                return;
+            }
+
+            var objIframe = $(this).get(0);
+
+            $ax.navigate({
+                url: url,
+                target: "frame",
+                includeVariables: includeVariables,
+                frame: objIframe
+            });
+        });
+
+        return this;
+    };
+
+    $ax.public.fn.SetPanelState = function(stateNumber, options, showWhenSet) {
+
+        var animateInInfo = _getAnimateInfo(options && options.animateIn, 500);
+        var animateOutInfo = _getAnimateInfo(options && options.animateOut, 500);
+
+        var elementIds = this.getElementIds();
+
+        for(var index = 0; index < elementIds.length; index++) {
+            var elementId = elementIds[index];
+            if ($ax.public.fn.IsDynamicPanel($ax.getTypeFromElementId(elementId))) {
+                var stateName = $ax.visibility.GetPanelStateId(elementId, Number(stateNumber) - 1);
+                var wasVisible = $ax.visibility.IsIdVisible(elementId);
+                // If compressing because you are fit to content and the change of state may change size, must be before the change.
+                if(options.compress && $ax.dynamicPanelManager.isIdFitToContent(elementId) && wasVisible) {
+                    $ax.dynamicPanelManager.compressDelta(elementId, $ax.visibility.GetPanelState(elementId), stateName, options.vertical, options.compressEasing, options.compressDuration);
+                }
+                $ax.visibility.SetPanelState(elementId, stateName, animateOutInfo.easingType, animateOutInfo.direction, animateOutInfo.duration,
+                    animateInInfo.easingType, animateInInfo.direction, animateInInfo.duration, showWhenSet);
+                // If compressing because of a show, must be after state is set.
+                if(options.compress && !wasVisible && showWhenSet) {
+                    $ax.dynamicPanelManager.compressToggle(elementId, options.vertical, true, options.compressEasing, options.compressDuration);
+                }
+            }
+        }
+
+        return this;
+    };
+
+    $ax.public.fn.show = function(options, eventInfo) {
+        var elementIds = this.getElementIds();
+
+        for(var index = 0; index < elementIds.length; index++) {
+            var elementId = elementIds[index];
+
+            var lightboxId = $ax.repeater.applySuffixToElementId(elementId, '_lightbox');
+            var lightbox = $jobj(lightboxId);
+            if(options && options.showType == 'lightbox') {
+                $ax.flyoutManager.unregisterPanel(elementId, true);
+                // Add lightbox if there isn't one
+                if(lightbox.length == 0) {
+                    lightbox = $('<div></div>');
+                    lightbox.attr('id', lightboxId);
+                    var color = 'rgb(' + options.lightbox.r + ',' + options.lightbox.g + ',' + options.lightbox.b + ')';
+                    lightbox.css({
+                        position: 'fixed',
+                        left: '0px',
+                        top: '0px',
+                        width: '10000px',
+                        height: '10000px',
+                        'background-color': color,
+                        opacity: options.lightbox.a / 255
+                    });
+
+                    var parents = $ax('#' + elementId).getParents(true, ['dynamicPanel'])[0];
+                    var fixedParentPanelId = undefined;
+                    for(var j = 0; j < parents.length; j++) {
+                        var parentId = parents[j];
+                        if($jobj(parentId).css('z-index') != 'auto' || $ax.features.supports.mobile) {
+                            fixedParentPanelId = parents[j];
+                            break;
+                        }
+                    }
+
+                    if(!fixedParentPanelId) $('#base').append(lightbox);
+                    else $jobj(fixedParentPanelId).append(lightbox);
+
+                    var wasVisible = $ax.visibility.IsIdVisible(elementId);
+
+                    (function(lightbox, query) {
+                        $ax.event.attachClick(lightbox, function() {
+                            $ax.action.addAnimation(elementId, $ax.action.queueTypes.fade, function() {
+                                if(!wasVisible) query.hide();
+                                else $ax.action.fireAnimationFromQueue(elementId, $ax.action.queueTypes.fade);
+                                lightbox.remove();
+                            });
+                        });
+                    })(lightbox, this);
+                }
+                $ax.legacy.BringToFront(lightboxId, true);
+                $ax.legacy.BringToFront(elementId, true);
+            } else if(options && options.showType == 'flyout') {
+                // Remove lightbox if there is one
+                lightbox.remove();
+
+                var src = eventInfo.thiswidget;
+                var target = $ax.getWidgetInfo(elementId);
+                var rects = {};
+                if(src.valid) rects.src = $ax.geometry.genRect(src, true);
+                if(target.valid) rects.target = $ax.geometry.genRect(target, true);
+                $ax.flyoutManager.registerFlyout(rects, elementId, eventInfo.srcElement);
+                //$ax.style.AddRolloverOverride(elementId);
+                $ax.legacy.BringToFront(elementId);
+            } else {
+                // Remove lightbox, unregister flyout
+                lightbox.remove();
+                $ax.flyoutManager.unregisterPanel(elementId, true);
+            }
+            _setVisibility(elementId, true, options);
+        }
+
+        return this;
+    };
+
+    var _getAnimateInfo = function (options, defaultDuration, useHide) {
+        var durationOption, easingOption, animationOption;
+
+        if(options) {
+            if (useHide) {
+                durationOption = options.durationHide;
+                easingOption = options.easingHide;
+                animationOption = options.animationHide;
+            } else {
+                durationOption = options.duration;
+                easingOption = options.easing;
+                animationOption = options.animation;
+            }
+            if (animationOption == 'none') animationOption = 'swing';
+        } else {
+            durationOption = defaultDuration;
+            easingOption = 'none',
+            animationOption = 'swing';
+        }
+        var animateInfo = { duration: durationOption };
+        switch (easingOption) {
+        case 'fade':
+            animateInfo.easingType = 'fade';
+            animateInfo.direction = '';
+            break;
+        case 'slideLeft':
+            animateInfo.easingType = animationOption;
+            animateInfo.direction = 'left';
+            break;
+        case 'slideRight':
+            animateInfo.easingType = animationOption;
+            animateInfo.direction = 'right';
+            break;
+        case 'slideUp':
+            animateInfo.easingType = animationOption;
+            animateInfo.direction = 'up';
+            break;
+        case 'slideDown':
+            animateInfo.easingType = animationOption;
+            animateInfo.direction = 'down';
+            break;
+        case 'flipLeft':
+            animateInfo.easingType = 'flip';
+            animateInfo.direction = 'left';
+            break;
+        case 'flipRight':
+            animateInfo.easingType = 'flip';
+            animateInfo.direction = 'right';
+            break;
+        case 'flipUp':
+            animateInfo.easingType = 'flip';
+            animateInfo.direction = 'up';
+            break;
+        case 'flipDown':
+            animateInfo.easingType = 'flip';
+            animateInfo.direction = 'down';
+            break;
+        default:
+            animateInfo.easingType = 'none';
+            animateInfo.direction = '';
+        }
+
+        return animateInfo;
+    };
+
+    $ax.public.fn.hide = function(options) {
+        var elementIds = this.getElementIds();
+
+        for(var index = 0; index < elementIds.length; index++) {
+            var elementId = elementIds[index];
+//            var wasShown = $ax.visibility.IsIdVisible(elementId);
+            _setVisibility(elementId, false, options, true);
+        }
+
+        return this;
+    };
+
+    $ax.public.fn.toggleVisibility = function(options) {
+        var elementIds = this.getElementIds();
+
+        for (var index = 0; index < elementIds.length; index++) {
+            var elementId = elementIds[index];
+            var show = !$ax.visibility.IsIdVisible(elementId);
+            _setVisibility(elementId, show, options, !show);
+        }
+
+        return this;
+    };
+
+    var _setVisibility = function (elementId, value, options, useHide) {
+        var animateInfo = _getAnimateInfo(options, 0, useHide);
+
+        var wasShown = $ax.visibility.IsIdVisible(elementId);
+        var compress = options && options.showType == 'compress' && wasShown != value;
+        if (compress) $ax.dynamicPanelManager.compressToggle(elementId, options.vertical, value, options.compressEasing, options.compressDuration);
+
+        var onComplete = function () {
+            $ax.dynamicPanelManager.fitParentPanel(elementId);
+        };
+        $ax.visibility.SetWidgetVisibility(elementId, {
+            value: value,
+            easing: animateInfo.easingType,
+            direction: animateInfo.direction,
+            duration: animateInfo.duration,
+            animation: animateInfo.animation,
+            fire: true,
+            onComplete: onComplete
+        });
+        
+        if(options && options.bringToFront) $ax.legacy.BringToFront(elementId);
+    };
+
+    $ax.public.fn.setOpacity = function(opacity, easing, duration) {
+        if(!easing || ! duration) {
+            easing = 'none';
+            duration = 0;
+        }
+
+        var elementIds = this.getElementIds();
+
+        for(var index = 0; index < elementIds.length; index++) {
+            var elementId = elementIds[index];
+            var onComplete = function() {
+                $ax.action.fireAnimationFromQueue(elementId, $ax.action.queueTypes.fade);
+            };
+
+            var query = $jobj(elementId);
+            if(duration == 0 || easing == 'none') {
+                query.css('opacity', opacity);
+                onComplete();
+            } else query.animate({ opacity: opacity }, { duration: duration, easing: easing, queue: false, complete: onComplete });
+        }
+    }
+    //move one widget.  I didn't combine moveto and moveby, since this is in .public, and separate them maybe more clear for the user
+    var _move = function (elementId, x, y, options, moveTo) {
+        if(!options.easing) options.easing = 'none';
+        if(!options.duration) options.duration = 500;
+        var obj = $obj(elementId);
+
+        // Layer move using container now.
+        if($ax.public.fn.IsLayer(obj.type)) {
+            $ax.move.MoveWidget(elementId, x, y, options, moveTo,
+                function () {
+                    if(options.onComplete) options.onComplete();
+                    $ax.dynamicPanelManager.fitParentPanel(elementId);
+                }, false);
+        } else {
+            var xDelta = x;
+            var yDelta = y;
+            if (moveTo) {
+                var jobj = $jobj(elementId);
+                var left = $ax.getNumFromPx(jobj.css('left'));
+                var top = $ax.getNumFromPx(jobj.css('top'));
+                xDelta = x - left;
+                yDelta = y - top;
+            }
+            $ax.move.MoveWidget(elementId, xDelta, yDelta, options, false,
+                function () { $ax.dynamicPanelManager.fitParentPanel(elementId); }, true);
+        }
+    };
+
+    $ax.public.fn.moveTo = function (x, y, options) {
+        var elementIds = this.getElementIds();
+        for(var index = 0; index < elementIds.length; index++) {
+            _move(elementIds[index], x, y, options, true);
+        }
+
+        return this;
+    };
+
+    $ax.public.fn.moveBy = function (x, y, options) {
+        var elementIds = this.getElementIds();
+
+        if(x == 0 && y == 0) {
+            for(var i = 0; i < elementIds.length; i++) {
+                var elementId = elementIds[i];
+                $ax.move.nopMove(elementId, options);
+
+                //$ax.event.raiseSyntheticEvent(elementId, "onMove");
+                $ax.action.fireAnimationFromQueue(elementId, $ax.action.queueTypes.move);
+
+                //if($axure.fn.IsLayer($obj(elementId).type)) {
+                //    var childrenIds = $ax.public.fn.getLayerChildrenDeep(elementId, true);
+                //    for(var j = 0; j < childrenIds.length; j++) $ax.event.raiseSyntheticEvent(childrenIds[j], 'onMove');
+                //}
+            }
+            return this;
+        }
+
+        for(var index = 0; index < elementIds.length; index++) {
+            _move(elementIds[index], x, y, options, false);
+        }
+        return this;
+    };
+
+    $ax.public.fn.circularMoveAndRotate = function(degreeChange, options, centerPointLeft, centerPointTop, doRotation, moveDelta, resizeOffset, rotatableMove, moveComplete) {
+        if(!rotatableMove) rotatableMove = { x: 0, y: 0 };
+        var elementIds = this.getElementIds();
+
+        for(var index = 0; index < elementIds.length; index++) {
+            var elementId = elementIds[index];
+
+            var onComplete = function () {
+                $ax.dynamicPanelManager.fitParentPanel(elementId);
+                if (moveComplete) moveComplete();
+            }
+
+            $ax.move.circularMove(elementId, degreeChange, { x: centerPointLeft, y: centerPointTop }, moveDelta, rotatableMove, resizeOffset, options, true, onComplete, doRotation);
+            if(doRotation) $ax.move.rotate(elementId, degreeChange, options.easing, options.duration, false, true, function () { $ax.dynamicPanelManager.fitParentPanel(elementId); });
+            else $ax.action.fireAnimationFromQueue(elementId, $ax.action.queueTypes.rotate);
+        }
+    };
+
+    $ax.public.fn.rotate = function (degree, easing, duration, to, axShouldFire) {
+        var elementIds = this.getElementIds();
+        // this function will no longer handle compound vectors.
+
+        for(var index = 0; index < elementIds.length; index++) {
+            var elementId = elementIds[index];
+            degree = parseFloat(degree);
+            $ax.move.rotate(elementId, degree, easing, duration, to, axShouldFire, function () { $ax.dynamicPanelManager.fitParentPanel(elementId); });
+        }
+    };
+
+    $ax.public.fn.resize = function(newLocationAndSizeCss, resizeInfo, axShouldFire, moves, onCompletedFunc) {
+        var elementIds = this.getElementIds();
+        if(!elementIds) return;
+
+        var completeAndFire = function(moved, id) {
+            if(axShouldFire) {
+                $ax.action.fireAnimationFromQueue(id, $ax.action.queueTypes.resize);
+                if(moves) $ax.action.fireAnimationFromQueue(id, $ax.action.queueTypes.move);
+            }
+
+            if(onCompletedFunc) onCompletedFunc();
+        };
+
+        for(var index = 0; index < elementIds.length; index++) {
+            var elementId = elementIds[index];
+
+            var obj = $obj(elementId);
+            if(!$ax.public.fn.IsResizable(obj.type)) {
+                //$ax.dynamicPanelManager.fitParentPanel(elementId);
+                completeAndFire(moves, elementId);
+                continue;
+            }
+
+            var oldSize = $ax('#' + elementId).size();
+            var oldWidth = oldSize.width;
+            var oldHeight = oldSize.height;
+            var query = $jobj(elementId);
+
+            var isDynamicPanel = $ax.public.fn.IsDynamicPanel(obj.type);
+            if(isDynamicPanel) {
+                // No longer fitToContent, calculate additional styling that needs to be done.
+                $ax.dynamicPanelManager.setFitToContentCss(elementId, false, oldWidth, oldHeight);
+
+                if (query.css('position') == 'fixed' && ((obj.fixedHorizontal && obj.fixedHorizontal == 'center') || (obj.fixedVertical && obj.fixedVertical == 'middle'))) {
+                    moves = true;
+                    var loc = $ax.dynamicPanelManager.getFixedPosition(elementId, oldWidth, oldHeight, newLocationAndSizeCss.width, newLocationAndSizeCss.height);
+                    if(loc) {
+                        if (loc[0] != 0 && !$ax.dynamicPanelManager.isPercentWidthPanel(obj)) newLocationAndSizeCss['margin-left'] = '+=' + (Number(newLocationAndSizeCss['margin-left'].substr(2)) + loc[0]);
+                        if (loc[1] != 0) newLocationAndSizeCss['margin-top'] = '+=' + (Number(newLocationAndSizeCss['margin-top'].substr(2)) + loc[1]);
+                    }
+                }
+
+                var onComplete = function() {
+                    $ax.flyoutManager.updateFlyout(elementId);
+                    $ax.dynamicPanelManager.fitParentPanel(elementId);
+                    $ax.dynamicPanelManager.updatePanelPercentWidth(elementId);
+                    $ax.dynamicPanelManager.updatePanelContentPercentWidth(elementId);
+
+                    completeAndFire(moves, elementId);
+                    $ax.event.raiseSyntheticEvent(elementId, 'onResize');
+                };
+
+            } else {
+                ////if contains text
+                //var textChildren = query.children('div.text');
+                //if(textChildren && textChildren.length != 0) {
+                //    var textDivId = textChildren.attr('id');
+                //    var padding = $ax.style.getPadding(textDivId);
+                //    var leftPadding = padding.paddingLeft;
+                //    var rightPadding = padding.paddingRight;
+                //    //var textObj = $ax('#' + textDivId);
+                //    //var leftPadding = textObj.left(true);
+                //    //var rightPadding = oldWidth - leftPadding - textObj.width();
+
+                //    //greater or equal to 1px
+                //    var newTextWidth = Math.max(newLocationAndSizeCss.width - leftPadding - rightPadding, 1);
+                //    var textChildCss = { width: newTextWidth };
+
+                //    var textStepFunction = function() {
+                //        //change the width of the text div may effect the height
+                //        //var currentTextHeight = Number($(textChildren.children('p')[0]).css('height').replace('px', ''));
+                //        //textChildren.css('height', currentTextHeight);
+                //        //var display = $ax.public.fn.displayHackStart(document.getElementById(textDivId));
+
+                //        var trap = _displayWidget(textDivId);
+                //        $ax.style.setTextAlignment([textDivId]);
+                //        trap();
+
+                //        //$ax.public.fn.displayHackEnd(display);
+                //    };
+                //}
+
+                //get all the other children that matters
+                onComplete = function() {
+                    $ax.dynamicPanelManager.fitParentPanel(elementId);
+                    completeAndFire(moves, elementId);
+
+                    $ax.annotation.adjustIconLocation(elementId);
+                    $ax.event.raiseSyntheticEvent(elementId, 'onResize');
+                };
+            }
+
+            var children = query.children().not('div.text');
+            while(children && children.length && $(children[0]).attr('id').indexOf('container') != -1) {
+                children = children.children().not('div.text');
+            }
+
+            if(children && children.length !== 0) {
+                var childAnimationArray = [];
+                var isConnector = $ax.public.fn.IsConnector(obj.type);
+                children.each(function (i, child) {
+                    var childCss = {
+                        width: newLocationAndSizeCss.width,
+                        height: newLocationAndSizeCss.height
+                    };
+
+                    //$ax.size() use outerWidth/Height(false), which include padding and borders(no margins)
+                    var childSizingObj = $ax('#' + child.id).size();
+                    var differentSizedImage = childSizingObj.width - oldWidth != 0 || childSizingObj.height - oldHeight != 0;
+                    if ((differentSizedImage || isConnector) && child.tagName == 'IMG') {
+                        //oldwidth is zero for connectors
+                        var widthOffset = oldWidth ? (childSizingObj.width - oldWidth) * newLocationAndSizeCss.width / oldWidth : childSizingObj.width;
+                        var heightOffset = oldHeight ? (childSizingObj.height - oldHeight) * newLocationAndSizeCss.height / oldHeight : childSizingObj.height;
+
+                        childCss.width += widthOffset;
+                        childCss.height += heightOffset;
+                    }
+                    //there are elements like inputs, come with a padding and border, so need to use outerwidth for starting point, due to jquery 1.7 css() on width/height bugs
+                    if($(child).css('position') === 'absolute') {
+                        if(child.offsetLeft) {
+                            childSizingObj.left = child.offsetLeft;
+                            childCss.left = oldWidth ? child.offsetLeft * newLocationAndSizeCss.width / oldWidth : child.offsetLeft; //- transformedShift.x;
+                        }
+                        if(child.offsetTop) {
+                            childSizingObj.top = child.offsetTop;
+                            childCss.top = oldHeight ? child.offsetTop * newLocationAndSizeCss.height / oldHeight : child.offsetTop; //- transformedShift.y;
+                        }
+                    }
+                    childAnimationArray.push({ obj: child, sizingObj: childSizingObj, sizingCss: childCss });
+                });
+            }
+            
+            if (newLocationAndSizeCss.left || newLocationAndSizeCss.top) {
+                //var movedLeft = newLocationAndSizeCss.left;
+                //var movedTop = newLocationAndSizeCss.top;
+                //$ax.visibility.setMovedLocation(elementId, movedLeft, movedTop);
+                var movedLeft = newLocationAndSizeCss.deltaX;
+                var movedTop = newLocationAndSizeCss.deltaY;
+                $ax.visibility.moveMovedLocation(elementId, movedLeft, movedTop);
+            }
+            if (newLocationAndSizeCss.width || newLocationAndSizeCss.height) {
+                var resizedWidth = newLocationAndSizeCss.width;
+                var resizedHeight = newLocationAndSizeCss.height;
+                $ax.visibility.setResizedSize(elementId, resizedWidth, resizedHeight);
+            }
+
+            if (!resizeInfo.easing || resizeInfo.easing == 'none') {
+                if (childAnimationArray) {
+                    $(childAnimationArray).each(function (i, animationObj) {
+                        if(animationObj.resizeMatrixFunction) {
+                            $(animationObj.obj).css($ax.public.fn.setTransformHowever(animationObj.resizeMatrixFunction(animationObj.width, animationObj.height)));
+                        } else {
+                            //var sizingCss = animationObj.sizingCss;
+                            //if (sizingCss.left || sizingCss.top) {
+                            //    var movedLeft = sizingCss.left;
+                            //    var movedTop = sizingCss.top;
+                            //    $ax.visibility.setMovedLocation(animationObj.obj.id, movedLeft, movedTop);
+                            //}
+                            //if (sizingCss.width || sizingCss.height) {
+                            //    var resizedWidth = sizingCss.width;
+                            //    var resizedHeight = sizingCss.height;
+                            //    $ax.visibility.setResizedSize(animationObj.obj.id, resizedWidth, resizedHeight);
+                            //}
+
+                            $(animationObj.obj).animate(animationObj.sizingCss, { queue: false, duration: 0 });
+                        }
+                    });
+                }
+                //if(childCss) children.animate(childCss, 0);
+                //if(sketchyImage && sketchyImageCss) $(sketchyImage).animate(sketchyImageCss, 0);
+                //if(textChildCss) {
+                //    textChildren.animate(textChildCss, {
+                //        duration: 0,
+                //        step: textStepFunction
+                //    });
+                //}
+                query.animate(newLocationAndSizeCss, { queue: false, duration: 0, complete: onComplete });
+            } else {
+                if(childAnimationArray) {
+                    $(childAnimationArray).each(function (i, animationObj) {
+                        if(animationObj.resizeMatrixFunction) {
+                            $(animationObj.sizingObj).animate(animationObj.sizingCss, {
+                                queue: false,
+                                duration: resizeInfo.duration,
+                                easing: resizeInfo.easing,
+                                step: function (now) {
+                                    var widthRatio = (animationObj.width - 1.0) * now + 1.0;
+                                    var heightRatio = (animationObj.height - 1.0) * now + 1.0;
+                                    $(animationObj.obj).css($ax.public.fn.setTransformHowever(animationObj.resizeMatrixFunction(widthRatio, heightRatio)));
+                                }
+                            });
+                        } else {
+                            $(animationObj.sizingObj).animate(animationObj.sizingCss, {
+                                queue: false,
+                                duration: resizeInfo.duration,
+                                easing: resizeInfo.easing,
+                                step: function (now, tween) {
+                                    $(animationObj.obj).css(tween.prop, now);
+                                }
+                            });
+                        }
+                    });
+                }
+
+                //if(textChildCss) {
+                //    textChildren.animate(textChildCss, {
+                //        queue: false,
+                //        duration: resizeInfo.duration,
+                //        easing: resizeInfo.easing,
+                //        step: textStepFunction
+                //    });
+                //}
+
+                if(isDynamicPanel) {
+                    query.animate(newLocationAndSizeCss, { queue: false, duration: resizeInfo.duration, easing: resizeInfo.easing, complete: onComplete });
+                } else {
+                    var locObj = {
+                        left: $ax.public.fn.GetFieldFromStyle(query, 'left'), top: $ax.public.fn.GetFieldFromStyle(query, 'top'),
+                        width: $ax.public.fn.GetFieldFromStyle(query, 'width'), height: $ax.public.fn.GetFieldFromStyle(query, 'height'),
+                    };
+                    $(locObj).animate(newLocationAndSizeCss, {
+                        queue: false,
+                        duration: resizeInfo.duration,
+                        easing: resizeInfo.easing,
+                        step: function (now, tween) {
+                            query.css(tween.prop, now);
+                        },
+                        complete: onComplete
+                    });
+                }
+            }
+        }
+    };
+
+    $ax.public.fn.bringToFront = function() {
+        var elementIds = this.getElementIds();
+        for(var index = 0; index < elementIds.length; index++) { $ax.legacy.BringToFront(elementIds[index]); }
+        return this;
+    };
+
+    $ax.public.fn.sendToBack = function() {
+        var elementIds = this.getElementIds();
+        for(var index = 0; index < elementIds.length; index++) { $ax.legacy.SendToBack(elementIds[index]); }
+        return this;
+    };
+
+    $ax.public.fn.text = function() {
+        if(arguments[0] == undefined) {
+            var firstId = this.getElementIds()[0];
+
+            if(!firstId) { return undefined; }
+
+            return getWidgetText(firstId);
+        } else {
+            var elementIds = this.getElementIds();
+
+            for(var index = 0; index < elementIds.length; index++) {
+                var currentItem = elementIds[index];
+
+                var widgetType = $ax.getTypeFromElementId(currentItem);
+
+                if($ax.public.fn.IsTextBox(widgetType) || $ax.public.fn.IsTextArea(widgetType)) { //For non rtf
+                    SetWidgetFormText(currentItem, arguments[0]);
+                } else {
+                    var idRtf = '#' + currentItem;
+                    if($(idRtf).length == 0) idRtf = '#u' + (Number(currentItem.substring(1)) + 1);
+
+                    if($(idRtf).length != 0) {
+                        //If the richtext div already has some text in it,
+                        //preserve only the first style and get rid of the rest
+                        //If no pre-existing p-span tags, don't do anything
+                        if($(idRtf).find('p').find('span').length > 0) {
+                            $(idRtf).find('p:not(:first)').remove();
+                            $(idRtf).find('p').find('span:not(:first)').remove();
+
+                            //Replace new-lines with NEWLINE token, then html encode the string,
+                            //finally replace NEWLINE token with linebreak
+                            var textWithLineBreaks = arguments[0].replace(/\n/g, '--NEWLINE--');
+                            var textHtml = $('<div/>').text(textWithLineBreaks).html();
+                            $(idRtf).find('span').html(textHtml.replace(/--NEWLINE--/g, '<br>'));
+                        }
+                    }
+                }
+            }
+
+            return this;
+        }
+    };
+
+    var getWidgetText = function(id) {
+        var idQuery = $jobj(id);
+        var inputQuery = $jobj($ax.INPUT(id));
+        if(inputQuery.length) idQuery = inputQuery;
+
+        if (idQuery.is('input') && ($ax.public.fn.IsCheckBox(idQuery.attr('type')) || idQuery.attr('type') == 'radio')) {
+            idQuery = idQuery.parent().find('label').find('div');
+        }
+
+        if(idQuery.is('div')) {
+            var $rtfObj = idQuery.hasClass('text') ? idQuery : idQuery.find('.text');
+            if($rtfObj.length == 0) return '';
+
+            var textOut = '';
+            $rtfObj.children('p,ul,ol').each(function(index) {
+                if(index != 0) textOut += '\n';
+
+                //var htmlContent = $(this).html();
+                //if(isSoloBr(htmlContent)) return; // It has a solo br, then it was just put in for a newline, and paragraph already added the new line.
+                if (isSoloBr($(this).children())) return;
+
+                var htmlContent = $(this).html();            
+                //Replace line breaks (set in SetWidgetRichText) with newlines and nbsp's with regular spaces.
+                htmlContent = htmlContent.replace(/<br[^>]*>/ig, '\n').replace(/&nbsp;/ig, ' ');
+                textOut += $(htmlContent).text();
+                //textOut += htmlContent.replace(/<[^>]*>/g, '');
+            });
+
+            return textOut;
+        } else {
+            var val = idQuery.val();
+            return val == undefined ? '' : val;
+        }
+    };
+
+    var isSoloBr = function($html) {
+        //html = $(html);
+        // Html needs one and only one span
+        var spanChildren = $html.length == 1 && $html.is('span') ? $html.children() : false;
+        // Span children needs exactly one br and no text in the span
+        return spanChildren && spanChildren.length == 1 && spanChildren.is('br') && spanChildren.text().trim() == '';
+    };
+
+    $ax.public.fn.setRichTextHtml = function() {
+        if(arguments[0] == undefined) {
+            //No getter function, so just return undefined
+            return undefined;
+        } else {
+            var elementIds = this.getElementIds();
+
+            for(var index = 0; index < elementIds.length; index++) {
+                var currentItem = elementIds[index];
+
+                var widgetType = $ax.getTypeFromElementId(currentItem);
+                if ($ax.public.fn.IsTextBox(widgetType) || $ax.public.fn.IsTextArea(widgetType)) { //Do nothing for non rtf
+                    continue;
+                } else {
+                    //TODO -- [mas] fix this!
+                    var idRtf = '#' + currentItem;
+                    if($(idRtf).length == 0) idRtf = '#u' + (parseInt(currentItem.substring(1)) + 1);
+                    if($(idRtf).length != 0) SetWidgetRichText(idRtf, arguments[0]);
+                }
+            }
+
+            return this;
+        }
+    };
+
+    $ax.public.fn.value = function() {
+        if(arguments[0] == undefined) {
+            var firstId = this.getElementIds()[0];
+
+            if(!firstId) {
+                return undefined;
+            }
+
+            var widgetType = $ax.getTypeFromElementId(firstId);
+
+            if ($ax.public.fn.IsComboBox(widgetType) || $ax.public.fn.IsListBox(widgetType)) { //for select lists and drop lists
+                return $('#' + firstId + ' :selected').text();
+            } else if ($ax.public.fn.IsCheckBox(widgetType) || $ax.public.fn.IsRadioButton(widgetType)) { //for radio/checkboxes
+                return $('#' + firstId + '_input').is(':selected');
+            } else if ($ax.public.fn.IsTextBox(widgetType)) { //for text box
+                return $('#' + firstId + '_input').val();
+            } else { //for text based form elements
+                return this.jQuery().first().val();
+            }
+        } else {
+            var elementIds = this.getElementIds();
+
+            for(var index = 0; index < elementIds.length; index++) {
+                var widgetType = $ax.getTypeFromElementId(elementIds[index]);
+
+                var elementIdQuery = $('#' + elementIds[index]);
+
+                if ($ax.public.fn.IsCheckBox(widgetType) || $ax.public.fn.IsRadioButton(widgetType)) { //for radio/checkboxes
+                    if(arguments[0] == true) {
+                        elementIdQuery.prop('selected', true);
+                    } else if(arguments[0] == false) {
+                        elementIdQuery.prop('selected', false);
+                    }
+                } else { //For select lists, drop lists, text based form elements
+                    elementIdQuery.val(arguments[0]);
+                }
+            }
+
+            return this;
+        }
+    };
+
+    $ax.public.fn.checked = function() {
+        if(arguments[0] == undefined) {
+            return this.selected();
+        } else {
+            this.selected(arguments[0]);
+            return this;
+        }
+    };
+
+    //var _getRelativeLeft = function (id, parent) {
+    //    var currentNode = window.document.getElementById(id).offsetParent;
+    //    var left = $ax('#' + id).left(true);
+    //    while (currentNode != null && currentNode.tagName != "BODY" && currentNode != parent) {
+    //        left += currentNode.offsetLeft;
+    //        currentNode = currentNode.offsetParent;
+    //    }
+    //    return left;
+    //};
+
+    //var _getRelativeTop = function(id, parent) {
+    //    var currentNode = window.document.getElementById(id).offsetParent;
+    //    var top = $ax('#' + id).top(true);
+    //    while(currentNode != null && currentNode.tagName != "BODY" && currentNode != parent) {
+    //        top += currentNode.offsetTop;
+    //        currentNode = currentNode.offsetParent;
+    //    }
+    //    return top;
+    //};
+
+    var _scrollHelper = function(id, scrollX, scrollY, easing, duration) {
+        var target = window.document.getElementById(id);
+        var scrollable = $ax.legacy.GetScrollable(target);
+        var $scrollable = $(scrollable);
+
+        var viewportLocation;
+        if ($scrollable.is('body')) viewportLocation = $ax('#' + id).viewportLocation();
+        else viewportLocation = $ax('#' + id).pageBoundingRect(true, $scrollable.attr('id')).location;
+
+        var targetLeft = viewportLocation.left;
+        var targetTop = viewportLocation.top;
+        //var targetLeft = _getRelativeLeft(id, scrollable);
+        //var targetTop = _getRelativeTop(id, scrollable);
+        if(!scrollX) targetLeft = scrollable.scrollLeft;
+        if(!scrollY) targetTop = scrollable.scrollTop;
+        
+        if($scrollable.is('body')) {
+            $scrollable = $('html,body');
+        }
+        if(easing == 'none') {
+            if(scrollY) $scrollable.scrollTop(targetTop);
+            if(scrollX) $scrollable.scrollLeft(targetLeft);
+        } else {
+            if(!scrollX) {
+                $scrollable.animate({ scrollTop: targetTop }, duration, easing);
+            } else if(!scrollY) {
+                $scrollable.animate({ scrollLeft: targetLeft }, duration, easing);
+            } else {
+                $scrollable.animate({ scrollTop: targetTop, scrollLeft: targetLeft }, duration, easing);
+            }
+        }
+    };
+
+    $ax.public.fn.scroll = function(scrollOption) {
+        var easing = 'none';
+        var duration = 500;
+
+        if(scrollOption && scrollOption.easing) {
+            easing = scrollOption.easing;
+
+            if(scrollOption.duration) {
+                duration = scrollOption.duration;
+            }
+        }
+
+        var scrollX = true;
+        var scrollY = true;
+
+        // TODO: check this without vertical option -- might scroll outside of device frame
+        if(scrollOption.direction == 'vertical') {
+            scrollX = false;
+        } else if(scrollOption.direction == 'horizontal') {
+            scrollY = false;
+        }
+
+        var elementIds = this.getElementIds();
+        for(var index = 0; index < elementIds.length; index++) {
+            //            if($ax.getTypeFromElementId(elementIds[index]) == IMAGE_MAP_REGION_TYPE) {
+            _scrollHelper(elementIds[index], scrollX, scrollY, easing, duration);
+            //            }
+        }
+
+        return this;
+    };
+
+    $ax.public.fn.enabled = function() {
+        if(arguments[0] == undefined) {
+            var firstId = this.getElementIds()[0];
+            if(!firstId) return undefined;
+
+            var widgetType = $ax.getTypeFromElementId(firstId);
+            if ($ax.public.fn.IsImageBox(widgetType) || $ax.public.fn.IsVector(widgetType)
+                || $ax.public.fn.IsLayer(widgetType)) return !$ax.style.IsWidgetDisabled(firstId);
+            else return this.jQuery().children(':disabled').length <= 0;
+        } else {
+            var elementIds = this.getElementIds();
+
+            for(var index = 0; index < elementIds.length; index++) {
+                var elementId = elementIds[index];
+                var widgetType = $ax.getTypeFromElementId(elementId);
+
+                var enabled = arguments[0];
+                if ($ax.public.fn.IsImageBox(widgetType) || $ax.public.fn.IsVector(widgetType)
+                    || $ax.public.fn.IsTextBox(widgetType) || $ax.public.fn.IsTextArea(widgetType)
+                    || $ax.public.fn.IsComboBox(widgetType) || $ax.public.fn.IsListBox(widgetType)
+                    || $ax.public.fn.IsCheckBox(widgetType) || $ax.public.fn.IsRadioButton(widgetType)
+                ) $ax.style.SetWidgetEnabled(elementId, enabled);
+
+                if ($ax.public.fn.IsDynamicPanel(widgetType) || $ax.public.fn.IsLayer(widgetType)) {
+                    $ax.style.SetWidgetEnabled(elementId, enabled);
+                    var children = this.getChildren(false, true)[index].children;
+                    for(var i = 0; i < children.length; i++) {
+                        $axure('#' + children[i]).enabled(enabled);
+                    }
+                }
+                var obj = $obj(elementId);
+                var images = obj.images;
+                if(PLAIN_TEXT_TYPES.indexOf(widgetType) != -1 && images) {
+                    var img = $jobj($ax.repeater.applySuffixToElementId(elementId, '_image_sketch'));
+                    var key = (enabled ? 'normal~' : 'disabled~') + ($ax.adaptive.currentViewId || '');
+                    img.attr('src', images[key]);
+
+                }
+                var jobj = $jobj(elementId);
+                var input = $jobj($ax.INPUT(elementId));
+                if(input.length) jobj = input;
+
+                //if (OS_MAC && WEBKIT && $ax.public.fn.IsComboBox(widgetType)) jobj.css('color', enabled ? '' : 'grayText');
+
+                if(enabled) jobj.prop('disabled', false);
+                else jobj.prop('disabled', true);
+            }
+
+            return this;
+        }
+    };
+
+    $ax.public.fn.visible = function() {
+        var ids = this.getElementIds();
+        for(var index = 0; index < ids.length; index++) $ax.visibility.SetIdVisible(ids[index], arguments[0]);
+        return this;
+    };
+
+    $ax.public.fn.selected = function() {
+        if(arguments[0] == undefined) {
+            var firstId = this.getElementIds()[0];
+            if(!firstId) return undefined;
+
+            var widgetType = $ax.getTypeFromElementId(firstId);
+            if ($ax.public.fn.IsTreeNodeObject(widgetType)) {
+                var treeNodeButtonShapeId = '';
+                var allElementIds = $ax.getAllElementIds();
+                for(var i = 0; i < allElementIds.length; i++) {
+                    var elementId = allElementIds[i];
+                    var currObj = $ax.getObjectFromElementId(elementId);
+
+                    if ($ax.public.fn.IsVector(currObj.type) && currObj.parent && currObj.parent.scriptIds && currObj.parent.scriptIds[0] == firstId) {
+                        treeNodeButtonShapeId = elementId;
+                        break;
+                    }
+                }
+
+                if(treeNodeButtonShapeId == '') return undefined;
+                return $ax.style.IsWidgetSelected(treeNodeButtonShapeId);
+            } else if ($ax.public.fn.IsImageBox(widgetType) || $ax.public.fn.IsVector(widgetType) || $ax.public.fn.IsTableCell(widgetType) || $ax.public.fn.IsDynamicPanel(widgetType) || $ax.public.fn.IsLayer(widgetType)
+                || $ax.public.fn.IsTextArea(widgetType) || $ax.public.fn.IsTextBox(widgetType) || $ax.public.fn.IsListBox(widgetType) || $ax.public.fn.IsComboBox(widgetType)) {
+                return $ax.style.IsWidgetSelected(firstId);
+            } else if ($ax.public.fn.IsCheckBox(widgetType) || $ax.public.fn.IsRadioButton(widgetType)) {
+                return $jobj($ax.INPUT(firstId)).prop('checked');
+            }
+            return this;
+        }
+        var elementIds = this.getElementIds();
+        var func = typeof (arguments[0]) === 'function' ? arguments[0] : null;
+        var enabled = arguments[0]; // If this is a function it will be overridden with the return value;
+
+        for(var index = 0; index < elementIds.length; index++) {
+            var elementId = elementIds[index];
+            if(func) {
+                enabled = func($axure('#' + elementId));
+            }
+
+            var widgetType = $ax.getTypeFromElementId(elementId);
+
+            if ($ax.public.fn.IsTreeNodeObject(widgetType)) { //for tree node
+                var treeRootId = $('#' + elementIds[index]).parents('.treeroot').attr('id');
+
+                var treeNodeButtonShapeId = '';
+                var childElementIds = $jobj(elementId).children();
+                for(var i = 0; i < childElementIds.length; i++) {
+                    var elementId = childElementIds[i].id;
+                    var currObj = $ax.getObjectFromElementId(elementId);
+
+                    if (currObj && currObj.type == $ax.constants.VECTOR_SHAPE_TYPE && currObj.parent &&
+                        currObj.parent.scriptIds && currObj.parent.scriptIds[0] == elementIds[index]) {
+                        treeNodeButtonShapeId = elementId;
+                        break;
+                    }
+                }
+
+                if(treeNodeButtonShapeId == '') continue;
+
+                $ax.tree.SelectTreeNode(elementId, enabled);
+            } else if ($ax.public.fn.IsImageBox(widgetType) || $ax.public.fn.IsVector(widgetType) || $ax.public.fn.IsTableCell(widgetType) || $ax.public.fn.IsDynamicPanel(widgetType) || $ax.public.fn.IsLayer(widgetType)
+                || $ax.public.fn.IsTextArea(widgetType) || $ax.public.fn.IsTextBox(widgetType) || $ax.public.fn.IsListBox(widgetType) || $ax.public.fn.IsComboBox(widgetType)) {
+                $ax.style.SetWidgetSelected(elementIds[index], enabled);
+            } else if ($ax.public.fn.IsCheckBox(widgetType) || $ax.public.fn.IsRadioButton(widgetType)) {
+                var query = $jobj($ax.INPUT(elementId));
+                var curr = query.prop('checked');
+                //NOTE: won't fire onselect nore onunselect event if states didn't changes
+                if(curr != enabled) {
+                    query.prop('checked', enabled);
+                    $ax.style.SetWidgetSelected(elementIds[index], enabled, true);
+                }
+            }
+        }
+        return this;
+    };
+
+    $ax.public.fn.focus = function() {
+        var firstId = this.getElementIds()[0];
+        var focusableId = $ax.event.getFocusableWidgetOrChildId(firstId);
+        // This will scroll but not focus
+        $('#' + focusableId).triggerHandler("focus");
+        // This will focus but does not call our custom scroll so will not animate scroll
+        $('#' + focusableId).focus();
+
+        return this;
+    };
+
+    $ax.public.fn.expanded = function() {
+        if(arguments[0] == undefined) {
+            var firstId = this.getElementIds()[0];
+            return firstId && !$ax.public.fn.IsTreeNodeObject($ax.getTypeFromElementId(firstId)) && $ax.visibility.IsIdVisible(firstId + '_children');
+        } else {
+            var elementIds = this.getElementIds();
+
+            for(var index = 0; index < elementIds.length; index++) {
+                if ($ax.public.fn.IsTreeNodeObject($ax.getTypeFromElementId(elementIds[index]))) {
+                    var treeNodeId = elementIds[index];
+                    var childContainerId = treeNodeId + '_children';
+
+                    var scriptId = $ax.repeater.getScriptIdFromElementId(treeNodeId);
+                    var itemId = $ax.repeater.getItemIdFromElementId(treeNodeId);
+                    var plusMinusId = 'u' + (parseInt(scriptId.substring(1)) + 1);
+                    if(itemId) plusMinusId = $ax.repeater.createElementId(plusMinusId, itemId);
+                    if($('#' + childContainerId).length == 0 || !$jobj(plusMinusId).children().first().is('img'))
+                        plusMinusId = '';
+
+                    if(arguments[0] == true) {
+                        $ax.tree.ExpandNode(treeNodeId, childContainerId, plusMinusId);
+                    } else if(arguments[0] == false) {
+                        $ax.tree.CollapseNode(treeNodeId, childContainerId, plusMinusId);
+                    }
+                }
+            }
+
+            return this;
+        }
+    };
+
+    var _populateBoundingRect = function (boundingRect) {
+        boundingRect.right = boundingRect.left + boundingRect.width;
+        boundingRect.bottom = boundingRect.top + boundingRect.height;
+
+        boundingRect.x = boundingRect.left;
+        boundingRect.y = boundingRect.top;
+
+        boundingRect.location = {
+            x: boundingRect.left,
+            y: boundingRect.top,
+            left: boundingRect.left,
+            top: boundingRect.top
+        };
+
+        boundingRect.size = {
+            width: boundingRect.width,
+            height: boundingRect.height
+        };
+
+        boundingRect.centerPoint = {
+            x: boundingRect.width / 2 + boundingRect.left,
+            y: boundingRect.height / 2 + boundingRect.top
+        };
+        return boundingRect;
+    }
+
+    //boundingrect relative to its offset parent
+    //var _getBoundingRectForSingleWidget = function (elementId) {
+    //    var element = document.getElementById(elementId);
+    //    var tempBoundingRect, position;
+
+    //    var state = $ax.style.generateState(elementId);
+    //    var style = $ax.style.computeFullStyle(elementId, state, $ax.adaptive.currentViewId);
+    //    position = { left: style.location.x, top: style.location.y };
+    //    tempBoundingRect = { left: style.location.x, top: style.location.y, width: style.size.width, height: style.size.height };
+
+    //    if ($ax.public.fn.isCompoundVectorHtml(element)) {
+    //        tempBoundingRect.width = Number(element.getAttribute('data-width'));
+    //        tempBoundingRect.height = Number(element.getAttribute('data-height'));
+    //    } else {
+    //        var boundingElement = element;
+    //        if ($ax.dynamicPanelManager.isIdFitToContent(elementId)) {
+    //            var stateId = $ax.visibility.GetPanelState(elementId);
+    //            if (stateId != '') boundingElement = document.getElementById(stateId);
+    //            tempBoundingRect = boundingElement.getBoundingClientRect();
+    //        }
+
+    //        //From getLoc
+    //        //var fixed = _fixedOffset(id, vert);
+    //        //if (fixed.valid) loc = !vert && fixed.fullWidth ? 0 : fixed.offset;
+
+    //        var jElement = $(element);
+    //        if (jElement.css('position') == 'fixed') {
+    //            position = jElement.position();
+    //            position.left += Number(jElement.css('margin-left').replace("px", ""));
+    //            position.top += Number(jElement.css('margin-top').replace("px", ""));
+    //        }
+    //    }
+        
+    //    var boundingRect = {
+    //        left: position.left,
+    //        top: position.top,
+    //        width: tempBoundingRect.width,
+    //        height: tempBoundingRect.height
+    //    };
+        
+    //    return _populateBoundingRect(boundingRect);
+    //};
+
+    //var _getBoundingRectForMultipleWidgets = function (widgetsIdArray) {
+    //    if (!widgetsIdArray || widgetsIdArray.constructor !== Array) return undefined;
+    //    if (widgetsIdArray.length == 0) return { left: 0, top: 0, centerPoint: { x: 0, y: 0 }, width: 0, height: 0 };
+    //    var widgetRect = _getBoundingRectForSingleWidget(widgetsIdArray[0]);
+    //    var boundingRect = { left: widgetRect.left, right: widgetRect.right, top: widgetRect.top, bottom: widgetRect.bottom };
+
+    //    for (var index = 1; index < widgetsIdArray.length; index++) {
+    //        widgetRect = _getBoundingRectForSingleWidget(widgetsIdArray[index]);
+    //        boundingRect.left = Math.min(boundingRect.left, widgetRect.left);
+    //        boundingRect.top = Math.min(boundingRect.top, widgetRect.top);
+    //        boundingRect.right = Math.max(boundingRect.right, widgetRect.right);
+    //        boundingRect.bottom = Math.max(boundingRect.bottom, widgetRect.bottom);
+    //    }
+
+    //    boundingRect.centerPoint = { x: (boundingRect.right + boundingRect.left) / 2.0, y: (boundingRect.bottom + boundingRect.top) / 2.0 };
+    //    boundingRect.width = boundingRect.right - boundingRect.left;
+    //    boundingRect.height = boundingRect.bottom - boundingRect.top;
+    //    return _populateBoundingRect(boundingRect);
+    //};
+
+    //var _getLayerChildrenDeep = $ax.public.fn.getLayerChildrenDeep = function (layerId, includeLayers, includeHidden) {
+    //    var deep = [];
+    //    var children = $ax('#' + layerId).getChildren()[0].children;
+    //    for (var index = 0; index < children.length; index++) {
+    //        var childId = children[index];
+    //        if (!includeHidden && !$ax.visibility.IsIdVisible(childId)) continue;
+    //        if ($ax.public.fn.IsLayer($obj(childId).type)) {
+    //            if (includeLayers) deep.push(childId);
+    //            var recursiveChildren = _getLayerChildrenDeep(childId, includeLayers, includeHidden);
+    //            for (var j = 0; j < recursiveChildren.length; j++) deep.push(recursiveChildren[j]);
+    //        } else deep.push(childId);
+    //    }
+    //    return deep;
+    //};
+
+    var _boundingRectForIds = function(childIds) {
+        // Default size
+        var childrenBoundingRect = { left: childIds.length > 0 ? 9999999 : 0, top: childIds.length > 0 ? 9999999 : 0, right: 0, bottom: 0 };
+        for (var i = 0; i < childIds.length; i++) {
+            var childId = childIds[i];
+            var childObj = $obj(childId);
+
+            if (!childObj) continue;
+
+            // Ignore fixed and hidden
+            if ($ax.visibility.limboIds[childId] ||
+                !$ax.visibility.IsIdVisible(childId) ||
+                $ax.public.fn.IsDynamicPanel(childObj.type) && childObj.fixedHorizontal) continue;
+
+            var boundingRect = $ax('#' + childId).offsetBoundingRect();
+
+            // Ignore empty groups
+            if ($ax.public.fn.IsLayer(childObj.type) && boundingRect.width == 0 && boundingRect.height == 0) continue;
+
+            childrenBoundingRect.left = Math.min(childrenBoundingRect.left, boundingRect.left);
+            childrenBoundingRect.top = Math.min(childrenBoundingRect.top, boundingRect.top);
+            childrenBoundingRect.right = Math.max(childrenBoundingRect.right, boundingRect.right);
+            childrenBoundingRect.bottom = Math.max(childrenBoundingRect.bottom, boundingRect.bottom);
+        }
+        childrenBoundingRect.width = childrenBoundingRect.right - childrenBoundingRect.left;
+        childrenBoundingRect.height = childrenBoundingRect.bottom - childrenBoundingRect.top;
+
+        return _populateBoundingRect(childrenBoundingRect);
+    }
+
+    $ax.public.fn.getPageSize = function() {
+        var containerQuery = $('#base');
+        var children = containerQuery.children();
+        var childIds = [];
+        for (var i = 0; i < children.length; i++) {
+            var child = $(children[i]);
+            var childId = child.attr('id');
+            childIds.push(childId);
+        }
+
+        return _boundingRectForIds(childIds);
+    }
+
+    $ax.public.fn.childrenBoundingRect = function () {        
+        var childIds = this.getChildren()[0].children;
+        return _boundingRectForIds(childIds);
+    };
+
+    var _fixedLocation = function (elementId, size) {
+        var axObj = $obj(elementId);
+        if (!axObj || !axObj.fixedVertical) return { valid: false };
+
+        var win = ((SAFARI && IOS) || SHARE_APP) ? $('#ios-safari-html') : $(window);
+        var windowWidth = win.width();
+        var windowHeight = win.height();
+        //getting the scroll forces layout. consider caching these values.
+        var windowScrollLeft = win.scrollLeft();
+        var windowScrollTop = win.scrollTop();
+
+        var newLeft = 0;
+        var newTop = 0;
+        var width = size.width;
+        var height = size.height;
+
+        var horz = axObj.fixedHorizontal;
+        if(horz == 'left') {
+            newLeft = windowScrollLeft + (axObj.percentWidth ? 0 : $ax.getNumFromPx($jobj(elementId).css('left')));
+        } else if(horz == 'center') {
+            newLeft = windowScrollLeft + ((windowWidth - width) / 2) + axObj.fixedMarginHorizontal;
+        } else if(horz == 'right') {
+            newLeft = windowScrollLeft + windowWidth - width - axObj.fixedMarginHorizontal;
+        }
+
+        var vert = axObj.fixedVertical;
+        if(vert == 'top') {
+            newTop = windowScrollTop + $ax.getNumFromPx($jobj(elementId).css('top'));
+        } else if(vert == 'middle') {
+            newTop = windowScrollTop + ((windowHeight - height) / 2) + axObj.fixedMarginVertical;
+        } else if(vert == 'bottom') {
+            newTop = windowScrollTop + windowHeight - height - axObj.fixedMarginVertical;
+        }
+
+        //probably need to make this relative to the page for hit testing
+        return { valid: true, top: newTop, left: axObj.isPercentWidthPanel ? 0 : newLeft };
+    };
+
+    //relative to the parent
+    $ax.public.fn.offsetBoundingRect = function (ignoreRotation) {
+        var elementId = this.getElementIds()[0];
+        if (!elementId) return undefined;
+        
+        //element is null if RDO
+        //data- values are for layers (legacy compound) 
+        var element = document.getElementById(elementId);
+        var position, size, rotation;
+
+        var trap;
+        var state;
+        var style;
+        var movedLoc = $ax.visibility.getMovedLocation(elementId);
+        var resizedSize = $ax.visibility.getResizedSize(elementId);
+        
+        if (movedLoc) {
+            position = movedLoc;
+        } else if(element && element.getAttribute('data-left')) {
+            position = {
+                left: Number(element.getAttribute('data-left')),
+                top: Number(element.getAttribute('data-top'))
+            };
+        } else if($obj(elementId)) {
+            state = $ax.style.generateState(elementId);
+            style = $ax.style.computeFullStyle(elementId, state, $ax.adaptive.currentViewId);
+            position = { left: style.location.x, top: style.location.y };
+
+            var oShadow = style.outerShadow;
+
+            if (oShadow.on) {
+                if (oShadow.offsetX < 0) {
+                    position.left += oShadow.offsetX;
+                    position.left -= oShadow.blurRadius;
+                }
+                if (oShadow.offsetY < 0) {
+                    position.top += oShadow.offsetY;
+                    position.top -= oShadow.blurRadius;
+                }
+            }
+
+            var parents = this.getParents(true, '*')[0];
+            //if(parents.length > 0) {
+            //    var parentId = parents[0];
+            //    var type = $ax.getTypeFromElementId(parentId);
+            //    if ($axure.fn.IsReferenceDiagramObject(type)) {
+            //        var rdoLoc = $ax('#' + parentId).offsetLocation();
+            //        position.left += rdoLoc.x;
+            //        position.top += rdoLoc.y;
+            //    }
+            //}
+            for(var i = 0; i < parents.length; i++) {
+                var parentId = parents[i];
+                var type = $ax.getTypeFromElementId(parentId);
+                if ($axure.fn.IsReferenceDiagramObject(type)) {
+                    var rdoLoc = $ax('#' + parentId).offsetLocation();
+                    position.left += rdoLoc.x;
+                    position.top += rdoLoc.y;
+                    break;
+                } else if (!$axure.fn.IsLayer(type)) break;
+            }
+        } else {
+            if (!trap) trap = _displayWidget($ax.repeater.removeSuffixFromElementId(elementId));
+            var jObjPosition = $(element).position();
+            position = { left: jObjPosition.left, top: jObjPosition.top };
+        }
+
+        if (resizedSize) {
+            size = resizedSize;
+        } else if (element && element.getAttribute('data-width')) {
+            size = {
+                width: Number(element.getAttribute('data-width')),
+                height: Number(element.getAttribute('data-height'))
+            };
+        } else if($obj(elementId)) {
+            state = state || $ax.style.generateState(elementId);
+            style = style || $ax.style.computeFullStyle(elementId, state, $ax.adaptive.currentViewId);
+            size = { width: style.size.width, height: style.size.height };
+
+            var oShadow = style.outerShadow;
+
+            if (oShadow.on) {
+                if (oShadow.offsetX < 0) size.width -= oShadow.offsetX;
+                else size.width += oShadow.offsetX;
+                if (oShadow.offsetY < 0) size.height -= oShadow.offsetY;
+                else size.height += oShadow.offsetY;
+
+                size.width += oShadow.blurRadius;
+                size.height += oShadow.blurRadius;
+            }
+        } else {
+            if(!trap) trap = _displayWidget($ax.repeater.removeSuffixFromElementId(elementId));
+            var jObj = $(element);
+            size = { width: jObj.outerWidth(), height: jObj.outerHeight() };
+        }
+        
+        var fixed = _fixedLocation(elementId, size);
+        if(fixed.valid) {
+            position.left = fixed.left;
+            position.top = fixed.top;
+        }
+
+        var boundingRect = {
+            left: position.left,
+            top: position.top,
+            width: size.width,
+            height: size.height,
+            isFixed: fixed.valid
+        };
+
+        if(!ignoreRotation) {
+            var rotatedAngle = $ax.visibility.getRotatedAngle(elementId);
+            if(rotatedAngle) {
+                rotation = rotatedAngle;
+            } else if(element && element.getAttribute('data-rotation')) {
+                rotation = Number(element.getAttribute('data-rotation'));
+            } else if($obj(elementId)) {
+                state = state || $ax.style.generateState(elementId);
+                style = style || $ax.style.computeFullStyle(elementId, state, $ax.adaptive.currentViewId);
+                rotation = style.rotation;
+            } else {
+                if (!trap) trap = _displayWidget($ax.repeater.removeSuffixFromElementId(elementId));
+                rotation = $ax.move.getRotationDegreeFromElement(element);
+            }
+            if(rotation && rotation != 0)
+                boundingRect = $ax.public.fn.getBoundingRectForRotate(_populateBoundingRect(boundingRect), rotation);
+        }
+
+        if (trap) trap();
+
+        return _populateBoundingRect(boundingRect);
+    };
+
+    //relative to the page
+    $ax.public.fn.pageBoundingRect = function (ignoreRotation, scrollableId) {
+        var boundingRect = this.offsetBoundingRect(ignoreRotation);
+        if(!boundingRect) return undefined;
+
+        if(boundingRect.isFixed) return _populateBoundingRect(boundingRect);
+
+        var loc = boundingRect.location;
+
+        //var parents = [];
+        //var parObj = id.indexOf('text') != -1 ? axObj : axObj.parent; // When working with text id, parent widget is the ax obj we are dealing with, so that should be the first parent
+        //while ($ax.public.fn.IsContainer(parObj.type)) {
+        //    parents.push($ax.getScriptIdFromPath([parObj.id], strippedId));
+        //    parObj = parObj.parent;
+        //}
+        //var otherParents = $ax('#' + id).getParents(true, ['item', 'repeater', 'dynamicPanel', 'layer'])[0];
+        //for (var i = 0; i < otherParents.length; i++) {
+        //    parents.push(otherParents[i]);
+        //}
+
+        var elementId = this.getElementIds()[0];
+        //    var strippedId = $ax.repeater.removeSuffixFromElementId(id);
+        //        var parObj = id.indexOf('text') != -1 ? axObj : axObj.parent; // When working with text id, parent widget is the ax obj we are dealing with, so that should be the first parent
+        var parentIds = [];
+        var parObj = $obj(elementId).parent;
+        while ($ax.public.fn.IsContainer(parObj.type)) {
+            parentIds.push($ax.getScriptIdFromPath([parObj.id], this.id));
+            parObj = parObj.parent;
+        }
+        var otherParents = $ax('#' + elementId).getParents(true, ['item', 'repeater', 'dynamicPanel'])[0];
+        for (var i = 0; i < otherParents.length; i++) {
+            parentIds.push(otherParents[i]);
+        }
+
+        var parentScrollableId = scrollableId ? scrollableId.split('_')[0] : scrollableId;
+        for (var i = 0; i < parentIds.length; i++) {
+            //var parentId = $ax.visibility.getWidgetFromContainer(parents[0]);
+            //var parent = $ax.visibility.applyWidgetContainer(parentId, true);
+            //if(parent.length) {
+            //var parentId = parentIds[i];
+            //var fixed = _fixedOffset(parentId, vert);
+            //if (fixed.valid) {
+            //    loc += fixed.offset;
+            //    break;
+            //} else loc += $ax.getNumFromPx(parent.css(prop));
+            //}
+            
+            var parentId = parentIds[i];
+            if (parentId == parentScrollableId) break;
+            var parentLoc = $ax('#' + parentId).offsetLocation();
+            loc = { 
+                x: loc.x + parentLoc.x,
+                y: loc.y + parentLoc.y,
+                left: loc.left + parentLoc.left,
+                top: loc.top + parentLoc.top,
+             }
+            var axObj = $obj(parentId);
+            if(axObj && axObj.fixedVertical) {
+                boundingRect.isFixed = true;
+                break;
+            }
+        }
+
+        boundingRect.left = loc.x;
+        boundingRect.top = loc.y;
+        return _populateBoundingRect(boundingRect);
+    };
+
+    $ax.public.fn.viewportBoundingRect = function (scrollableId) {
+        var boundingRect = this.pageBoundingRect(true, scrollableId);
+        if (!boundingRect) return undefined;
+
+        if(!boundingRect.isFixed) boundingRect.left = _bodyToWorld(boundingRect.left, false);
+        return _populateBoundingRect(boundingRect);
+    }
+
+    $ax.public.fn.size = function () {
+        var boundingRect = this.offsetBoundingRect(true);
+        return boundingRect ? boundingRect.size : undefined;
+
+        //var firstId = this.getElementIds()[0];
+        //if(!firstId) return undefined;
+
+        //var object = $ax.getObjectFromElementIdDisregardHex(firstId);
+        //if(object && (object.type == 'layer' || object.generateCompound)) {
+        //    var boundingRect = $ax.public.fn.getWidgetBoundingRect(firstId);
+        //    return { width: boundingRect.width, height: boundingRect.height };
+        //}
+
+        //var firstIdObject = $jobj(firstId);
+        //var trap = _displayWidget($ax.repeater.removeSuffixFromElementId(firstId));
+        //var size = { width: firstIdObject.outerWidth(), height: firstIdObject.outerHeight() };
+        //trap();
+        //return size;
+    };
+
+    $ax.public.fn.width = function () {
+        var boundingRect = this.offsetBoundingRect(true);
+        return boundingRect ? boundingRect.width : undefined;
+
+        //var firstId = this.getElementIds()[0];
+        //if(!firstId) return undefined;
+
+        //var object = $ax.getObjectFromElementIdDisregardHex(firstId);
+        //if (object && (object.type == 'layer' || object.generateCompound)) {
+        //    var boundingRect = $ax.public.fn.getWidgetBoundingRect(firstId);
+        //    return boundingRect.width;
+        //}
+
+        //var firstIdObject = $jobj(firstId);
+
+        //return firstIdObject.outerWidth();
+    };
+
+    $ax.public.fn.height = function () {
+        var boundingRect = this.offsetBoundingRect(true);
+        return boundingRect ? boundingRect.height : undefined;
+
+        //var firstId = this.getElementIds()[0];
+        //if(!firstId) return undefined;
+
+        //var object = $ax.getObjectFromElementIdDisregardHex(firstId);
+        //if (object && (object.type == 'layer' || object.generateCompound)) {
+        //    var boundingRect = $ax.public.fn.getWidgetBoundingRect(firstId);
+        //    return boundingRect.height;
+        //}
+
+        //var firstIdObject = $jobj(firstId);
+
+        //return firstIdObject.outerHeight();
+    };
+
+    //this should replace locRelativeIgnoreLayer
+    $ax.public.fn.offsetLocation = function () {
+        var boundingRect = this.offsetBoundingRect(true);
+        return boundingRect ? boundingRect.location : undefined;
+    };
+
+    //$ax.public.fn.offsetLeft = function () {
+    //    var boundingRect = this.offsetBoundingRect();
+    //    return boundingRect ? boundingRect.left : undefined;
+    //};
+
+    //$ax.public.fn.offsetTop = function () {
+    //    var boundingRect = this.offsetBoundingRect();
+    //    return boundingRect ? boundingRect.top : undefined;
+    //};
+
+    $ax.public.fn.viewportLocation = function (scrollableId) {
+        var boundingRect = this.viewportBoundingRect(scrollableId);
+        return boundingRect ? boundingRect.location : undefined;
+    };
+
+    //$ax.public.fn.pageLeft = function () {
+    //    var boundingRect = this.pageBoundingRect();
+    //    return boundingRect ? boundingRect.left : undefined;
+    //};
+
+    //$ax.public.fn.pageTop = function () {
+    //    var boundingRect = this.pageBoundingRect();
+    //    return boundingRect ? boundingRect.top : undefined;
+    //};
+
+    //This is getting its position in the Editor
+    //It was needed because the widget would be contained so getting the position from jQuery would not be accurate
+    //This can use the editor values
+    //$ax.public.fn.locRelativeIgnoreLayer = function (vert) {
+    //    var elementId = this.getElementIds()[0];
+    //    if(!elementId) return undefined;
+
+    //    var parents = this.getParents(true, '*')[0];
+
+    //    for(var i = 0; i < parents.length; i++) {
+    //        var type = $ax.getTypeFromElementId(parents[i]);
+    //        if(!$axure.fn.IsLayer(type) && !$axure.fn.IsReferenceDiagramObject(type)) {
+    //            var func = vert ? _getRelativeTop : _getRelativeLeft;
+    //            return func(elementId, $jobj(parents[i])[0]);
+    //        }
+    //    }
+    //    var axThis = $ax('#' + elementId);
+    //    return vert ? axThis.top() : _bodyToWorld(axThis.left(), true);
+    //};
+
+    var _bodyToWorld = $axure.fn.bodyToWorld = function(x, from) {
+        var body = $('body');
+        if (body.css('position') != 'relative') return x;
+        var offset = $ax.getNumFromPx(body.css('left')) + Math.max(0, ($(window).width() - body.width()) / 2);
+        if(from) offset *= -1;
+        return x + offset;
+    }
+
+    $ax.public.fn.left = function (relative) {
+        return relative ? this.offsetLocation().left : this.viewportLocation().left;
+
+        //var firstId = this.getElementIds()[0];
+        //if(!firstId) return undefined;
+
+        //var left = _getLoc(firstId, false, false, relative);
+
+        //// If you are absolute, unless your are a pinned panel...
+        //if(relative || $obj(firstId) && $obj(firstId).fixedVertical) return left;
+
+        //// ... or you are in one...
+        //var parentPanels = $ax('#' + firstId).getParents(true, 'dynamicPanel')[0];
+        //for(var i = 0; i < parentPanels.length; i++) if ($obj(parentPanels[i]).fixedVertical) return left;
+
+        //// ... you must convert from body to world coordinates
+        //return _bodyToWorld(left);
+    };
+
+    $ax.public.fn.top = function(relative) {
+        return relative ? this.offsetLocation().top : this.viewportLocation().top;
+
+        //var firstId = this.getElementIds()[0];
+        //return firstId && _getLoc(firstId, true, false, relative);
+    };
+
+    //var _getLoc = function(id, vert, high, relative) {
+    //    var mathFunc = high ? 'max' : 'min';
+    //    var prop = vert ? 'top' : 'left';
+    //    var dim = vert ? 'height' : 'width';
+
+    //    var obj = $jobj(id);
+    //    var strippedId = $ax.repeater.removeSuffixFromElementId(id);
+    //    var axObj = $obj(strippedId);
+    //    var oldDisplay = obj.css('display');
+    //    var displaySet = false;
+    //    if(oldDisplay == 'none') {
+    //        obj.css('display', '');
+    //        displaySet = true;
+    //    }
+    //    var loc = Math.NaN;
+    //    var rdo = axObj.type == $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE;
+
+    //    if (!rdo) loc = $ax.getNumFromPx(obj.css(prop));
+
+    //    var fixed = _fixedOffset(id, vert);
+    //    if(fixed.valid) loc = !vert && fixed.fullWidth ? 0 : fixed.offset;
+    //    else if (!relative) {
+    //        var parents = [];
+    //        var parObj = id.indexOf('text') != -1 ? axObj : axObj.parent; // When working with text id, parent widget is the ax obj we are dealing with, so that should be the first parent
+    //        while($ax.public.fn.IsContainer(parObj.type)) {
+    //            parents.push($ax.getScriptIdFromPath([parObj.id], strippedId));
+    //            parObj = parObj.parent;
+    //        }
+    //        var otherParents = $ax('#' + id).getParents(true, ['item', 'repeater', 'dynamicPanel', 'layer'])[0];
+    //        for(var i = 0; i < otherParents.length; i++) {
+    //            parents.push(otherParents[i]);
+    //        }
+
+    //        for(var i = 0; i < parents.length; i++) {
+    //            var parentId = $ax.visibility.getWidgetFromContainer(parents[i]);
+    //            var parent = $ax.visibility.applyWidgetContainer(parentId, true);
+
+    //            // Layer may not have container, and will be at 0,0 otherwise.
+    //            if (!parent.length) continue;
+
+    //            fixed = _fixedOffset(parentId, vert);
+    //            if(fixed.valid) {
+    //                loc += fixed.offset;
+    //                break; // If fixed ignore any parents if there are any, they don't matter.
+    //            } else loc += $ax.getNumFromPx(parent.css(prop));
+    //        }
+    //    }
+
+    //    if (high) loc += obj[dim]();
+
+    //    // Special Layer code
+    //    if (axObj.type == 'layer') {
+    //        // If layer has a container, then use that. Otherwise must deal with children. Children can move in container after created, but ignoring for now.
+    //        var container = $ax.visibility.applyWidgetContainer(id, true, true);
+    //        if(container.length) loc += $ax.getNumFromPx(container.css(prop));
+    //        else loc += (_getChildLoc(axObj.objs, vert, high, dim, true, id) || 0);
+    //    }
+
+    //    if(displaySet) obj.css('display', oldDisplay);
+    //    return loc;
+    //};
+
+    //var _getChildLoc = function (children, vert, high, dim, root, path, itemId) {
+    //    if (typeof (path) == 'string') {
+    //        itemId = $ax.repeater.getItemIdFromElementId(path);
+    //        path = $ax.getPathFromScriptId(path);
+    //        path.pop(); // Remove object id, only want rdo path.
+    //    }
+    //    var mathFunc = high ? 'max' : 'min';
+    //    var childLoc = NaN;
+    //    for (var i = 0; i < children.length; i++) {
+    //        var childObj = children[i];
+    //        var childId = $ax.getElementIdFromPath([childObj.id], { relativeTo: path });
+    //        if (!childId) continue;
+    //        childId = $ax.repeater.createElementId(childId, itemId);
+    //        if($ax.public.fn.IsReferenceDiagramObject(childObj.type)) {
+    //            path.push(childObj.id);
+    //            var childProp = _getChildLoc($ax.pageData.masters[$obj(childId).masterId].diagram.objects, vert, high, dim, false, path, itemId);
+    //            path.pop();
+    //            if(isNaN(childProp)) continue;
+    //        } else if($ax.public.fn.IsLayer(childObj.type)) {
+    //            childProp = _getChildLoc(childObj.objs, vert, high, dim, false, path, itemId);
+    //        } else {
+    //            if(!$ax.visibility.IsIdVisible(childId)) continue;
+    //            childProp = $ax('#' + childId).locRelativeIgnoreLayer(vert);
+    //            if(high) childProp += $jobj(childId)[dim]();
+    //        }
+
+    //        if(isNaN(childLoc)) childLoc = childProp;
+    //        else if(!isNaN(childProp)) childLoc = Math[mathFunc](childLoc, childProp);
+    //    }
+
+    //    return root && isNaN(childLoc) ? 0 : childLoc;
+    //};
+
+    //var _fixedOffset = function (id, vert) {
+    //    var axObj = $obj(id);
+    //    //I think this is only for pinned panels? So why are we coming through here for rtps?
+    //    if(!axObj) return { valid: false };
+
+    //    var dim = vert ? 'height' : 'width';
+    //    var alignment = axObj['fixed' + (vert ? 'Vertical' : 'Horizontal')];
+    //    if(!alignment) return { valid: false };
+    //    var loc = 0;
+
+    //    // TODO: This returns 0 for width/height it or any parent is display none. Similar issue when using axquery width/height
+    //    // TODO:  Look into replacing this with axquery width/height and fixing that to use this hack. Potentially want to make js generic trapper.
+    //    var trap = _displayWidget(id);
+    //    var query = $jobj(id);
+    //    var objSize = query[dim]();
+    //    trap();
+
+    //    if(alignment == 'center' || alignment == 'middle') {
+    //        loc = $ax.getNumFromPx(query.css('margin-' + (vert ? 'top' : 'left')));
+    //        loc += ($(window)[dim]()) / 2;
+    //    } else if(alignment == 'bottom' || alignment == 'right') {
+    //        loc = $ax.getNumFromPx(query.css(vert ? 'bottom' : 'right'));
+    //        loc = $(window)[dim]() - objSize - loc; // subract loc because margin here moves farther left/up as it gets bigger.
+    //    } else {
+    //        loc = $ax.getNumFromPx(query.css(vert ? 'top' : 'left'));
+    //    }
+
+    //    var scrollKey = 'scroll' + (vert ? 'Top' : 'Left');
+    //    return { offset: $(window)[scrollKey]() + loc, valid: true, fullWidth: axObj.percentWidth == 1 };
+    //};
+
+    var _displayWidget = function(id) {
+        var parents = $ax('#' + id).getParents(true, '*')[0];
+        parents.push(id); // also need to show self
+
+        var displayed = [];
+        for(var i = 0; i < parents.length; i++) {
+            var currId = parents[i];
+            var currObj = $jobj(currId);
+            if(currObj.css('display') == 'none') {
+                currObj.css('display', 'block');
+                displayed.push(currId);
+            }
+        }
+
+        return function() {
+            for(var i = 0; i < displayed.length; i++) {
+                $jobj(displayed[i]).css('display', 'none');
+            }
+        };
+    }
+});
diff --git a/src_old/resources/scripts/axure/doc.js b/src_old/resources/scripts/axure/doc.js
new file mode 100644
index 0000000..9abe442
--- /dev/null
+++ b/src_old/resources/scripts/axure/doc.js
@@ -0,0 +1,900 @@
+$axure.internal(function($ax) {
+    var _pageData;
+
+
+    var _initializePageFragment = function(pageFragment, objIdToObject) {
+        var objectArrayHelper = function(objects, parent) {
+            for(var i = 0; i < objects.length; i++) {
+                diagramObjectHelper(objects[i], parent);
+            }
+        };
+
+        var diagramObjectHelper = function(diagramObject, parent) {
+            $ax.initializeObject('diagramObject', diagramObject);
+            objIdToObject[pageFragment.packageId + '~' + diagramObject.id] = diagramObject;
+            diagramObject.parent = parent;
+            diagramObject.owner = pageFragment;
+            diagramObject.scriptIds = [];
+            if(diagramObject.diagrams) { //dynamic panel
+                for(var i = 0; i < diagramObject.diagrams.length; i++) {
+                    var diagram = diagramObject.diagrams[i];
+                    objectArrayHelper(diagram.objects, diagram);
+                }
+            } else if($ax.public.fn.IsLayer(diagramObject.type)) {
+                var layerObjs = diagramObject.objs;
+                objectArrayHelper(layerObjs, parent);
+            }
+            if(diagramObject.objects) objectArrayHelper(diagramObject.objects, diagramObject);
+        };
+        objectArrayHelper(pageFragment.diagram.objects, pageFragment.diagram);
+    };
+
+    var _initalizeStylesheet = function(stylesheet) {
+        var stylesById = {};
+        var customStyles = stylesheet.customStyles;
+        for(var key in customStyles) {
+            var style = customStyles[key];
+            stylesById[style.id] = style;
+        }
+        var duplicateStyles = stylesheet.duplicateStyles;
+        for(var duplicateKey in duplicateStyles) {
+            stylesById[duplicateKey] = stylesById[duplicateStyles[duplicateKey]];
+        }
+
+        stylesheet.stylesById = stylesById;
+    };
+
+
+    var _initializeDocumentData = function() {
+        _initalizeStylesheet($ax.document.stylesheet);
+    };
+
+
+    var _initializePageData;
+    // ******* Dictionaries ******** //
+    (function() {
+        var scriptIdToParentLayer = {};
+        var elementIdToObject = {};
+        var scriptIdToObject = {};
+        var scriptIdToRepeaterId = {};
+        var repeaterIdToScriptIds = {};
+        var repeaterIdToItemIds = {};
+        var scriptIdToPath = {};
+        var _scriptIds = [];
+        var elementIdToText = {};
+        var radioGroupToSelectedElementId = {};
+        _initializePageData = function() {
+            if(!_pageData || !_pageData.page || !_pageData.page.diagram) return;
+
+            var objIdToObject = {};
+            _initializePageFragment(_pageData.page, objIdToObject);
+            for(var masterId in _pageData.masters) {
+                var master = _pageData.masters[masterId];
+                _initializePageFragment(master, objIdToObject);
+            }
+
+            var _pathsToScriptIds = [];
+            _pathToScriptIdHelper(_pageData.objectPaths, [], _pathsToScriptIds, scriptIdToPath);
+
+            for(var i = 0; i < _pathsToScriptIds.length; i++) {
+                var path = _pathsToScriptIds[i].idPath;
+                var scriptId = _pathsToScriptIds[i].scriptId;
+
+                var packageId = _pageData.page.packageId;
+                if(path.length > 1) {
+                    for(var j = 0; j < path.length - 1; j++) {
+                        var rdoId = path[j];
+                        var rdo = objIdToObject[packageId + '~' + rdoId];
+                        packageId = rdo.masterId;
+                    }
+                }
+                var diagramObject = objIdToObject[packageId + '~' + path[path.length - 1]];
+                diagramObject.scriptIds[diagramObject.scriptIds.length] = scriptId;
+
+                scriptIdToObject[scriptId] = diagramObject;
+                _scriptIds[_scriptIds.length] = scriptId;
+            }
+
+            // Now map scriptIds to repeaters and layers
+            var mapScriptIdToRepeaterId = function(scriptId, repeaterId) {
+                scriptIdToRepeaterId[scriptId] = repeaterId;
+                var scriptIds = repeaterIdToScriptIds[repeaterId];
+                if(scriptIds) scriptIds[scriptIds.length] = scriptId;
+                else repeaterIdToScriptIds[repeaterId] = [scriptId];
+            };
+            var mapScriptIdToLayerId = function(obj, layerId, path) {
+                var pathCopy = $ax.deepCopy(path);
+                pathCopy[path.length] = obj.id;
+                var scriptId = $ax.getScriptIdFromPath(pathCopy);
+                scriptIdToParentLayer[scriptId] = layerId;
+            }
+            var mapIdsToRepeaterAndLayer = function(path, objs, repeaterId) {
+                var pathCopy = $ax.deepCopy(path);
+
+                for(var i = 0; i < objs.length; i++) {
+                    var obj = objs[i];
+                    pathCopy[path.length] = obj.id;
+                    var scriptId = $ax.getScriptIdFromPath(pathCopy);
+                    // Rdo have no element on page and are not mapped to the repeater
+                    if(repeaterId) mapScriptIdToRepeaterId(scriptId, repeaterId);
+
+                    if($ax.public.fn.IsDynamicPanel(obj.type)) {
+                        for(var j = 0; j < obj.diagrams.length; j++) mapIdsToRepeaterAndLayer(path, obj.diagrams[j].objects, repeaterId);
+                    } else if($ax.public.fn.IsReferenceDiagramObject(obj.type)) {
+                        mapIdsToRepeaterAndLayer(pathCopy, $ax.pageData.masters[obj.masterId].diagram.objects, repeaterId);
+                    } else if($ax.public.fn.IsRepeater(obj.type)) {
+                        mapScriptIdToRepeaterId(scriptId, scriptId);
+                        mapIdsToRepeaterAndLayer(path, obj.objects, scriptId);
+                    } else if($ax.public.fn.IsLayer(obj.type)) {
+                        var layerObjs = obj.objs;
+                        for(var j = 0; j < layerObjs.length; j++) {
+                            mapScriptIdToLayerId(layerObjs[j], scriptId, path);
+                        }
+                        mapIdsToRepeaterAndLayer(path, layerObjs, repeaterId);
+                    } else if(obj.objects && obj.objects.length) {
+                        if(repeaterId) {
+                            for(var j = 0; j < obj.objects.length; j++) {
+                                mapIdsToRepeaterAndLayer(path, obj.objects, repeaterId);
+                            }
+                        }
+                    }
+                }
+            };
+            mapIdsToRepeaterAndLayer([], $ax.pageData.page.diagram.objects);
+        };
+
+
+        $ax.getPathFromScriptId = function(scriptId) {
+            var reversedPath = [];
+            var path = scriptIdToPath[scriptId];
+            while(path && path.uniqueId) {
+                reversedPath[reversedPath.length] = path.uniqueId;
+                path = path.parent;
+            }
+            return reversedPath.reverse();
+        };
+
+        var _getScriptIdFromFullPath = function(path) {
+            var current = $ax.pageData.objectPaths;
+            for(var i = 0; i < path.length; i++) {
+                current = current[path[i]];
+                if(!current) return current;
+            }
+            return current && current.scriptId;
+        };
+
+
+        var _getScriptIdFromPath = function(path, relativeTo, includeLimbo) {
+            var relativePath = [];
+            var includeMasterInPath = false;
+            if(relativeTo) {
+                var relativeToScriptId;
+                if(relativeTo.srcElement) { //this is eventInfo
+                    relativeToScriptId = $ax.repeater.getScriptIdFromElementId(relativeTo.srcElement);
+                    includeMasterInPath = relativeTo.isMasterEvent;
+                } else if(typeof relativeTo === 'string') { //this is an element id
+                    relativeToScriptId = relativeTo;
+                }
+
+                if(relativeToScriptId) {
+                    relativePath = $ax.getPathFromScriptId(relativeToScriptId);
+                    if(!includeMasterInPath) relativePath = relativePath.slice(0, relativePath.length - 1);
+                } else if(relativeTo instanceof Array) { //this is a path
+                    relativePath = relativeTo;
+                }
+            }
+            var fullPath = relativePath.concat(path);
+            var scriptId = _getScriptIdFromFullPath(fullPath);
+            return (includeLimbo || !$ax.visibility.isScriptIdLimbo(scriptId)) && scriptId;
+        };
+        $ax.getScriptIdFromPath = _getScriptIdFromPath;
+
+        var _getElementIdsFromPath = function(path, eventInfo) {
+            var scriptId = _getScriptIdFromPath(path, eventInfo);
+            if(!scriptId) return [];
+            // Don't need placed check hear. If unplaced, scriptId will be undefined and exit out before here.
+            return $ax.getElementIdsFromEventAndScriptId(eventInfo, scriptId);
+        };
+        $ax.getElementIdsFromPath = _getElementIdsFromPath;
+
+        var _getElementIdFromPath = function(path, params, includeLimbo) {
+            var scriptId = _getScriptIdFromPath(path, params.relativeTo, includeLimbo);
+            if(!scriptId) return scriptId;
+
+            var itemNum = params.itemNum;
+            if(params.relativeTo && typeof params.relativeTo === 'string') {
+                if($jobj(params.relativeTo)) itemNum = $ax.repeater.getItemIdFromElementId(params.relativeTo);
+            }
+            return $ax.repeater.createElementId(scriptId, itemNum);
+        };
+        $ax.getElementIdFromPath = _getElementIdFromPath;
+
+        var _getElementsIdFromEventAndScriptId = function(eventInfo, scriptId) {
+            var itemId = eventInfo && $ax.repeater.getItemIdFromElementId(eventInfo.srcElement);
+            var target = false;
+            // Try to get itemId from target if you can't get it from source.
+            if(!itemId) {
+                itemId = eventInfo && eventInfo.targetElement && $ax.repeater.getItemIdFromElementId(eventInfo.targetElement);
+                if(itemId) target = true;
+            }
+
+            var parentRepeater = $ax.getParentRepeaterFromScriptId(scriptId);
+            if(parentRepeater && scriptId != parentRepeater) {
+                if(itemId && (!eventInfo || parentRepeater == $ax.getParentRepeaterFromScriptId($ax.repeater.getScriptIdFromElementId(target ? eventInfo.targetElement : eventInfo.srcElement)))) {
+                    return [$ax.repeater.createElementId(scriptId, itemId)];
+                }
+                var elementIds = [];
+                var itemIds = $ax.getItemIdsForRepeater(parentRepeater);
+                if(!itemIds) return [];
+
+                for(var i = 0; i < itemIds.length; i++) elementIds[i] = $ax.repeater.createElementId(scriptId, itemIds[i]);
+                return elementIds;
+            }
+            return [scriptId];
+        };
+        $ax.getElementIdsFromEventAndScriptId = _getElementsIdFromEventAndScriptId;
+
+        var _getSrcElementIdFromEvent = function(event) {
+            var currentQuery = $(event.srcElement || event.target);
+            while(currentQuery && currentQuery.length && (!$obj(currentQuery.attr('id')) || $jobj(currentQuery.attr('id')).hasClass('text'))) {
+                currentQuery = currentQuery.parent();
+            };
+            return currentQuery.attr('id');
+        };
+        $ax.getSrcElementIdFromEvent = _getSrcElementIdFromEvent;
+
+        var _getEventInfoFromEvent = function(event, skipShowDescriptions, elementId) {
+            var eventInfo = {};
+            eventInfo.srcElement = elementId;
+            eventInfo.now = new Date();
+
+            if(event != null) {
+                //elementId can be empty string, so can't simple use "or" assignment here.
+                eventInfo.srcElement = elementId || elementId == '' ? elementId : _getSrcElementIdFromEvent(event);
+                eventInfo.which = event.which;
+
+                // When getting locations in mobile, need to extract the touch object to get the mouse location attributes
+                var mouseEvent = (event.originalEvent && event.originalEvent.changedTouches && event.originalEvent.changedTouches[0]) || event.originalEvent;
+                if(mouseEvent && !mouseEvent.type) mouseEvent.type = event.type;
+
+                if(skipShowDescriptions) eventInfo.skipShowDescriptions = true;
+
+                // Always update mouse location if possible
+                $ax.event.updateMouseLocation(mouseEvent);
+            }
+
+            // Always set event info about cursor
+            var _cursor = eventInfo.cursor = {};
+            _cursor.x = $ax.mouseLocation.x;
+            _cursor.y = $ax.mouseLocation.y;
+
+            var body = $('body');
+            if(body.css('position') == 'relative') {
+                _cursor.x -= ($ax.getNumFromPx(body.css('left')) + Math.max(0, ($(window).width() - body.width()) / 2));
+            }
+
+            eventInfo.pageX = _cursor.x + 'px';
+            eventInfo.pageY = _cursor.y + 'px';
+
+            // Do Keyboard Info
+            eventInfo.keyInfo = $ax.event.keyState();
+
+            eventInfo.window = $ax.getWindowInfo();
+
+            eventInfo.thiswidget = _getWidgetInfo(eventInfo.srcElement);
+            eventInfo.item = _getItemInfo(eventInfo.srcElement);
+            eventInfo.dragInfo = $ax.drag.GetWidgetDragInfo();
+
+            return eventInfo;
+        };
+        $ax.getEventInfoFromEvent = _getEventInfoFromEvent;
+
+        $ax.getBasicEventInfo = function() {
+            var eventInfo = {};
+            eventInfo.now = new Date();
+            eventInfo.window = $ax.getWindowInfo();
+            eventInfo.cursor = { x: 0, y: 0};
+            return eventInfo;
+
+        };
+
+        //var _getWindowInfo = function() {
+        //    var win = {};
+        //    win.width = $(window).width();
+        //    win.height = $(window).height();
+        //    win.scrollx = $(window).scrollLeft();
+        //    win.scrolly = $(window).scrollTop();
+        //    return win;
+        //};
+        //$ax.getWindowInfo = _getWindowInfo;
+
+        var repeaterInfoCache = [];
+        $ax.cacheRepeaterInfo = function(repeaterId, repeaterInfo) {
+            repeaterInfoCache[repeaterId] = repeaterInfo;
+        }
+        $ax.removeCachedRepeaterInfo = function(repeaterId) {
+            repeaterInfoCache[repeaterId] = undefined;
+        }
+
+        var _getItemInfo = function(elementId) {
+            if(!elementId) return { valid: false };
+
+            elementId = _getParentElement(elementId);
+
+            var index = $ax.repeater.getItemIdFromElementId(elementId);
+            if(!index) return { valid: false };
+
+            var item = { valid: true };
+
+            var scriptId = $ax.repeater.getScriptIdFromElementId(elementId);
+            var repeaterId = $ax.getParentRepeaterFromScriptId(scriptId);
+            item.repeater = repeaterInfoCache[repeaterId] ? repeaterInfoCache[repeaterId] : _getWidgetInfo(repeaterId);
+            $ax.repeater.setDisplayProps(item, repeaterId, index);
+            item.ismarked = $ax.repeater.isEditItem(repeaterId, index);
+            item.isvisible = Boolean($jobj(elementId).length);
+
+            return item;
+        };
+        $ax.getItemInfo = _getItemInfo;
+
+        var _getWidgetInfo = function(elementId) {
+            if(!elementId) return { valid: false };
+
+            elementId = _getParentElement(elementId);
+
+            //var elementAxQuery = $ax('#' + elementId);
+            var elementQuery = $jobj(elementId);
+            var obj = $obj(elementId);
+            var widget = { valid: true, isWidget: true, obj: obj, elementQuery: elementQuery, isLayer: $ax.public.fn.IsLayer(obj.type) };
+            widget.elementId = elementId;
+            widget.name = widget.label = (elementQuery.data('label') ? elementQuery.data('label') : '');
+            //widget.text = $ax('#' + elementId).text();
+            widget.opacity = Number(elementQuery.css('opacity')) * 100;
+            //widget.rotation = $ax.move.getRotationDegree(widget.elementId);
+            var scriptId = $ax.repeater.getScriptIdFromElementId(elementId);
+            var repeaterId = $ax.getParentRepeaterFromScriptId(scriptId);
+            if(repeaterId) widget.repeater = $ax.public.fn.IsRepeater(obj.type) ? widget : _getWidgetInfo(repeaterId);
+            
+            // Right now only dynamic panel can scroll
+            if($ax.public.fn.IsDynamicPanel(obj.type)) {
+                var stateId = $ax.visibility.GetPanelState(elementId);
+                //can be empty when refreshing repeater and applying filter
+                if(stateId) {
+                    var stateQuery = $('#' + stateId);
+                    widget.scrollx = stateQuery.scrollLeft();
+                    widget.scrolly = stateQuery.scrollTop();
+                    //widget.stateQuery = stateQuery;
+                }
+            } else {
+                widget.scrollx = 0;
+                widget.scrolly = 0;
+            }
+
+            // repeater only props
+            if($ax.public.fn.IsRepeater(obj.type)) {
+                widget.visibleitemcount = repeaterIdToItemIds[scriptId] ? repeaterIdToItemIds[scriptId].length : $ax.repeater.getVisibleDataCount(scriptId);
+                widget.itemcount = $ax.repeater.getFilteredDataCount(scriptId);
+                widget.datacount = $ax.repeater.getDataCount(scriptId);
+                widget.pagecount = $ax.repeater.getPageCount(scriptId);
+                widget.pageindex = $ax.repeater.getPageIndex(scriptId);
+            }
+
+            // Get widget info funcs
+            //widget.elementAxQuery = function () {
+            //    return this.elementAxQueryProp || (this.elementAxQueryProp = $ax('#' + this.elementId));
+            //}
+
+            //widget.isFitToContent = function () {
+            //    if (this.isFitToContentProp === undefined) {
+            //        if (!this.stateQuery) this.isFitToContentProp = false;
+            //        else this.isFitToContentProp = $ax.dynamicPanelManager.isIdFitToContent(this.elementId);
+            //    }
+            //    return this.isFitToContentProp;
+            //}
+
+            widget.x = function () { return this.getProp('x'); }
+            widget.y = function () { return this.getProp('y'); }
+            widget.pagex = function () { return this.getProp('pagex'); }
+            widget.pagey = function () { return this.getProp('pagey'); }
+            widget.width = function () { return this.getProp('width'); }
+            widget.height = function () { return this.getProp('height'); }
+            widget.left = function () { return this.x(); }
+            widget.top = function () { return this.y(); }
+            widget.right = function () { return this.x() + this.width(); }
+            widget.bottom = function () { return this.y() + this.height(); }
+            widget.rotation = function () { return this.getProp('rotation'); }
+            widget.text = function () { return this.getProp('text'); }
+
+            widget.getProp = function (prop) {
+                var propName = prop + 'Prop';
+                if (typeof (this[propName]) != 'undefined') return this[propName];
+                return this[propName] = this.cacheProp(prop);
+            };
+
+            widget.cacheProp = function (prop) {
+
+                if(prop == 'x' || prop == 'y' || prop == 'width' || prop == 'height') {
+                    var boundingRect = $ax('#' + this.elementId).offsetBoundingRect(true);
+                    this.xProp = boundingRect.left;
+                    this.yProp = boundingRect.top;
+                    this.widthProp = boundingRect.width;
+                    this.heightProp = boundingRect.height;                    
+                }
+
+                if(prop == 'pagex' || prop == 'pagey') {
+                    var viewportLocation = $ax('#' + this.elementId).viewportLocation();
+                    this.pagexProp = viewportLocation.left;
+                    this.pageyProp = viewportLocation.top;
+                }
+
+                if(prop == 'rotation') {
+                    this.rotationProp = $ax.move.getRotationDegree(this.elementId);
+                }
+
+                if (prop == 'text') {
+                    this.textProp = $ax('#' + this.elementId).text();
+                }
+
+                return this[prop + 'Prop'];
+
+                //// I'm keeping the returned undefineds the same as before, but really I could probably return undefined right away if elementQuery is empty
+                //if (this.isLayer) {
+                //    if (prop == 'pagex' || prop == 'pagey') {
+                //        if (this.elementQuery.length > 0) {
+                //            if (prop == 'pagex') return this.elementAxQuery().left();
+                //            else return this.elementAxQuery().top();
+                //        }
+                //        return undefined; // Otherwise, it is undefined as there is no element
+                //    }
+                //    var boundingRect = $ax.public.fn.getWidgetBoundingRect(this.elementId);
+                //    this.xProp = boundingRect.left;
+                //    this.yProp = boundingRect.top;
+                //    this.widthProp = boundingRect.width;
+                //    this.heightProp = boundingRect.height;
+                //    return this[prop + 'Prop'];
+                //}
+
+                //if (this.elementQuery.length <= 0) return prop == 'x' || prop == 'y' ? 0 : undefined;
+
+                //switch (prop) {
+                //    case 'x': return this.elementAxQuery().locRelativeIgnoreLayer(false);
+                //    case 'y': return this.elementAxQuery().locRelativeIgnoreLayer(true);
+                //    case 'pagex': return this.elementAxQuery().left();
+                //    case 'pagey': return this.elementAxQuery().top();
+                //}
+
+                //var val = this.elementAxQuery()[prop]();
+                //if (this.isFitToContent()) val = this.stateQuery[prop]();
+
+                //return val;
+            };
+
+            //widget.leftfixed = function() { this.getFixed('left'); }
+            //widget.topfixed = function() { this.getFixed('top'); }
+            //widget.rightfixed = function() { this.getFixed('right'); }
+            //widget.bottomfixed = function() { this.getFixed('bottom'); }
+
+            //widget.isFixed = function() {
+            //    if(this.isFixedProp === undefined) this.isFixedProp = this.elementQuery.css('position') == 'fixed)';
+            //    return this.isFixedProp;
+            //}
+
+            //widget.getFixed = function (prop) {
+            //    var fixed = prop + 'fixedProp';
+            //    if(!this.isFixed()) widget[fixed] = widget[prop]();
+            //    if(widget[fixed] === undefined) {
+
+            //        if(prop == 'left' || prop == 'right') {
+            //            if(this.windowScrollX === undefined) this.windowScrollX = $(window).scrollLeft();
+            //            var windowScroll = this.windowScrollX;
+            //        } else {
+            //            if(this.windowScrollY === undefined) this.windowScrollY = $(window).scrollTop();
+            //            windowScroll = this.windowScrollY;
+            //        }
+            //        widget[fixed] = widget[prop]() - windowScroll;
+            //    }
+            //    return widget[fixed];
+            //}
+
+            return widget;
+        };
+        $ax.getWidgetInfo = _getWidgetInfo;
+
+        $ax.GetTextPanelId = function (id, create) {
+            if(!$ax('#' + id).SupportsRichText()) return '';
+            var buttonShape = $ax.GetButtonShape(id);
+            var panelDiv = buttonShape.find('.text')[0];
+            if(!panelDiv) {
+                if(!create) return "";
+
+                var adaptiveId = $ax.adaptive.currentViewId;
+                var newId = id + "_text";
+                //var newDiv = $('<div id="' + newId + '" class="text" style="visibility: inherit; position: absolute"></div>');
+                var newDiv = $('<div id="' + newId + '" class="text' + (adaptiveId ? (' ' + adaptiveId) : '') + '" style="visibility: inherit; position: absolute"><p><span></span></p></div>');
+                buttonShape.append(newDiv);
+
+                $ax.style.setAdaptiveStyle(id, $ax.style.computeAllOverrides(id, undefined, $ax.style.generateState(id), adaptiveId));
+
+                panelDiv = newDiv[0];
+            }
+
+            return panelDiv.id;
+        }
+
+        $ax.GetParentIdFromLink = function(id) {
+            return $ax.GetShapeIdFromText($jobj(id).parentsUntil('.text').parent().attr('id'));
+        };
+
+        $ax.GetButtonShapeId = function(id) {
+            var obj = $obj(id);
+            switch(obj.type) {
+            case $ax.constants.TREE_NODE_OBJECT_TYPE:
+                return obj.buttonShapeId ? $ax.getElementIdFromPath([obj.buttonShapeId], { relativeTo: id }) : "";
+            case $ax.constants.LINK_TYPE:
+                return "";
+            default:
+                return id;
+            }
+        };
+
+        $ax.GetButtonShape = function(id) {
+            return $jobj($ax.GetButtonShapeId(id));
+        };
+
+        $ax.GetShapeIdFromText = function(id) {
+            if(!id) return undefined; // this is to prevent an infinite loop.
+
+            var current = document.getElementById(id);
+            if(!current) return undefined;
+            current = current.parentElement;
+            while(current && current.tagName != 'BODY') {
+                var currentId = current.id;
+                if(currentId && currentId != 'base') return $ax.visibility.getWidgetFromContainer(currentId);
+                current = current.parentElement;
+            }
+
+            return undefined;
+        };
+
+        $ax.GetImageIdFromShape = function(id) {
+            var image = $ax.GetButtonShape(id).find('img[id$=img]');
+            if(!image.length) image = $jobj(id).find('img[id$=image_sketch]');
+            return image.attr('id');
+        };
+
+        var _getParentElement = $ax.getParentElement = function(elementId) {
+            var obj = $obj(elementId);
+            while(obj.isContained) {
+                var path = $ax.getPathFromScriptId($ax.repeater.getScriptIdFromElementId(elementId));
+                var itemId = $ax.repeater.getItemIdFromElementId(elementId);
+                path[path.length - 1] = obj.parent.id;
+                elementId = $ax.getElementIdFromPath(path, { itemNum: itemId });
+                obj = $obj(elementId);
+            }
+
+            return elementId;
+        };
+
+        $ax.addItemIdToRepeater = function(itemId, repeaterId) {
+            var itemIds = repeaterIdToItemIds[repeaterId];
+            if(itemIds) itemIds[itemIds.length] = itemId;
+            else repeaterIdToItemIds[repeaterId] = [itemId];
+
+            var scriptIds = repeaterIdToScriptIds[repeaterId];
+            for(var i = 0; i < scriptIds.length; i++) elementIdToObject[$ax.repeater.createElementId(scriptIds[i], itemId)] = $ax.getObjectFromScriptId(scriptIds[i]);
+        };
+
+        $ax.getAllElementIds = function() {
+            var elementIds = [];
+            for(var i = 0; i < _scriptIds.length; i++) {
+                var scriptId = _scriptIds[i];
+                var repeaterId = scriptIdToRepeaterId[scriptId];
+                if(repeaterId && repeaterId != scriptId) {
+                    var itemIds = repeaterIdToItemIds[repeaterId] || [];
+                    for(var j = 0; j < itemIds.length; j++) elementIds[elementIds.length] = $ax.repeater.createElementId(scriptId, itemIds[j]);
+                } else elementIds[elementIds.length] = scriptId;
+            }
+            return elementIds;
+        };
+
+        $ax.getAllScriptIds = function() {
+            return _scriptIds;
+        };
+
+        $ax.getObjectFromElementId = function(elementId) {
+            return $ax.getObjectFromScriptId($ax.repeater.getScriptIdFromElementId(elementId));
+        };
+
+        $ax.getObjectFromScriptId = function(scriptId) {
+            return scriptIdToObject[scriptId];
+        };
+
+        $ax.getParentRepeaterFromElementId = function(elementId) {
+            return $ax.getParentRepeaterFromScriptId($ax.repeater.getScriptIdFromElementId(elementId));
+        };
+
+        $ax.getParentRepeaterFromElementIdExcludeSelf = function (elementId) {
+            var repeaterId = $ax.getParentRepeaterFromElementId(elementId);
+            return repeaterId != elementId ? repeaterId : undefined;
+        };
+
+        $ax.getParentRepeaterFromScriptId = function(scriptId) {
+            return scriptIdToRepeaterId[scriptId];
+        };
+
+        var _getChildScriptIdsForRepeater = function(repeaterId) {
+            return repeaterIdToScriptIds[repeaterId];
+        };
+
+        var _getItemIdsForRepeater = function(repeaterId) {
+            return repeaterIdToItemIds[repeaterId] || [];
+        };
+        $ax.getItemIdsForRepeater = _getItemIdsForRepeater;
+
+        var _clearItemIdsForRepeater = function(repeaterId) {
+            repeaterIdToItemIds[repeaterId] = [];
+        };
+        $ax.clearItemsForRepeater = _clearItemIdsForRepeater;
+
+        $ax.getChildElementIdsForRepeater = function(repeaterId) {
+            var scriptIds = _getChildScriptIdsForRepeater(repeaterId);
+            var itemIds = _getItemIdsForRepeater(repeaterId);
+
+            var retVal = [];
+            if(!itemIds || !scriptIds) return retVal;
+
+            for(var i = 0; i < scriptIds.length; i++) {
+                for(var j = 0; j < itemIds.length; j++) {
+                    retVal[retVal.length] = $ax.repeater.createElementId(scriptIds[i], itemIds[j]);
+                }
+            }
+            return retVal;
+        };
+
+        $ax.getRdoParentFromElementId = function(elementId) {
+            var scriptId = $ax.repeater.getScriptIdFromElementId(elementId);
+            var rdoId = scriptIdToPath[scriptId].parent.scriptId;
+            if($ax.getParentRepeaterFromScriptId(rdoId)) rdoId = $ax.repeater.createElementId(rdoId, $ax.repeater.getItemIdFromElementId(elementId));
+            return rdoId;
+        };
+
+        $ax.getLayerParentFromElementId = function (elementId) {
+            var itemId = $ax.repeater.getItemIdFromElementId(elementId);
+            var scriptId = scriptIdToParentLayer[$ax.repeater.getScriptIdFromElementId(elementId)];
+            return $ax.getParentRepeaterFromElementId(scriptId) ? $ax.repeater.createElementId(scriptId, itemId) : scriptId;
+        }
+
+        $ax.updateElementText = function(elementId, text) {
+            elementIdToText[elementId] = text;
+        };
+
+        $ax.hasElementTextChanged = function(elementId, text) {
+            return elementIdToText[elementId] != text;
+        };
+
+        $ax.updateRadioButtonSelected = function(group, elementId) {
+            var old = radioGroupToSelectedElementId[group];
+            radioGroupToSelectedElementId[group] = elementId;
+            return old;
+        };
+
+        $ax.hasRadioButtonSelectedChanged = function(group, elementId) {
+            return radioGroupToSelectedElementId[group] != elementId;
+        };
+    })();
+
+    //Recursively populates fullPathArray with:
+    // [ { idPath, scriptId }, ... ]
+    //for every scriptId in the object
+    //also populates an object of scriptId -> path
+    var _pathToScriptIdHelper = function(currentPath, currentChain, fullPathArray, scriptIdToPath) {
+        for(var key in currentPath) {
+            if(key != "scriptId") {
+                var nextPath = currentPath[key];
+                _pathToScriptIdHelper(nextPath, currentChain.concat(key), fullPathArray, scriptIdToPath);
+                nextPath.parent = currentPath;
+                nextPath.uniqueId = key;
+            } else {
+                fullPathArray[fullPathArray.length] = { idPath: currentChain, scriptId: currentPath.scriptId };
+                scriptIdToPath[currentPath.scriptId] = currentPath;
+            }
+        }
+    };
+
+    $ax.public.loadCurrentPage = $ax.loadCurrentPage = function(pageData) {
+        $ax.pageData = _pageData = pageData;
+        _initializePageData();
+    };
+
+    $ax.public.loadDocument = $ax.loadDocument = function(document) {
+        $ax.document = document;
+        _initializeDocumentData();
+    };
+
+
+    /**
+    Navigates to a page
+
+
+    */
+    $ax.public.navigate = $ax.navigate = function(to) { //url, includeVariables, type) {
+        var targetUrl;
+        if(typeof (to) === 'object') {
+            targetUrl = !to.includeVariables ? to.url : $ax.globalVariableProvider.getLinkUrl(to.url, to.useGlobalVarNameInUrl);
+
+            if(to.target == "new") {
+                window.open(targetUrl, "");
+            } else if(to.target == "popup") {
+                var features = _getPopupFeatures(to.popupOptions);
+                window.open(targetUrl, "", features);
+            } else {
+                var targetLocation = window.location;
+                if(to.target == "current") {
+                } else if(to.target == "parent") {
+                    if(!top.opener) return;
+                    targetLocation = top.opener.window.location;
+                } else if(to.target == "parentFrame") {
+                    targetLocation = parent.location;
+                } else if(to.target == "frame") {
+                    //                    targetLocation = to.frame.contentWindow.location;
+                    $(to.frame).attr('src', targetUrl || 'about:blank');
+                    return;
+                }
+
+                if (!_needsReload(targetLocation, to.url)) {
+                    targetLocation.href = targetUrl || 'about:blank';
+                } else {
+                    targetLocation.href = $axure.utils.getReloadPath() + "#" + encodeURI(targetUrl);
+                }
+            }
+        } else {
+            $ax.navigate({
+                url: to,
+                target: "current",
+                includeVariables: arguments[1]
+            });
+        }
+    };
+
+    var _needsReload = function(oldLocation, newBaseUrl) {
+        var reload = false;
+        try {
+            var oldUrl = oldLocation.href;
+            var oldBaseUrl = oldUrl.split("#")[0];
+            var lastslash = oldBaseUrl.lastIndexOf("/");
+            if(lastslash > 0) {
+                oldBaseUrl = oldBaseUrl.substring(lastslash + 1, oldBaseUrl.length);
+                if(oldBaseUrl == encodeURI(newBaseUrl)) {
+                    reload = true;
+                }
+            }
+        } catch(e) {
+        }
+        return reload;
+    };
+
+    var _getPopupFeatures = function(options) {
+        var defaultOptions = {
+            toolbar: true,
+            scrollbars: true,
+            location: true,
+            status: true,
+            menubar: true,
+            directories: true,
+            resizable: true,
+            centerwindow: true,
+            left: -1,
+            top: -1,
+            height: -1,
+            width: -1
+        };
+
+        var selectedOptions = $.extend({}, defaultOptions, options);
+
+        var optionsList = [];
+        optionsList.push('toolbar=' + (selectedOptions.toolbar ? 'yes' : 'no'));
+        optionsList.push('scrollbars=' + (selectedOptions.scrollbars ? 'yes' : 'no'));
+        optionsList.push('location=' + (selectedOptions.location ? 'yes' : 'no'));
+        optionsList.push('status=' + (selectedOptions.status ? 'yes' : 'no'));
+        optionsList.push('menubar=' + (selectedOptions.menubar ? 'yes' : 'no'));
+        optionsList.push('directories=' + (selectedOptions.directories ? 'yes' : 'no'));
+        optionsList.push('resizable=' + (selectedOptions.resizable ? 'yes' : 'no'));
+
+        if(selectedOptions.centerwindow == false) {
+            if(selectedOptions.left > -1) {
+                optionsList.push('left=' + selectedOptions.left);
+            }
+
+            if(selectedOptions.top > -1) {
+                optionsList.push('top=' + selectedOptions.top);
+            }
+        }
+
+        var height = 0;
+        var width = 0;
+        if(selectedOptions.height > 0) {
+            optionsList.push('height=' + selectedOptions.height);
+            height = selectedOptions.height;
+        }
+
+        if(selectedOptions.width > 0) {
+            optionsList.push('width=' + selectedOptions.width);
+            width = selectedOptions.width;
+        }
+
+        var features = optionsList.join(',');
+        if(selectedOptions.centerwindow) {
+            var winl = (window.screen.width - width) / 2;
+            var wint = (window.screen.height - height) / 2;
+            features = features + ',left=' + winl + ',top=' + wint;
+        }
+
+        return features;
+    };
+
+    /**
+    Closes a window
+
+
+    */
+    $ax.public.closeWindow = $ax.closeWindow = function() {
+        parent.window.close();
+    };
+
+    /**
+    Goes back
+
+
+    */
+    $ax.public.back = $ax.back = function() {
+        window.history.go(-1);
+    };
+
+    /**
+    Reloads the current page.
+    # includeVariables: true if it should re-include the variables when the page is reloaded
+    */
+    $ax.public.reload = $ax.reload = function(includeVariables) {
+        var targetUrl = (includeVariables === false)
+            ? $axure.utils.getReloadPath() + "#" + encodeURI($ax.pageData.url)
+            : $axure.utils.getReloadPath() + "#" + encodeURI($ax.globalVariableProvider.getLinkUrl($ax.pageData.url));
+        window.location.href = targetUrl;
+    };
+
+    /**
+    Sets a variable.
+    # name: The name of the global variable to set
+    # value: The value that should be set
+    */
+    $ax.public.setGlobalVariable = $ax.setGlobalVariable = function(name, value) {
+        if(!name || !value) {
+            return;
+        }
+
+        $ax.globalVariableProvider.setVariableValue(name, value);
+    };
+
+    /**
+    Gets the value of a global variable
+    # name: The name of the global variable value to get
+    */
+    $ax.public.getGlobalVariable = $ax.getGlobalVariable = function(name) {
+        $ax.globalVariableProvider.getVariableValue(name);
+    };
+
+    $ax.getObjectFromElementIdDisregardHex = function (elementId) {
+        var elementIdInput = elementId.charAt(0) == '#' ? elementId.substring(1) : elementId;
+        return this.getObjectFromElementId(elementIdInput);
+    }
+
+
+    $ax.getTypeFromElementId = function(elementId) {
+        var obj = this.getObjectFromElementIdDisregardHex(elementId);
+        return obj && obj.type;
+    };
+
+    $ax.getNumFromPx = function(pxNum) {
+        return Number(pxNum.replace('px', ''));
+    }
+
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/drag.js b/src_old/resources/scripts/axure/drag.js
new file mode 100644
index 0000000..da15742
--- /dev/null
+++ b/src_old/resources/scripts/axure/drag.js
@@ -0,0 +1,278 @@
+$axure.internal(function($ax) {
+    var widgetDragInfo = new Object();
+    var _drag = {};
+    $ax.drag = _drag;
+
+    $ax.drag.GetWidgetDragInfo = function() {
+        return $.extend({}, widgetDragInfo);
+    };
+
+    $ax.drag.StartDragWidget = function(event, id) {
+        $ax.setjBrowserEvent(jQuery.Event(event));
+        //we should only start drag on one target, otherwise the _dragWidget and _stopDragWidget events from multiple targets will be conflicted
+        if(event.donotdrag || widgetDragInfo.started) return;
+
+        var x, y;
+        var tg;
+        if(IE_10_AND_BELOW) {
+            x = window.event.clientX + window.document.documentElement.scrollLeft + window.document.body.scrollLeft;
+            y = window.event.clientY + window.document.documentElement.scrollTop + window.document.body.scrollTop;
+            tg = window.event.srcElement;
+        } else {
+            if(event.changedTouches) {
+                x = event.changedTouches[0].pageX;
+                y = event.changedTouches[0].pageY;
+            } else {
+                x = event.pageX;
+                y = event.pageY;
+                event.preventDefault();
+            }
+            tg = event.target;
+        }
+
+        widgetDragInfo.started = true;
+        widgetDragInfo.hasDragged= false;
+        widgetDragInfo.widgetId = id;
+        widgetDragInfo.cursorStartX = x;
+        widgetDragInfo.cursorStartY = y;
+        widgetDragInfo.lastX = x;
+        widgetDragInfo.lastY = y;
+        widgetDragInfo.currentX = x;
+        widgetDragInfo.currentY = y;
+
+        widgetDragInfo.movedWidgets = new Object();
+        widgetDragInfo.startTime = (new Date()).getTime();
+        widgetDragInfo.targetWidget = tg;
+
+        var movedownName = IE_10_AND_BELOW && $ax.features.supports.windowsMobile ?
+            $ax.features.eventNames.mouseDownName : $ax.features.eventNames.mouseMoveName;
+        $ax.event.addEvent(document, movedownName, _dragWidget, true);
+        $ax.event.addEvent(document, $ax.features.eventNames.mouseUpName, _stopDragWidget, true);
+
+        //$ax.legacy.SuppressBubble(event);
+    };
+
+    var _dragWidget = function(event) {
+        $ax.setjBrowserEvent(jQuery.Event(event));
+
+        var x, y;
+        if(IE_10_AND_BELOW) {
+            x = window.event.clientX + window.document.documentElement.scrollLeft + window.document.body.scrollLeft;
+            y = window.event.clientY + window.document.documentElement.scrollTop + window.document.body.scrollTop;
+        } else {
+            if(event.changedTouches) {
+                x = event.changedTouches[0].pageX;
+                y = event.changedTouches[0].pageY;
+                //allow scroll (defaults) if only swipe events have cases and delta x is less than 5px and not blocking scrolling
+                var deltaX = x - widgetDragInfo.currentX;
+                var target = window.document.getElementById(widgetDragInfo.widgetId);
+                if($ax.event.hasSyntheticEvent(widgetDragInfo.widgetId, "onDrag") || $ax.event.hasSyntheticEvent(widgetDragInfo.widgetId, "onSwipeUp") ||
+                    $ax.event.hasSyntheticEvent(widgetDragInfo.widgetId, "onSwipeDown") || (deltaX * deltaX) > 25
+                    || ($ax.document.configuration.preventScroll && $ax.legacy.GetScrollable(target) == window.document.body)) {
+                    event.preventDefault();
+                }
+            } else {
+                x = event.pageX;
+                y = event.pageY;
+            }
+        }
+        widgetDragInfo.xDelta = x - widgetDragInfo.currentX;
+        widgetDragInfo.yDelta = y - widgetDragInfo.currentY;
+        widgetDragInfo.lastX = widgetDragInfo.currentX;
+        widgetDragInfo.lastY = widgetDragInfo.currentY;
+        widgetDragInfo.currentX = x;
+        widgetDragInfo.currentY = y;
+
+        widgetDragInfo.currentTime = (new Date()).getTime();
+
+        // $ax.legacy.SuppressBubble(event);
+
+        if(!widgetDragInfo.hasDragged) {
+            widgetDragInfo.hasDragged = true;
+            $ax.event.raiseSyntheticEvent(widgetDragInfo.widgetId, "onDragStart");
+
+            //only update to move cursor is we are moving objects
+            if($ax.event.hasSyntheticEvent(widgetDragInfo.widgetId, "onDrag")) {
+                widgetDragInfo.cursorChanged = true;
+                widgetDragInfo.oldBodyCursor = window.document.body.style.cursor;
+                window.document.body.style.cursor = 'move';
+                var widget = window.document.getElementById(widgetDragInfo.widgetId);
+                widgetDragInfo.oldCursor = widget.style.cursor;
+                widget.style.cursor = 'move';
+                //need to do this in order to change the cursor under nice scroll
+                var niceScrollContainer = $ax.adaptive.getNiceScrollContainer(widget);
+                if(niceScrollContainer) {
+                    widgetDragInfo.oldNiceScrollContainerCursor = niceScrollContainer.style.cursor;
+                    niceScrollContainer.style.cursor = 'move';
+                }
+            }
+        }
+
+        $ax.event.raiseSyntheticEvent(widgetDragInfo.widgetId, "onDrag");
+    };
+
+    var _suppressClickAfterDrag = function(event) {
+        _removeSuppressEvents();
+
+        $ax.legacy.SuppressBubble(event);
+    };
+
+    var _removeSuppressEvents = function () {
+        if(IE_10_AND_BELOW) {
+            $ax.event.removeEvent(event.srcElement, 'click', _suppressClickAfterDrag, undefined, true);
+            $ax.event.removeEvent(widgetDragInfo.targetWidget, 'mousemove', _removeSuppressEvents, undefined, true);
+        } else {
+            $ax.event.removeEvent(document, "click", _suppressClickAfterDrag, true);
+            $ax.event.removeEvent(document, 'mousemove', _removeSuppressEvents, true);
+        }
+    };
+
+    var _stopDragWidget = function(event) {
+        $ax.setjBrowserEvent(jQuery.Event(event));
+
+        var tg;
+
+
+        var movedownName = IE_10_AND_BELOW && $ax.features.supports.windowsMobile ?
+            $ax.features.eventNames.mouseDownName : $ax.features.eventNames.mouseMoveName;
+        $ax.event.removeEvent(document, movedownName, _dragWidget, true);
+        $ax.event.removeEvent(document, $ax.features.eventNames.mouseUpName, _stopDragWidget, true);
+
+        tg = IE_10_AND_BELOW ? window.event.srcElement : event.target;
+
+        if(widgetDragInfo.hasDragged) {
+            widgetDragInfo.currentTime = (new Date()).getTime();
+            $ax.event.raiseSyntheticEvent(widgetDragInfo.widgetId, "onDragDrop");
+
+            if($ax.globalVariableProvider.getVariableValue('totaldragx') < -30 && $ax.globalVariableProvider.getVariableValue('dragtime') < 1000) {
+                $ax.event.raiseSyntheticEvent(widgetDragInfo.widgetId, "onSwipeLeft");
+            }
+
+            if($ax.globalVariableProvider.getVariableValue('totaldragx') > 30 && $ax.globalVariableProvider.getVariableValue('dragtime') < 1000) {
+                $ax.event.raiseSyntheticEvent(widgetDragInfo.widgetId, "onSwipeRight");
+            }
+
+            var totalDragY = $ax.globalVariableProvider.getVariableValue('totaldragy');
+            if(totalDragY < -30 && $ax.globalVariableProvider.getVariableValue('dragtime') < 1000) {
+                $ax.event.raiseSyntheticEvent(widgetDragInfo.widgetId, "onSwipeUp");
+            }
+
+            if(totalDragY > 30 && $ax.globalVariableProvider.getVariableValue('dragtime') < 1000) {
+                $ax.event.raiseSyntheticEvent(widgetDragInfo.widgetId, "onSwipeDown");
+            }
+
+            if(widgetDragInfo.cursorChanged) {
+                window.document.body.style.cursor = widgetDragInfo.oldBodyCursor;
+                var widget = window.document.getElementById(widgetDragInfo.widgetId);
+                // It may be null if OnDragDrop filtered out the widget
+                if(widget != null) widget.style.cursor = widgetDragInfo.oldCursor;
+                //we don't seems need to reset nicescroll cursor on container, nicescroll seems updates its cursor 
+                // if(widgetDragInfo.oldNiceScrollContainerCursor != undefined) {
+                //     var niceScrollContainer = $ax.adaptive.getNiceScrollContainer(widget);
+                //     if(niceScrollContainer) niceScrollContainer.style.cursor = widgetDragInfo.oldNiceScrollContainerCursor;
+                //     widgetDragInfo.oldNiceScrollContainerCursor = undefined;
+                // }
+                widgetDragInfo.cursorChanged = undefined;
+            }
+
+            if(widgetDragInfo.targetWidget == tg && !event.changedTouches) {
+                // suppress the click after the drag on desktop browsers
+                if(IE_10_AND_BELOW && widgetDragInfo.targetWidget) {
+                    $ax.event.addEvent(widgetDragInfo.targetWidget, 'click', _suppressClickAfterDrag, true, true);
+                    $ax.event.addEvent(widgetDragInfo.targetWidget, "onmousemove", _removeSuppressEvents, true, true);
+                } else {
+                    $ax.event.addEvent(document, "click", _suppressClickAfterDrag, true);
+                    $ax.event.addEvent(document, "mousemove", _removeSuppressEvents, true);
+
+                }
+            }
+        }
+
+        widgetDragInfo.hasDragged = false;
+        widgetDragInfo.movedWidgets = new Object();
+        widgetDragInfo.started = false;
+
+        return false;
+    };
+
+    $ax.drag.GetDragX = function() {
+        if(widgetDragInfo.hasDragged) return widgetDragInfo.xDelta;
+        return 0;
+    };
+
+    $ax.drag.GetDragY = function() {
+        if(widgetDragInfo.hasDragged) return widgetDragInfo.yDelta;
+        return 0;
+    };
+
+    $ax.drag.GetTotalDragX = function() {
+        if(widgetDragInfo.hasDragged) return widgetDragInfo.currentX - widgetDragInfo.cursorStartX;
+        return 0;
+    };
+
+    $ax.drag.GetTotalDragY = function() {
+        if(widgetDragInfo.hasDragged) return widgetDragInfo.currentY - widgetDragInfo.cursorStartY;
+        return 0;
+    };
+
+    $ax.drag.GetDragTime = function() {
+        if(widgetDragInfo.hasDragged) return widgetDragInfo.currentTime - widgetDragInfo.startTime;
+        return 600000;
+    };
+
+    $ax.drag.LogMovedWidgetForDrag = function (id, dragInfo) {
+        dragInfo = dragInfo || widgetDragInfo;
+        if(dragInfo.hasDragged) {
+            var containerIndex = id.indexOf('_container');
+            if(containerIndex != -1) id = id.substring(0, containerIndex);
+
+            // If state or other non-widget id, this should not be dragged, and should exit out to avoid exceptions.
+            if(!$obj(id)) return;
+
+            var query = $ax('#' + id);
+            //var x = query.left();
+            //var y = query.top();
+            var viewportLocation = query.viewportLocation();
+            var x =  viewportLocation.left;
+            var y = viewportLocation.top;
+
+            var movedWidgets = dragInfo.movedWidgets;
+            if(!movedWidgets[id]) {
+                movedWidgets[id] = new Location(x, y);
+            }
+        }
+    };
+
+    var Location = function(x, y) {
+        this.x = x;
+        this.y = y;
+    };
+    $ax.drag.location = Location;
+
+    var Rectangle = $ax.drag.Rectangle = function(x, y, width, height) {
+        this.x = x;
+        this.y = y;
+        this.width = width;
+        this.height = height;
+        this.right = x + width;
+        this.bottom = y + height;
+    };
+
+    Rectangle.prototype.IntersectsWith = function(rect) {
+        if(this.Invalid()) return false;
+        if(rect.length) {
+            for(var i = 0; i < rect.length; i++) if(!rect[i].Invalid && this.IntersectsWith(rect[i])) return true;
+            return false;
+        }
+        if(rect.Invalid()) return false;
+        return this.x < rect.right && this.right > rect.x && this.y < rect.bottom && this.bottom > rect.y;
+    };
+
+    Rectangle.prototype.Invalid = function() {
+        return this.x == -1 && this.y == -1 && this.width == -1 && this.height == -1;
+    };
+
+    Rectangle.prototype.Move = function(x, y) {
+        return new Rectangle(x, y, this.width, this.height);
+    };
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/events.js b/src_old/resources/scripts/axure/events.js
new file mode 100644
index 0000000..9b83be5
--- /dev/null
+++ b/src_old/resources/scripts/axure/events.js
@@ -0,0 +1,1974 @@
+// ******* Features MANAGER ******** //
+
+$axure.internal(function($ax) {
+    var _features = $ax.features = {};
+    var _supports = _features.supports = {};
+
+    // Got this from http://stackoverflow.com/questions/11381673/javascript-solution-to-detect-mobile-browser
+    let isMobile = navigator.userAgent.match(/Android/i)
+        || navigator.userAgent.match(/webOS/i)
+        || navigator.userAgent.match(/iPhone/i)
+        || navigator.userAgent.match(/iPad/i)
+        || navigator.userAgent.match(/iPod/i)
+        || navigator.userAgent.match(/BlackBerry/i)
+        || navigator.userAgent.match(/Tablet PC/i)
+        || navigator.userAgent.match(/Windows Phone/i);
+
+    if(isMobile || navigator.maxTouchPoints || navigator.msMaxTouchPoints) {
+        _supports.touchstart = typeof window.ontouchstart !== 'undefined';
+        _supports.touchmove = typeof window.ontouchmove !== 'undefined';
+        _supports.touchend = typeof window.ontouchend !== 'undefined';
+
+        _supports.pointerdown = typeof window.onpointerdown !== 'undefined';
+        _supports.pointerup = typeof window.onpointerup !== 'undefined';
+        _supports.pointermove = typeof window.onpointermove !== 'undefined';
+    }
+    
+    _supports.mobile = _supports.touchstart && _supports.touchend && _supports.touchmove;
+                    // || _supports.pointerdown && _supports.pointerup && _supports.pointermove;
+    _supports.windowsMobile = navigator.userAgent.match(/Tablet PC/i) || navigator.userAgent.match(/Windows Phone/i);
+    
+    var _eventNames = _features.eventNames = {};
+    _eventNames.mouseDownName = _supports.touchstart ? 'touchstart' : _supports.pointerdown ? 'pointerdown' : 'mousedown';
+    _eventNames.mouseUpName = _supports.touchend ? 'touchend' : _supports.pointerup ? 'pointerup' : 'mouseup';
+    _eventNames.mouseMoveName = _supports.touchmove ? 'touchmove' : _supports.pointermove ? 'pointermove' : 'mousemove';
+});
+
+// ******* EVENT MANAGER ******** //
+$axure.internal(function ($ax) {
+    var isConsoleTracing = false
+    var isPageLoading = true;
+    var savedMessages = [];
+
+    // Every time Debug begins/ends tracing or a new Debug.js file finishes loading this value will be updated
+    $axure.messageCenter.addStateListener("isTracing", function (key, value) {
+        isConsoleTracing = value;
+        isPageLoading = false;
+
+        if (isConsoleTracing) {
+            for (var i = 0; i < savedMessages.length; i++) {
+                $ax.messageCenter.postMessage(savedMessages[i]["message"], savedMessages[i]["data"]);
+            }
+        }
+
+        savedMessages = [];
+    });
+
+    var postMessage = function (message, data) {
+        // While page is still loading, we do not know if Console is set to trace, so save messages until load is finished and trace status can be determined
+        if (isPageLoading) {
+            savedMessages.push({ 'message': message, 'data': data });
+        } else if (isConsoleTracing)  {
+            $ax.messageCenter.postMessage(message, data);
+        }
+    }
+
+    var _objectIdToEventHandlers = {};
+
+    var _jBrowserEvent = undefined;
+    $ax.setjBrowserEvent = function(event) {
+        _jBrowserEvent = event;
+    };
+
+    $ax.getjBrowserEvent = function() {
+        return _jBrowserEvent;
+    };
+
+    var _event = {};
+    $ax.event = _event;
+
+    //initilize state
+    _event.mouseOverObjectId = '';
+    _event.mouseDownObjectId = '';
+    _event.mouseOverIds = [];
+
+    var EVENT_NAMES = ['mouseenter', 'mouseleave', 'contextmenu', 'change', 'focus', 'blur'];
+
+
+    // Tap, double tap, and touch move, or synthetic.
+    if(!$ax.features.supports.mobile) {
+        EVENT_NAMES[EVENT_NAMES.length] = 'click';
+        EVENT_NAMES[EVENT_NAMES.length] = 'dblclick';
+        EVENT_NAMES[EVENT_NAMES.length] = 'mousemove';
+    }
+
+    // add the event names for the touch events
+    EVENT_NAMES[EVENT_NAMES.length] = $ax.features.eventNames.mouseDownName;
+    EVENT_NAMES[EVENT_NAMES.length] = $ax.features.eventNames.mouseUpName;
+
+    for(var i = 0; i < EVENT_NAMES.length; i++) {
+        var eventName = EVENT_NAMES[i];
+        //we need the function here to circumvent closure modifying eventName
+        _event[eventName] = (function(event_Name) {
+            return function(elementId, fn) {
+                var elementIdQuery = $jobj(elementId);
+                var type = $ax.getTypeFromElementId(elementId);
+
+                //we need specially track link events so we can enable and disable them along with
+                //their parent widgets
+                if(elementIdQuery.is('a')) _attachCustomObjectEvent(elementId, event_Name, fn);
+                //see notes below
+                else if($ax.IsTreeNodeObject(type)) _attachTreeNodeEvent(elementId, event_Name, fn);
+                else if ($ax.IsImageFocusable(type) && (event_Name == 'focus' || event_Name == 'blur')) {
+                    var suitableChild;
+                    var imgChild = $ax.repeater.applySuffixToElementId(elementId, '_img');
+                    var divChild = $ax.repeater.applySuffixToElementId(elementId, '_div');
+
+                    for (var j = 0; j < elementIdQuery[0].children.length; j++) {
+                        if (elementIdQuery[0].children[j].id == imgChild) suitableChild = imgChild;
+                        if (!suitableChild && elementIdQuery[0].children[j].id == divChild) suitableChild = divChild;
+                    }
+                    if(!suitableChild) suitableChild = imgChild;
+                    _attachDefaultObjectEvent($jobj(suitableChild), elementId, event_Name, fn);
+                } else {
+                    var inputId = $ax.INPUT(elementId);
+                    var isInput = $jobj(inputId).length != 0;
+                    var id = isInput && (event_Name == 'focus' || event_Name == 'blur') ? inputId : elementId;
+                    _attachDefaultObjectEvent($jobj(id), elementId, event_Name, fn);
+                }
+            };
+        })(eventName);
+    }
+
+    var AXURE_TO_JQUERY_EVENT_NAMES = {
+        'onMouseOver': 'mouseenter',
+        'onMouseOut': 'mouseleave',
+        'onContextMenu': 'contextmenu',
+        'onChange': 'change',
+        'onFocus': 'focus',
+        'onLostFocus': 'blur'
+    };
+
+    // Tap, double tap, and touch move, or synthetic.
+    if(!$ax.features.supports.mobile) {
+        AXURE_TO_JQUERY_EVENT_NAMES.onClick = 'click';
+        AXURE_TO_JQUERY_EVENT_NAMES.onDoubleClick = 'dblclick';
+        AXURE_TO_JQUERY_EVENT_NAMES.onMouseMove = 'mousemove';
+    }
+
+    AXURE_TO_JQUERY_EVENT_NAMES.onMouseDown = $ax.features.eventNames.mouseDownName;
+    AXURE_TO_JQUERY_EVENT_NAMES.onMouseUp = $ax.features.eventNames.mouseUpName;
+    //for dp, if mouse entered without leaving, don't fire mouse enter again
+    var mouseEnterGuard = {};
+    var _attachEvents = function (diagramObject, elementId, doMouseEnterGuard) {
+
+        var inputId = $ax.repeater.applySuffixToElementId(elementId, '_input');
+        var id = $jobj(inputId).length ? inputId : elementId;
+
+        for(var eventName in diagramObject.interactionMap) {
+            var jQueryEventName = AXURE_TO_JQUERY_EVENT_NAMES[eventName];
+            if(!jQueryEventName) continue;
+
+            _event[jQueryEventName](id,
+            //this is needed to escape closure
+                (function(axEventObject) {
+                    return function (e) {
+                        if(e.type == 'mouseenter' && doMouseEnterGuard) {
+                            if(mouseEnterGuard[elementId]) return;
+                            else mouseEnterGuard[elementId] = true;
+                        }
+
+                        $ax.setjBrowserEvent(e);
+                        //                        console.log(axEventObject.description);
+                        var eventInfo = $ax.getEventInfoFromEvent($ax.getjBrowserEvent(), false, elementId);
+                        _handleEvent(elementId, eventInfo, axEventObject);
+                    };
+                })(diagramObject.interactionMap[eventName])
+            );
+
+            if(jQueryEventName.toLowerCase() == 'mouseenter' && doMouseEnterGuard) {
+                $jobj(elementId).on('mouseleave touchend', function() {
+                    mouseEnterGuard[elementId] = false;
+                });
+            }
+        }
+
+    };
+
+    var _eventTypeToKey = { 'OnFocus': 'onFocus', 'OnLostFocus': 'onLostFocus' };
+    var _createProxies = function(diagramObject, elementId) {
+        var createFocus = _needsProxy(diagramObject, elementId, 'onFocus');
+        var createLostFocus = _needsProxy(diagramObject, elementId, 'onLostFocus');
+
+        if(!createFocus && !createLostFocus) return;
+
+        if(!diagramObject.interactionMap) diagramObject.interactionMap = {};
+        if(createFocus) diagramObject.interactionMap.onFocus = { proxy: true, eventType: 'OnFocus' };
+        if (createLostFocus) diagramObject.interactionMap.onLostFocus = { proxy: true, eventType: 'OnLostFocus' };
+    }
+
+    var preventDefaultEvents = ['OnContextMenu', 'OnKeyUp', 'OnKeyDown', 'OnPageContextMenu', 'OnPageKeyUp', 'OnPageKeyDown'];
+    var allowBubble = ['OnFocus', 'OnResize', 'OnMouseOut', 'OnMouseOver'];
+
+    var _canClick = true;
+    var _startScroll = [];
+    var _setCanClick = function(canClick) {
+        _canClick = canClick;
+        if(_canClick) _startScroll = [$(window).scrollLeft(), $(window).scrollTop()];
+    };
+
+    var _getCanClick = function () {
+        if(_startScroll.length == 0) return _canClick;
+        var endScroll = [$(window).scrollLeft(), $(window).scrollTop()];
+        return _canClick && _startScroll[0] == endScroll[0] && _startScroll[1] == endScroll[1];
+    };
+
+    //var _notAllowedInvisible = function (type) {
+    //     $ax.getTypeFromElementId(elementId);
+
+    //    return !$ax.public.fn.IsReferenceDiagramObject(type) && !$ax.public.fn.IsLayer(type);
+    //}
+
+
+    var _notAllowedInvisible = function (id) {
+        var type = $ax.getTypeFromElementId(id);
+        if ($ax.public.fn.IsReferenceDiagramObject(type) || $ax.public.fn.IsLayer(type)) return false;
+        return !($ax.public.fn.IsVector(type) && _hasCompoundImage(id)); 
+    }
+
+    var _hasCompoundImage = function (id) {
+        var query = $jobj(id);
+        return $ax.public.fn.isCompoundVectorHtml(query[0]);
+    }
+
+    var _suppressedEvents = {}; // Suppressed for next occurance.
+    var _blockedEvents = {}; // Blocked until unblocked.
+    _event.addSuppressedEvent = function(id, event) {
+        if(!_suppressedEvents[id]) _suppressedEvents[id] = [];
+        var events = _suppressedEvents[id];
+        if(events.indexOf(event) != -1) return;
+        events.push(event);
+    }
+
+    _event.blockEvent = function(id, event) {
+        if(!_blockedEvents[id]) _blockedEvents[id] = {};
+        var events = _blockedEvents[id];
+        if(events[event]) ++events[event];
+        else events[event] = 1;
+        return function() { _unblockEvent(id, event); };
+    }
+
+    var _isSuppressedEvent = function(id, event) {
+        var suppressedEvents = _suppressedEvents[id];
+        var blockedEvents = _blockedEvents[id];
+        return (suppressedEvents && suppressedEvents.indexOf(event) != -1) || (blockedEvents && blockedEvents[event]);
+    }
+
+    var _removeSuppressedEvent = function(id, event) {
+        var events = _suppressedEvents[id];
+        if(!events) return;
+        if(events.length == 1) {
+            delete _suppressedEvents[id];
+        } else {
+            var eventIndex = events.indexOf(event);
+            for(var i = eventIndex + 1; i < events.length; i++) events[i - 1] = events[i];
+            events.pop();
+        }
+    }
+    var _unblockEvent = function(id, event) {
+        var events = _blockedEvents[id];
+        if(events) {
+            if(--events[event] > 0) return;
+        }
+        _removeSuppressedEvent(id, event);
+    }
+
+    var _unblockEvent = function(id, event) {
+        var events = _blockedEvents[id];
+        if(events) {
+            if(--events[event] > 0) return;
+        }
+        _removeSuppressedEvent(id, event);
+    }
+
+    var eventNesting = 0;
+    var eventNestingTime = new Date().getTime();
+
+    var _handleEvent = $ax.event.handleEvent = function (elementId, eventInfo, axEventObject, skipShowDescriptions, synthetic) {
+        var eventType = axEventObject.eventType;
+        if(_enteredWidgets[elementId] && eventType == 'OnMouseEnter') return; // Suppress entering a widget when already in widget (ie only)
+        if(_isSuppressedEvent(elementId, eventType)) {
+            _removeSuppressedEvent(elementId, eventType);
+            return;
+        }
+
+        if(axEventObject.proxy) {
+            var firingId = _widgetToFocusParent[elementId];
+            if(firingId) {
+                var firingObj = $obj(firingId);
+                var nextEventObj = firingObj.interactionMap && firingObj.interactionMap[_eventTypeToKey[eventType]];
+                if(!nextEventObj) nextEventObj = axEventObject;
+                _handleEvent(firingId, eventInfo, nextEventObj, skipShowDescriptions, synthetic);
+            }
+            return;
+        }
+//        var x = JSON.stringify(eventInfo);
+//        var y = JSON.stringify(axEventObject);
+
+        var fireTime = new Date().getTime();
+
+        if(fireTime - eventNestingTime > 100) {
+            eventNestingTime = fireTime;
+            eventNesting = 0;
+        }
+
+        if(eventNesting === 0) {
+            $ax.recording.maybeRecordEvent(elementId, eventInfo, axEventObject, fireTime);
+        }
+
+        eventNesting += 1;
+
+        if (!synthetic && !_getCanClick() && (eventType == 'OnClick' || eventType == 'OnPageClick')) return;
+        // If you are supposed to suppress, do that right away.
+        if(suppressedEventStatus[eventType]) {
+            return;
+        }
+
+        var currentEvent = $ax.getjBrowserEvent();
+        if(!synthetic && currentEvent && currentEvent.originalEvent && currentEvent.originalEvent.handled && !eventInfo.isMasterEvent) return;
+        if(!synthetic && elementId && !$ax.style.getObjVisible(elementId) && _notAllowedInvisible(elementId)) return;
+
+        //if debug
+        var axObj = $obj(elementId);
+        var axObjLabel = axObj ? axObj.label : eventInfo.label;
+        var axObjType = axObj ? axObj.friendlyType : eventInfo.friendlyType;
+        if (!skipShowDescriptions || eventType == 'OnPageLoad') postMessage('axEvent', { 'label': axObjLabel, 'type': axObjType, 'event': axEventObject });
+
+        var bubble = true;
+        var showCaseDescriptions = !skipShowDescriptions && _shouldShowCaseDescriptions(axEventObject);
+        if(!showCaseDescriptions) {
+            //handle case descriptions
+            var caseGroups = [];
+            var currentCaseGroup = [];
+            caseGroups[0] = currentCaseGroup;
+
+            // Those refreshes not after a wait
+            var guaranteedRefreshes = {};
+
+            var caseGroupIndex = 0;
+            for(var i = 0; i < axEventObject.cases.length; i++) {
+                var currentCase = axEventObject.cases[i];
+                if(currentCase.isNewIfGroup && i != 0) {
+                    caseGroupIndex++;
+                    currentCaseGroup = [];
+                    caseGroups[caseGroups.length] = currentCaseGroup;
+                    // Joon: Isn't caseGroups.length always equal to caseGroupIndex?
+                }
+                currentCaseGroup[currentCaseGroup.length] = currentCase;
+
+                for(var j = 0; j < currentCase.actions.length; j++) {
+                    var action = currentCase.actions[j];
+                    if(action.action == 'wait') break;
+                    if(action.action != 'refreshRepeater') continue;
+                    for(var k = 0; k < action.repeatersToRefresh.length; k++) {
+                        var id = $ax.getElementIdsFromPath(action.repeatersToRefresh[k], eventInfo)[0];
+                        if(id) guaranteedRefreshes[id] = caseGroupIndex;
+                    }
+                }
+            }
+
+            for(var i = 0; i < caseGroups.length; i++) {
+                var groupRefreshes = [];
+                for(var key in guaranteedRefreshes) {
+                    if(guaranteedRefreshes[key] == i) groupRefreshes[groupRefreshes.length] = key;
+                }
+                bubble = _handleCaseGroup(eventInfo, caseGroups[i], groupRefreshes) && bubble;
+            }
+        } else {
+            _showCaseDescriptions(elementId, eventInfo, axEventObject, synthetic);
+            bubble = false;
+        }
+
+        // If not handled, synthetically bubble if you can
+        if(bubble && _widgetToFocusParent[elementId]) {
+            firingId = _widgetToFocusParent[elementId];
+            if(firingId) {
+                firingObj = $obj(firingId);
+                nextEventObj = firingObj.interactionMap && firingObj.interactionMap[_eventTypeToKey[eventType]];
+                if(!nextEventObj) nextEventObj = axEventObject;
+                _handleEvent(firingId, eventInfo, nextEventObj, skipShowDescriptions, synthetic);
+            }
+            return;
+        }
+
+        // Only trigger a supression if it handled this event
+        if(!bubble && suppressingEvents[eventType]) {
+            suppressedEventStatus[suppressingEvents[eventType]] = true;
+        }
+
+        $ax.action.flushAllResizeMoveActions(eventInfo);
+
+        // This should not be needed anymore. All refreshes should be inserted, or handled earlier.
+        var repeaters = $ax.deepCopy($ax.action.repeatersToRefresh);
+        while($ax.action.repeatersToRefresh.length) $ax.action.repeatersToRefresh.pop();
+        for(i = 0; i < repeaters.length; i++) $ax.repeater.refreshRepeater(repeaters[i], eventInfo);
+
+        if(currentEvent && currentEvent.originalEvent) {
+            currentEvent.originalEvent.handled = !synthetic && !bubble && allowBubble.indexOf(eventType) == -1;
+            //currentEvent.originalEvent.donotdrag = currentEvent.donotdrag || (!bubble && eventDescription == 'OnMouseDown');
+
+            // Prevent default if necessary
+            if (currentEvent.originalEvent.handled && preventDefaultEvents.indexOf(eventType) != -1) {
+                currentEvent.preventDefault();
+            }
+        }
+
+        eventNesting -= 1;
+
+        if(!showCaseDescriptions) postMessage('axEventComplete');
+
+    };
+
+    var _handleScrollEvent = function (elementId, eventInfo, originalEvent, scrolledUp, scrolledDown, interactionMap, skipShowDescription, synthetic) {
+        if (!interactionMap) return;
+        if (interactionMap.onScroll) _handleEvent(elementId, eventInfo, interactionMap.onScroll, skipShowDescription, synthetic);
+
+        var wasHandled = originalEvent.handled;
+        if (interactionMap.onScrollUp && scrolledUp) {
+            originalEvent.handled = false;
+            _handleEvent(elementId, eventInfo, interactionMap.onScrollUp, skipShowDescription, synthetic);
+        } else if (interactionMap.onScrollDown && scrolledDown) {
+            originalEvent.handled = false;
+            _handleEvent(elementId, eventInfo, interactionMap.onScrollDown, skipShowDescription, synthetic);
+        }
+        originalEvent.handled |= wasHandled;
+    }
+
+    var _showCaseDescriptions = function(elementId, eventInfo, axEventObject, synthetic) {
+
+        if(axEventObject.cases.length == 0) return true;
+
+        var linksId = elementId + "linkBox";
+        $('#' + linksId).remove();
+
+        var $container = $("<div class='intcases' id='" + linksId + "'></div>");
+
+        if(!_isEventSimulating(axEventObject)) {
+            var copy = $ax.eventCopy(eventInfo);
+            for(var i = 0; i < axEventObject.cases.length; i++) {
+                var $link = $("<div class='intcaselink'>" + axEventObject.cases[i].description + "</div>");
+                $link.click(function(j) {
+                    return function () {
+                        var currentCase = axEventObject.cases[j];
+                        postMessage('axCase', { 'item': currentCase.description, 'description': currentCase.conditionString, 'color': currentCase.caseColorHex })
+                        for(var k = 0; k < currentCase.actions.length; k++) {
+                            var currentAction = currentCase.actions[k];
+
+                            // Only use action's direct description if no action info descriptions exist
+                            postMessage('axAction', { 'name': currentAction.displayName });
+                            //postMessage('axAction', { 'item': currentAction.description, 'description': (Object.keys(currentAction.actionInfoDescriptions).length > 0 ? "" : currentAction.description) });
+
+                            for (var target in currentAction.actionInfoDescriptions) {
+                                var infoDescriptions = currentAction.actionInfoDescriptions[target];
+                                for (var shortDescription in infoDescriptions) {
+                                    postMessage('axInfo', { 'item': target, 'description': shortDescription, 'longDescription': infoDescriptions[shortDescription] });
+                                }
+                            }
+                        }
+                        postMessage('axEventComplete');
+
+                        var bubble = $ax.action.dispatchAction(copy, axEventObject.cases[j].actions);
+                        $ax.action.flushAllResizeMoveActions(copy);
+                        $('#' + linksId).remove();
+                        return bubble;
+                    };
+                } (i)
+                );
+
+                $container.append($link);
+            }
+        } else {
+            var fullDescription = axEventObject.description + ":<br>";
+            for(var i = 0; i < axEventObject.cases.length; i++) {
+                var currentCase = axEventObject.cases[i];
+                fullDescription += "&nbsp;&nbsp;" + currentCase.description.replace(/<br>/g, '<br>&nbsp;&nbsp;') + ":<br>";
+                for(var j = 0; j < currentCase.actions.length; j++) {
+                    fullDescription += "&nbsp;&nbsp;&nbsp;&nbsp;" + currentCase.actions[j].description.replace(/<br>/g, '<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;') + "<br>";
+                }
+            }
+            fullDescription = fullDescription.substring(0, fullDescription.length - 4);
+
+            var $link = $("<div class='intcaselink'>" + fullDescription + "</div>");
+            $link.click(function() {
+                _handleEvent(elementId, eventInfo, axEventObject, true, synthetic);
+                postMessage('axEventComplete');
+                $('#' + linksId).remove();
+                return;
+            });
+            $container.append($link);
+        }
+        $container.mouseleave(function(e) { $ax.legacy.SuppressBubble(e); });
+        $('body').append($container);
+        _showCaseLinks(eventInfo, linksId);
+    };
+
+    var _showCaseLinks = function(eventInfo, linksId) {
+        var links = window.document.getElementById(linksId);
+
+        links.style.top = eventInfo.pageY;
+
+        var left = eventInfo.pageX;
+        links.style.left = left;
+        $ax.visibility.SetVisible(links, true);
+        $ax.legacy.BringToFront(linksId, true);
+        // Switch to using jquery if this is still needed. Really old legacy code, likely for a browser no longer supported. 
+        //$ax.legacy.RefreshScreen();
+    };
+
+
+    var _shouldShowCaseDescriptions = function(axEventObject) {
+        if($ax.document.configuration.linkStyle == "alwaysDisplayTargets") return true;
+        if($ax.document.configuration.linkStyle == "neverDisplayTargets") return false;
+        if(axEventObject.cases.length == 0) return false;
+        if(_isEventSimulating(axEventObject)) return false;
+        if(axEventObject.cases.length >= 2) return true;
+        return false;
+    };
+
+    var _isEventSimulating = function(axEventObject) {
+        for(var i = 0; i < axEventObject.cases.length; i++) {
+            if(axEventObject.cases[i].condition) return true;
+        }
+        return false;
+    };
+
+    var _handleCaseGroup = function(eventInfo, caseGroup, groupRefreshes) {
+        for(var i = 0; i < caseGroup.length; i++) {
+            var currentCase = caseGroup[i];
+            if(!currentCase.condition || _processCondition(currentCase.condition, eventInfo)) {
+                postMessage('axCase', { 'item': currentCase.description, 'description': currentCase.conditionString, 'color': currentCase.caseColorHex })
+                
+                for(var j = 0; j < currentCase.actions.length; j++) {
+                    var currentAction = currentCase.actions[j];
+                    if (currentAction.action != 'refreshRepeater') {
+                        // Only use action's direct description if no action info descriptions exist
+                        postMessage('axAction', { 'name': currentAction.displayName });
+                        //postMessage('axAction', { 'item': currentAction.description, 'description': (Object.keys(currentAction.actionInfoDescriptions).length > 0 ? "" : currentAction.description) });
+
+                        for (var target in currentAction.actionInfoDescriptions) {
+                            var infoDescriptions = currentAction.actionInfoDescriptions[target];
+                            for (var shortDescription in infoDescriptions) {
+                                postMessage('axInfo', { 'item': target, 'description': shortDescription, 'longDescription': infoDescriptions[shortDescription] });
+                            }
+                        }
+                    }
+                }
+
+                for(var j = 0; j < currentCase.actions.length; j++) {
+                    var action = currentCase.actions[j];
+                    if(action.action == 'wait') break;
+                    if(action.action != 'refreshRepeater') continue;
+                    for(var k = 0; k < action.repeatersToRefresh.length; k++) {
+                        var id = $ax.getElementIdsFromPath(action.repeatersToRefresh[i], eventInfo)[i];
+                        if(id) {
+                            var index = groupRefreshes.indexOf(id);
+                            if(index != -1) $ax.splice(groupRefreshes, index);
+                        }
+                    }
+                }
+
+                // Any guaranteed refreshes that aren't accounted for must be run still.
+                $ax.action.tryRefreshRepeaters(groupRefreshes, eventInfo);
+
+                $ax.action.dispatchAction(eventInfo, currentCase.actions);
+                return false;
+            }
+        }
+
+        // Any guaranteed refreshes that aren't accounted for must be run still.
+        $ax.action.tryRefreshRepeaters(groupRefreshes, eventInfo);
+        return true;
+    };
+
+    var _processCondition = function(expr, eventInfo) {
+        return $ax.expr.evaluateExpr(expr, eventInfo);
+    };
+
+    var _attachTreeNodeEvent = function(elementId, eventName, fn) {
+        //we need to set the cursor here because we want to make sure that every tree node has the default
+        //cursor set and then it's overridden if it has a click
+        if(eventName == 'click') window.document.getElementById(elementId).style.cursor = 'pointer';
+
+        _attachCustomObjectEvent(elementId, eventName, fn);
+    };
+
+    var _attachDefaultObjectEvent = function(elementIdQuery, elementId, eventName, fn) {
+        var func = function() {
+            if(!$ax.style.IsWidgetDisabled(elementId)) return fn.apply(this, arguments);
+            return true;
+        };
+
+        var bind = !elementIdQuery[eventName];
+        if(bind) elementIdQuery.bind(eventName, func);
+        else elementIdQuery[eventName](func);
+    };
+
+    var _attachCustomObjectEvent = function(elementId, eventName, fn) {
+        var handlers = _objectIdToEventHandlers[elementId];
+        if(!handlers) _objectIdToEventHandlers[elementId] = handlers = {};
+
+        var fnList = handlers[eventName];
+        if(!fnList) handlers[eventName] = fnList = [];
+
+        fnList[fnList.length] = fn;
+    };
+
+    var _fireObjectEvent = function(elementId, event, originalArgs) {
+        var element = window.document.getElementById(elementId);
+
+        var handlerList = _objectIdToEventHandlers[elementId] && _objectIdToEventHandlers[elementId][event];
+        if(handlerList) {
+            for(var i = 0; i < handlerList.length; i++) handlerList[i].apply(element, originalArgs);
+        }
+
+        eventNesting -= 1;
+
+    };
+
+    var _layerToFocusableWidget = {};
+    var _widgetToFocusParent = {};
+    _event.layerMapFocus = function(layer, elementId) {
+        var mainObj = layer.objs[0];
+        // If first child non existant return
+        if (!mainObj) return;
+
+        var mainId = $ax.getElementIdFromPath([mainObj.id], { relativeTo: elementId });
+        _widgetToFocusParent[mainId] = elementId;
+
+        // If first child is a layer, call recursively
+        if ($ax.public.fn.IsLayer(mainObj.type)) {
+            _event.layerMapFocus(mainObj, mainId);
+            var baseId = _layerToFocusableWidget[mainId];
+            if(baseId) _layerToFocusableWidget[elementId] = baseId;
+            return;
+        }
+
+        _layerToFocusableWidget[elementId] = mainId;
+    }
+
+    var _needsProxy = function(obj, id, proxyName) {
+        // layers don't need on focus ever, proxies will handle them
+        if ($ax.public.fn.IsLayer(obj.type)) return false;
+        // If you already focus you don't need to force yourself to proxy.
+        if(obj.interactionMap && obj.interactionMap[proxyName]) return false;
+
+        var parentId = _widgetToFocusParent[id];
+        if(parentId) return _needsProxyHelper(parentId, proxyName);
+        return false;
+    }
+
+    var _needsProxyHelper = function(id, proxyName) {
+        var obj = $obj(id);
+        if(obj.interactionMap && obj.interactionMap[proxyName]) return true;
+
+        var parentId = _widgetToFocusParent[id];
+        if(parentId) return _needsProxyHelper(parentId, proxyName);
+        return false;
+    }
+
+    //for button shapes and images the img is focusable instead of the div to get better outlines
+    // For layers, we remember who their proxy is.
+    $ax.event.getFocusableWidgetOrChildId = function (elementId) {
+        var mappedId = _layerToFocusableWidget[elementId];
+        if (mappedId) elementId = mappedId;
+
+        var inputId = $ax.repeater.applySuffixToElementId(elementId, '_input');
+        var inputQuery = $jobj(inputId);
+        if(inputQuery.length > 0) return inputId;
+
+        var imgId = $ax.repeater.applySuffixToElementId(elementId, '_img');
+        var imgQuery = $jobj(imgId);
+        if (imgQuery.length > 0) return imgId;
+
+        var divId = $ax.repeater.applySuffixToElementId(elementId, '_div');
+        var divQuery = $jobj(divId);
+        if (divQuery.length > 0) return divId;
+
+        return elementId;
+    };
+
+    var _enteredWidgets = {};
+
+    // key is the suppressing event, and the value is the event that is supressed
+    var suppressingEvents = {};
+    // key is the event that will cancel the suppression, and value is the event that was being suppressed
+    var cancelSuppressions = {};
+    // suppressed event maps to true if it is supressed
+    var suppressedEventStatus = {};
+
+    var initSuppressingEvents = function () {
+        suppressingEvents['OnLongClick'] = 'OnClick';
+        cancelSuppressions['onMouseDown'] = 'OnClick';
+
+        // Have to cancel suppressed event here. Only works for non-synthetic events currently
+        for(var key in cancelSuppressions) {
+            var jEventName = AXURE_TO_JQUERY_EVENT_NAMES[key];
+            if(!jEventName) continue;
+            $('body').bind(jEventName, function () {
+                suppressedEventStatus[cancelSuppressions[key]] = false;
+            });
+        }
+    };
+
+    // TODO: It may be a good idea to split this into multiple functions, or at least pull out more similar functions into private methods
+    var _initializeObjectEvents = function(query, refreshType) {
+        var skipSelectedIds = new Set();
+        query.each(function (dObj, elementId) {
+            if (dObj == null) return;       // TODO: Update expo items that pass here to potentially remove this logic
+            var $element = $jobj(elementId);
+            var itemId = $ax.repeater.getItemIdFromElementId(elementId);
+
+            // Focus has to be done before on focus fires
+            // Set up focus
+            if ($ax.public.fn.IsTextArea(dObj.type) || $ax.public.fn.IsTextBox(dObj.type) || $ax.public.fn.IsCheckBox(dObj.type) || $ax.public.fn.IsRadioButton(dObj.type) ||
+                $ax.public.fn.IsListBox(dObj.type) || $ax.public.fn.IsComboBox(dObj.type) || $ax.public.fn.IsButton(dObj.type) ||
+                (dObj.tabbable && ($ax.public.fn.IsImageBox(dObj.type) || $ax.public.fn.IsVector(dObj.type) || $ax.IsTreeNodeObject(dObj.type) || $ax.public.fn.IsTableCell(dObj.type)))) {
+                var focusObj = $jobj($ax.event.getFocusableWidgetOrChildId(elementId));
+                focusObj.focus(function() {
+                    window.lastFocusedControl = elementId;
+                    $ax.style.SetWidgetFocused(elementId, true);
+                });
+                focusObj.blur(function() {
+                    $ax.style.SetWidgetFocused(elementId, false);
+                });
+            }
+            // [MAS: Supressing events were here]
+            _createProxies(dObj, elementId);
+            var isDynamicPanel = $ax.public.fn.IsDynamicPanel(dObj.type);
+            if(dObj.interactionMap) {
+                _attachEvents(dObj, elementId, isDynamicPanel);
+            };
+
+
+
+            if (IE || $axure.browser.isEdge) {
+                $element.mouseenter(function() {
+                    _enteredWidgets[elementId] = true;
+                }).mouseleave(function() {
+                    _enteredWidgets[elementId] = false;
+                });
+            }
+
+            _attachIxStyleEvents(dObj, elementId, $element);
+
+            var $axElement = $ax('#' + elementId);
+            // Base case is set up selected disabled based on the default in the axobj, for non, repeaters and resetting repeaters
+            var itemReset = refreshType == $ax.repeater.refreshType.reset;
+            if(!itemId || itemReset) {
+                //initialize disabled elements, do this first before selected, cause if a widget is disabled, we don't want to apply selected style anymore
+                if ($ax.public.fn.IsVector(dObj.type) || $ax.public.fn.IsImageBox(dObj.type) || isDynamicPanel || $ax.public.fn.IsLayer(dObj.type)
+                    || $ax.public.fn.IsTextBox(dObj.type) || $ax.public.fn.IsTextArea(dObj.type) || $ax.public.fn.IsComboBox(dObj.type) || $ax.public.fn.IsListBox(dObj.type)
+                    || $ax.public.fn.IsCheckBox(dObj.type) || $ax.public.fn.IsRadioButton(dObj.type)) {
+
+                    if (dObj.disabled) $axElement.enabled(false);
+
+                    // Initialize selected elements
+                    // only set one member of selection group selected since subsequent calls
+                    // will unselect the previous one anyway
+                    if(dObj.selected && !skipSelectedIds.has(elementId)) {
+                        var group = $('#' + elementId).attr('selectiongroup');
+                        if(group) for(var item of $("[selectiongroup='" + group + "']")) skipSelectedIds.add(item.id);
+                        $axElement.selected(true);
+                    }
+                }
+            } else if(refreshType == $ax.repeater.refreshType.preEval) {
+                // Otherwise everything should be set up correctly by pre-eval, want to set up selected disabled dictionaries (and disabled status)
+                // Disabled layer/dynamic panel don't have the disabled class, but they do have the disabled attr written out, so use that in that case
+                if ($element.hasClass('disabled') ||
+                    (($ax.IsLayer(dObj.type) || $ax.IsDynamicPanel(dObj.type)) && $element.attr('disabled'))) $axElement.enabled(false);
+                if($element.hasClass('selected')) $axElement.selected(true);
+            } else {
+                // Persist means we want to leave it as is, but we want to make sure we use selected based off of the backing data, and not some class that exists because of the reset
+                $element.removeClass('selected');
+            }
+
+            //if(OS_MAC && WEBKIT) {
+            //    if ($ax.public.fn.IsComboBox(dObj.type) && dObj.disabled) {
+            //        $jobj($ax.INPUT(elementId)).css('color', 'grayText');
+            //    }
+            //};
+
+            // Initialize Placeholders. Right now this is text boxes and text areas.
+            // Also, the assuption is being made that these widgets with the placeholder, have no other styles (this may change...)
+            var hasPlaceholder = dObj.placeholderText == '' ? true : Boolean(dObj.placeholderText);
+            if(($ax.public.fn.IsTextArea(dObj.type) || $ax.public.fn.IsTextBox(dObj.type)) && hasPlaceholder) {
+                // This is needed to initialize the placeholder state
+                var inputJobj = $jobj($ax.INPUT(elementId));
+                inputJobj.bind('focus', function () {
+                    if(dObj.HideHintOnFocused) {
+                        var id = this.id;
+                        var inputIndex = id.indexOf('_input');
+                        if (inputIndex == -1) return;
+                        var inputId = id.substring(0, inputIndex);
+
+                        if (!$ax.placeholderManager.isActive(inputId)) return;
+                        $ax.placeholderManager.updatePlaceholder(inputId, false, true);
+                    }
+                    $ax.placeholderManager.moveCaret(this.id);
+                }).bind('mouseup', function() {
+                    $ax.placeholderManager.moveCaret(this.id);
+                }).bind('blur', function() {
+                    var id = this.id;
+                    var inputIndex = id.indexOf('_input');
+                    if(inputIndex == -1) return;
+                    var inputId = id.substring(0, inputIndex);
+
+                    if($jobj(id).val()) return;
+                    $ax.placeholderManager.updatePlaceholder(inputId, true);
+                });
+
+                if(ANDROID) {
+                    //input fires before keyup, to avoid flicker, supported in ie9 and above
+                    inputJobj.bind('input', function() {
+                        if(!dObj.HideHintOnFocused) { //hide on type
+                            var id = this.id;
+                            var inputIndex = id.indexOf('_input');
+                            if(inputIndex == -1) return;
+                            var inputId = id.substring(0, inputIndex);
+
+                            if($ax.placeholderManager.isActive(inputId)) {
+                                $ax.placeholderManager.updatePlaceholder(inputId, false, true);
+                            } else if(!$jobj(id).val()) {
+                                $ax.placeholderManager.updatePlaceholder(inputId, true, false);
+                                $ax.placeholderManager.moveCaret(id, 0);
+                            }
+                        }
+                    });
+                } else {
+                    inputJobj.bind('keydown', function() {
+                        if(!dObj.HideHintOnFocused) {
+                            var id = this.id;
+                            var inputIndex = id.indexOf('_input');
+                            if(inputIndex == -1) return;
+                            var inputId = id.substring(0, inputIndex);
+
+                            if(!$ax.placeholderManager.isActive(inputId)) return;
+                            $ax.placeholderManager.updatePlaceholder(inputId, false, true);
+                        }
+                    }).bind('keyup', function(e) {
+                        var id = this.id;
+                        var inputIndex = id.indexOf('_input');
+                        if(inputIndex == -1) return;
+                        var inputId = id.substring(0, inputIndex);
+
+                        if($ax.placeholderManager.isActive(inputId)) return;
+                        if(!dObj.HideHintOnFocused && !$jobj(id).val()) {
+                            $ax.placeholderManager.updatePlaceholder(inputId, true);
+                            $ax.placeholderManager.moveCaret(id, 0);
+                        }
+
+                        //prevents triggering player shortcuts
+                        e.preventDefault();
+                    });
+                }
+
+                $ax.placeholderManager.registerPlaceholder(elementId, dObj.placeholderText, inputJobj.attr('type') == 'password');
+                $ax.placeholderManager.updatePlaceholder(elementId, !($jobj($ax.repeater.applySuffixToElementId(elementId, '_input')).val()));
+            }
+
+            // Initialize assigned submit buttons
+            if(dObj.submitButton) {
+                $element.keyup(function(e) {
+                    if(e.keyCode == '13') {
+                        var scriptId = $ax.repeater.getScriptIdFromElementId(elementId);
+                        var path = $ax.deepCopy(dObj.submitButton.path);
+                        path[path.length] = dObj.submitButton.id;
+                        var itemNum = $ax.repeater.getItemIdFromElementId(elementId);
+                        var submitId = $ax.getScriptIdFromPath(path, scriptId);
+
+                        if(itemNum && $ax.getParentRepeaterFromScriptId(submitId) == $ax.getParentRepeaterFromScriptId(scriptId)) {
+                            submitId = $ax.repeater.createElementId(submitId, itemNum);
+                        }
+                        var inputId = $ax.INPUT(submitId);
+                        if($jobj(inputId).length) submitId = inputId;
+
+                        $ax.setjBrowserEvent(e);
+                        $ax.event.fireClick(submitId);
+                    }
+                }).keydown(function(e) {
+                    if(e.keyCode == '13') {
+                        e.preventDefault();
+                    }
+                });
+            }
+
+            // Don't drag after mousing down on a plain text object
+            if ($ax.public.fn.IsTextArea(dObj.type) || $ax.public.fn.IsTextBox(dObj.type) || $ax.public.fn.IsListBox(dObj.type) || 
+                $ax.public.fn.IsComboBox(dObj.type) || $ax.public.fn.IsCheckBox(dObj.type) || $ax.public.fn.IsRadioButton(dObj.type)) {
+                $element.bind($ax.features.eventNames.mouseDownName, function(event) {
+                    event.originalEvent.donotdrag = true;
+                });
+            }
+
+            $element.bind($ax.features.eventNames.mouseDownName, function() { _setCanClick(true); });
+            if (isDynamicPanel) {
+                $element.children().scroll(function () { _setCanClick(false); });
+            }
+
+            //initialize tree node cursors to default so they will override their parent
+            if ($ax.public.fn.IsTreeNodeObject(dObj.type) && !(dObj.interactionMap && dObj.interactionMap.onClick)) {
+                $element.css('cursor', 'default');
+            }
+
+            //initialize widgets that are clickable to have the pointer over them when hovering
+            if($ax.event.HasClick(dObj)) {
+                if($element) $element.css('cursor', 'pointer');
+            }
+
+            // TODO: not sure if we need this. It appears to be working without
+            //initialize panels for DynamicPanels
+            if (isDynamicPanel) {
+                $element.children().each(function() {
+                    var parts = this.id.split('_');
+                    var state = parts[parts.length - 1].substring(5);
+                    if(state != 0) $ax.visibility.SetVisible(this, false);
+                });
+            }
+
+            //initialize TreeNodes
+            if ($ax.public.fn.IsTreeNodeObject(dObj.type)) {
+                if($element.hasClass('treeroot')) return;
+
+                var childrenId = elementId + '_children';
+                var children = $element.children('[id="' + childrenId + '"]:first');
+                if(children.length > 0) {
+                    var plusMinusId = 'u' + (parseInt($ax.repeater.getScriptIdFromElementId(elementId).substring(1)) + 1);
+                    if(itemId) plusMinusId = $ax.repeater.createElementId(plusMinusId, itemId);
+                    if(!$jobj(plusMinusId).children().first().is('img')) plusMinusId = '';
+                    $ax.tree.InitializeTreeNode(elementId, plusMinusId, childrenId);
+                }
+                $element.click(function() { $ax.tree.SelectTreeNode(elementId, true); });
+            }
+
+            //initialize submenus
+            if ($ax.public.fn.IsMenuObject(dObj.type)) {
+                if($element.hasClass('sub_menu')) {
+                    var tableCellElementId = $ax.getElementIdFromPath([dObj.parentCellId], { relativeTo: elementId });
+                    $ax.menu.InitializeSubmenu(elementId, tableCellElementId);
+                }
+            }
+
+            // Attach handles for dynamic panels that propagate styles to inner items.
+            if ((isDynamicPanel || $ax.public.fn.IsLayer(dObj.type)) && dObj.propagate) {
+                $element.mouseenter(function() {
+                    dynamicPanelMouseOver(this.id);
+                }).mouseleave(function() {
+                    dynamicPanelMouseLeave(this.id);
+                }).bind($ax.features.eventNames.mouseDownName, function() {
+                    dynamicPanelMouseDown(this.id);
+                }).bind($ax.features.eventNames.mouseUpName, function() {
+                    dynamicPanelMouseUp(this.id);
+                });
+            }
+
+            // These are the dynamic panel functions for propagating rollover styles and mouse down styles to inner objects
+            var dynamicPanelMouseOver = function(elementId, fromChild) {
+                var parent = $ax.dynamicPanelManager.parentHandlesStyles(elementId);
+                if(parent) {
+                    dynamicPanelMouseOver(parent.id, true);
+                    if(parent.direct) return;
+                }
+                if($.inArray(elementId, _event.mouseOverIds) != -1) return;
+                // If this event is coming from a child, don't mark that it's actually entered.
+                // Only mark that this has been entered if this event has naturally been triggered. (For reason see mouseleave)
+                if(!fromChild) _event.mouseOverIds[_event.mouseOverIds.length] = elementId;
+                if(elementId == _event.mouseOverObjectId) return;
+                _event.mouseOverObjectId = elementId;
+                $ax.dynamicPanelManager.propagateMouseOver(elementId, true);
+            };
+            var dynamicPanelMouseLeave = function(elementId, fromChild) {
+                var parent = $ax.dynamicPanelManager.parentHandlesStyles(elementId);
+                if(parent) {
+                    dynamicPanelMouseLeave(parent.id, true);
+                    if(parent.direct) return;
+                }
+                var index = $.inArray(elementId, _event.mouseOverIds);
+                // If index != -1, this has been natuarally entered. If naturally entered, then leaving child should not trigger leaving,
+                //  but instead wait for natural mouse leave. If natural mouse enter never triggered, natural mouse leave won't so do this now.
+                if((index != -1) && fromChild) return;
+                $ax.splice(_event.mouseOverIds, index, 1);
+
+                if(elementId == _event.mouseOverObjectId) {
+                    _event.mouseOverObjectId = '';
+                }
+                $ax.dynamicPanelManager.propagateMouseOver(elementId, false);
+            };
+
+            //attach handlers for button shape and tree node mouse over styles
+            // TODO: Can this really be removed? Trees seem to work with out (the generic hover case works for it).
+            //        query.filter(function(obj) {
+            //            return $ax.public.fn.IsVector(obj.type) && $ax.public.fn.IsTreeNodeObject(obj.parent.type) &&
+            //                    obj.parent.style && obj.parent.style.stateStyles &&
+            //                        obj.parent.style.stateStyles.mouseOver;
+            //        }).mouseenter(function() {
+            //            $ax.style.SetWidgetHover(this.id, true);
+            //        }).mouseleave(function() {
+            //            $ax.style.SetWidgetHover(this.id, false);
+            //        });
+
+            //handle treeNodeObject events and prevent them from bubbling up. this is necessary because otherwise
+            //both a sub menu and it's parent would get a click
+            if ($ax.public.fn.IsTreeNodeObject(dObj.type)) {
+                $element.click(function() {
+                    //todo -- this was bubbling, but then selecting a child tree node would bubble and select the parent (don't know if there is a better way)
+                    _fireObjectEvent(this.id, 'click', arguments);
+                    return false;
+                }).each(function() {
+                    if(!this.style.cursor) {
+                        this.style.cursor = 'default';
+                    }
+                });
+            }
+
+            // Synthetic events
+
+            var map = dObj.interactionMap;
+            // Attach synthetic drag and swipe events
+            if(map && (map.onDragStart || map.onDrag || map.onDragDrop || map.onSwipeLeft || map.onSwipeRight || map.onSwipeUp || map.onSwipeDown)) {
+                if(isDynamicPanel) {
+                    var diagrams = dObj.diagrams;
+                    for(var i = 0; i < diagrams.length; i++) {
+                        var panelId = $ax.repeater.applySuffixToElementId(elementId, '_state' + i);
+                        var panel = document.getElementById(panelId);
+                        panel.addEventListener($ax.features.eventNames.mouseDownName, function (e) {
+                            $ax.drag.StartDragWidget(e, elementId);
+                        });
+                    }
+                } else {
+                    $element.bind($ax.features.eventNames.mouseDownName,
+                        function (e) {
+                            $ax.drag.StartDragWidget(e.originalEvent, elementId);
+                            // if (!e.originalEvent.donotdrag) $ax.registerTouchCount(e);
+                            // $ax.drag.StartDragWidget(e.originalEvent, elementId);
+                        });
+                }
+            }
+
+            // Attach dynamic panel synthetic scroll event
+            if (isDynamicPanel && map && (map.onScroll || map.onScrollUp || map.onScrollDown)) {
+                var diagrams = dObj.diagrams;
+                for(var i = 0; i < diagrams.length; i++) {
+                    var panelId = $ax.repeater.applySuffixToElementId(elementId, '_state' + i);
+                    (function(id) {
+                        if ($('#' + id).data('lastScrollTop') == undefined) $('#' + id).data('lastScrollTop', '0');
+                        _attachDefaultObjectEvent($('#' + id), elementId, 'scroll', function(e) {
+                            $ax.setjBrowserEvent(e);
+                            var currentEvent = $ax.getjBrowserEvent();
+                            var eventInfoFromEvent = $ax.getEventInfoFromEvent(currentEvent, false, elementId);
+
+                            var currentTop = $('#' + id).scrollTop();
+                            var lastTop = $('#' + id).data('lastScrollTop');
+
+                            _handleScrollEvent(elementId, eventInfoFromEvent, currentEvent.originalEvent, currentTop < lastTop, currentTop > lastTop, map);
+                            $('#' + id).data('lastScrollTop', currentTop);
+                        });
+                    })(panelId);
+                }
+            }
+
+            // Attach synthetic hover event
+            if (map && map.onMouseHover) {
+                var MIN_HOVER_HOLD_TIME = 1000;
+
+                // So when the timeout fires, you know whether it is the same mouseenter that is active or not.
+                var hoverMouseCount = 0;
+                // Update eventInfo regularly, so position is accurate.
+                var hoverEventInfo;
+
+                $element.mouseenter(function(e) {
+                    $ax.setjBrowserEvent(e);
+                    hoverEventInfo = $ax.getEventInfoFromEvent($ax.getjBrowserEvent(), false, elementId);
+                    (function(currCount) {
+                        window.setTimeout(function() {
+                            if(currCount == hoverMouseCount) _raiseSyntheticEvent(elementId, 'onMouseHover', false, hoverEventInfo, true);
+                        }, MIN_HOVER_HOLD_TIME);
+                    })(hoverMouseCount);
+                }).mouseleave(function(e) {
+                    $ax.setjBrowserEvent(e);
+                    hoverMouseCount++;
+                }).mousemove(function(e) {
+                    $ax.setjBrowserEvent(e);
+                    hoverEventInfo = $ax.getEventInfoFromEvent($ax.getjBrowserEvent(), false, elementId);
+                });
+            }
+
+            // Attach synthetic tap and hold event.
+            if (map && map.onLongClick) {
+                var MIN_LONG_CLICK_HOLD_TIME = 750;
+
+                // So when the timeout fires, you know whether it is the same mousedown that is active or not.
+                var longClickMouseCount = 0;
+
+                $element.bind($ax.features.eventNames.mouseDownName, function(e) {
+                    (function(currCount) {
+                        $ax.setjBrowserEvent(e);
+                        var eventInfo = $ax.getEventInfoFromEvent($ax.getjBrowserEvent(), false, elementId);
+                        window.setTimeout(function() {
+                            if(currCount == longClickMouseCount) _raiseSyntheticEvent(elementId, 'onLongClick', false, eventInfo, true);
+                        }, MIN_LONG_CLICK_HOLD_TIME);
+                        if(e.preventDefault) e.preventDefault();
+                    })(longClickMouseCount);
+                }).bind($ax.features.eventNames.mouseUpName, function(e) {
+                    $ax.setjBrowserEvent(e);
+                    longClickMouseCount++;
+                });
+            };
+
+
+            // Attach synthetic onSelectionChange event to droplist and listbox elements
+            if ($ax.event.HasSelectionChanged(dObj)) {
+                $element.bind('change', function(e) {
+                    $ax.setjBrowserEvent(e);
+                    _raiseSyntheticEvent(elementId, 'onSelectionChange');
+                });
+            };
+
+            // Highjack key up and key down to keep track of state of keyboard.
+            if($ax.event.HasKeyUpOrDown(dObj)) _event.initKeyEvents($element);
+
+            // Attach synthetic onTextChange event to textbox and textarea elements
+            if ($ax.event.HasTextChanged(dObj)) {
+                var element = $jobj($ax.INPUT(elementId));
+                $ax.updateElementText(elementId, element.val());
+                //Key down needed because when holding a key down, key up only fires once, but keydown fires repeatedly.
+                //Key up because last mouse down will only show the state before the last character.
+                element.bind('keydown', function(e) {
+                    $ax.setjBrowserEvent(e);
+                    $ax.event.TryFireTextChanged(elementId);
+                }).bind('keyup', function(e) {
+                    $ax.setjBrowserEvent(e);
+                    $ax.event.TryFireTextChanged(elementId);
+                });
+            };
+
+            // Attach synthetic onCheckedChange event to radiobutton and checkbox elements
+            if ($ax.public.fn.IsCheckBox(dObj.type) || $ax.public.fn.IsRadioButton(dObj.type)) {
+                var input = $jobj($ax.INPUT(elementId));
+                if($ax.public.fn.IsRadioButton(dObj.type)) {
+                    var radioGroupName = input.attr('name');
+                    if(input.prop('selected')) {
+                        $ax.updateRadioButtonSelected(radioGroupName, elementId);
+                    }
+                    var onClick = function() {
+                        if(radioGroupName !== elementId) {
+                            var radioGroup = $("input[name='" + radioGroupName + "']").parent();
+                            for(var i = 0; i < radioGroup.length; i++) {
+                                $ax.style.SetWidgetSelected(radioGroup[i].id, false, true);
+                            }
+                        }
+                        $ax.style.SetWidgetSelected(elementId, true, true);
+                    };
+                } else {
+                    onClick = function () {
+                        $ax.style.SetWidgetSelected(elementId, !$ax.style.IsWidgetSelected(elementId), true);
+                    };                                        
+                }
+                input.click(onClick);
+
+                //$element.bind('change', function(e) {
+                //    $ax.setjBrowserEvent(e);
+                //    var eTarget = e.target || e.srcElement;
+                //    _tryFireCheckedChanged(elementId, eTarget.selected);
+                //});
+            };
+
+            var hasTap = map && (map.onClick || map.onDoubleClick);
+            var hasMove = map && map.onMouseMove;
+            _event.initMobileEvents(hasTap ? $element : $(),
+                hasMove ? $element : $(), elementId);
+
+
+            //attach link alternate styles
+            if(dObj.type == 'hyperlink') {
+                $element.mouseenter(function() {
+                    var linkId = this.id;
+                    if(_event.mouseOverIds.indexOf(linkId) != -1) return true;
+                    _event.mouseOverIds[_event.mouseOverIds.length] = linkId;
+                    var mouseOverObjectId = _event.mouseOverObjectId;
+                    if(mouseOverObjectId && $ax.style.IsWidgetDisabled(mouseOverObjectId)) return true;
+
+                    $ax.style.SetLinkHover(linkId);
+
+                    var bubble = _fireObjectEvent(linkId, 'mouseenter', arguments);
+
+                    $ax.annotation.updateLinkLocations($ax.GetParentIdFromLink(linkId));
+                    return bubble;
+                }).mouseleave(function() {
+                    var linkId = this.id;
+                    $ax.splice(_event.mouseOverIds, _event.mouseOverIds.indexOf(linkId), 1);
+                    var mouseOverObjectId = _event.mouseOverObjectId;
+                    if(mouseOverObjectId && $ax.style.IsWidgetDisabled(mouseOverObjectId)) return true;
+
+                    $ax.style.SetLinkNotHover(linkId);
+
+                    var bubble = _fireObjectEvent(linkId, 'mouseleave', arguments);
+
+                    $ax.annotation.updateLinkLocations($ax.GetParentIdFromLink(linkId));
+                    return bubble;
+                }).bind($ax.features.eventNames.mouseDownName, function() {
+                    var linkId = this.id;
+                    var mouseOverObjectId = _event.mouseOverObjectId;
+                    if($ax.style.IsWidgetDisabled(mouseOverObjectId)) return undefined;
+
+                    if(mouseOverObjectId) $ax.style.SetWidgetMouseDown(mouseOverObjectId, true);
+                    $ax.style.SetLinkMouseDown(linkId);
+
+                    $ax.annotation.updateLinkLocations($ax.GetParentIdFromLink(linkId));
+
+                    return false;
+                }).bind($ax.features.eventNames.mouseUpName, function() {
+                    var linkId = this.id;
+                    var mouseOverObjectId = _event.mouseOverObjectId;
+                    if(mouseOverObjectId && $ax.style.IsWidgetDisabled(mouseOverObjectId)) return;
+
+                    if(mouseOverObjectId) $ax.style.SetWidgetMouseDown(mouseOverObjectId, false);
+                    $ax.style.SetLinkNotMouseDown(linkId);
+
+                    $ax.annotation.updateLinkLocations($ax.GetParentIdFromLink(linkId));
+
+                }).click(function() {
+                    var elementId = this.id;
+                    var mouseOverObjectId = _event.mouseOverObjectId;
+                    if(mouseOverObjectId && $ax.style.IsWidgetDisabled(mouseOverObjectId)) return undefined;
+
+                    return _fireObjectEvent(elementId, 'click', arguments);
+                });
+            }
+
+            // Init inline frames
+            if (dObj.type == 'inlineFrame') {
+                var target = dObj.target;
+                var url = '';
+                if(target.includeVariables && target.url) {
+                    var origSrc = target.url;
+                    url = origSrc.toLowerCase().indexOf('http://') == -1 ? $ax.globalVariableProvider.getLinkUrl(origSrc) : origSrc;
+
+                } else if(target.urlLiteral) {
+                    url = $ax.expr.evaluateExpr(target.urlLiteral, $ax.getEventInfoFromEvent(undefined, true, elementId), true);
+                }
+                if(url) $jobj($ax.INPUT(elementId)).attr('src', url);
+            };
+        });
+    }
+    $ax.initializeObjectEvents = _initializeObjectEvents;
+
+    $axure.initializeObjectEvents = function (query, refreshType, _) {
+        //_initializeObjectEvents($ax(query), refreshType);
+        _initializeObjectEvents($ax(query), $ax.repeater.refreshType.persist);
+    }
+
+    $ax.event.updateIxStyleEvents = function(elementId) {
+        _dettachIxStyleEvents(elementId);
+        _attachIxStyleEvents($ax.getObjectFromElementId(elementId), elementId, $jobj(elementId), true);
+    }
+
+    function clearMouseDownIxStyle(e) {
+        if(_event.mouseDownObjectId) {
+            $('#' + _event.mouseDownObjectId).trigger(
+                { type: "mouseup",
+                  checkMouseOver: e.data && e.data.checkMouseOver
+                }
+            );
+        }
+    }
+
+    var _dettachIxStyleEvents = function(elementId) {
+        var $element = $jobj(elementId);
+        $element.off('mouseenter.ixStyle')
+            .off('mouseleave.ixStyle')
+            .off($ax.features.eventNames.mouseDownName + '.ixStyle')
+            .off($ax.features.eventNames.mouseUpName + '.ixStyle');
+    }
+
+    var _attachIxStyleEvents = function(dObj, elementId, $element, ignoreHasIxStyles) {
+        //attach button shape alternate styles
+        var isDynamicPanel = $ax.public.fn.IsDynamicPanel(dObj.type);
+        var needsMouseFilter = (ignoreHasIxStyles || $ax.event.HasIxStyles(dObj))
+            && dObj.type != 'hyperlink' && !$ax.public.fn.IsLayer(dObj.type) && !isDynamicPanel && dObj.type != $ax.constants.TEXT_TYPE &&
+            !$ax.public.fn.IsRepeater(dObj.type) //&& !$ax.public.fn.IsCheckBox(dObj.type) && !$ax.public.fn.IsRadioButton(dObj.type)
+            && !$ax.public.fn.IsTreeNodeObject(dObj.type);
+        if(needsMouseFilter) {
+            //$element.mouseenter(function () {
+            $element.on('mouseenter.ixStyle', function () {
+                var elementId = this.id;
+                var parent = $ax.dynamicPanelManager.parentHandlesStyles(elementId);
+                if(parent && parent.direct) return;
+                if($.inArray(elementId, _event.mouseOverIds) != -1) return;
+                _event.mouseOverIds[_event.mouseOverIds.length] = elementId;
+
+                if(elementId == _event.mouseOverObjectId) return;
+                _event.mouseOverObjectId = elementId;
+                $ax.style.SetWidgetHover(elementId, true);
+                $ax.annotation.updateLinkLocations(elementId);
+            //}).mouseleave(function () {
+            }).on('mouseleave.ixStyle', function () {
+                var elementId = this.id;
+                var parent = $ax.dynamicPanelManager.parentHandlesStyles(elementId);
+                if(parent && parent.direct) return;
+                $ax.splice(_event.mouseOverIds, $.inArray(elementId, _event.mouseOverIds), 1);
+
+                if(elementId == _event.mouseOverObjectId) {
+                    _event.mouseOverObjectId = '';
+                }
+                $ax.style.SetWidgetHover(elementId, false);
+                $ax.annotation.updateLinkLocations(elementId);
+            });
+
+            //$element.bind($ax.features.eventNames.mouseDownName, function () {
+            $element.on($ax.features.eventNames.mouseDownName + '.ixStyle', function () {
+                var elementId = this.id;
+                var parent = $ax.dynamicPanelManager.parentHandlesStyles(elementId);
+                if(parent) {
+                    dynamicPanelMouseDown(parent.id);
+                    if(parent.direct) return;
+                }
+                _event.mouseDownObjectId = elementId;
+                //since we don't do mouse capture, it's possible that the mouseup not get triggered later
+                //in that case, detect the mouseup on document and dragend
+                $(document).one("mouseup", {checkMouseOver: true}, clearMouseDownIxStyle);
+                $("#" + elementId).one("dragend", clearMouseDownIxStyle);
+
+                $ax.style.SetWidgetMouseDown(this.id, true);
+                $ax.annotation.updateLinkLocations(elementId);
+            //}).bind($ax.features.eventNames.mouseUpName, function () {
+            }).on($ax.features.eventNames.mouseUpName + '.ixStyle', function (e) {
+                var elementId = this.id;
+                var parent = $ax.dynamicPanelManager.parentHandlesStyles(elementId);
+                if(parent) {
+                    dynamicPanelMouseUp(parent.id);
+                    if(parent.direct) return;
+                }
+
+                $(document).off("mouseup", clearMouseDownIxStyle);
+
+                if(_event.mouseDownObjectId) {
+                    $("#" + _event.mouseDownObjectId).off("dragend", clearMouseDownIxStyle);
+                    _event.mouseDownObjectId = '';
+                }
+                if(!$ax.style.ObjHasMouseDown(elementId)) return;
+
+                $ax.style.SetWidgetMouseDown(elementId, false, e.checkMouseOver);
+                $ax.annotation.updateLinkLocations(elementId);
+
+                //there used to be something we needed to make images click, because swapping out the images prevents the click
+                // this is a note that we can eventually delete.
+            });
+
+        }
+    };
+
+    var dynamicPanelMouseDown = function (elementId) {
+        var parent = $ax.dynamicPanelManager.parentHandlesStyles(elementId);
+        if(parent) {
+            dynamicPanelMouseDown(parent.id);
+            if(parent.direct) return;
+        }
+        _event.mouseDownObjectId = elementId;
+        $ax.dynamicPanelManager.propagateMouseDown(elementId, true);
+    };
+
+    var dynamicPanelMouseUp = function (elementId) {
+        var parent = $ax.dynamicPanelManager.parentHandlesStyles(elementId);
+        if(parent) {
+            dynamicPanelMouseUp(parent.id);
+            if(parent.direct) return;
+        }
+        _event.mouseDownObjectId = '';
+        $ax.dynamicPanelManager.propagateMouseDown(elementId, false);
+    };
+
+    // Handle key up and key down events
+    (function() {
+        var _keyState = {};
+        _keyState.ctrl = false;
+        _keyState.alt = false;
+        _keyState.shift = false;
+        _keyState.keyCode = 0;
+        $ax.event.keyState = function() {
+            return $ax.deepCopy(_keyState);
+        };
+
+        var modifierCodes = [16, 17, 18];
+        var clearKeyCode = false;
+        $ax.event.initKeyEvents = function($query) {
+            $query.keydown(function (e) {
+                if(clearKeyCode) {
+                    clearKeyCode = false;
+                    _keyState.keyCode = 0;
+                }
+                var elementId = this.id;
+
+                _keyState.ctrl = e.ctrlKey;
+
+                _keyState.alt = e.altKey;
+
+                _keyState.shift = e.shiftKey;
+
+                // If a modifier was pressed, then don't set the keyCode;
+                if(modifierCodes.indexOf(e.keyCode) == -1) _keyState.keyCode = e.keyCode;
+
+                $ax.setjBrowserEvent(e);
+                if (!elementId) fireEventThroughContainers('onKeyDown', undefined, false, [$ax.constants.PAGE_TYPE, $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE, $ax.constants.DYNAMIC_PANEL_TYPE, $ax.constants.REPEATER],
+                    [$ax.constants.PAGE_TYPE, $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE, $ax.constants.LAYER_TYPE]);
+                else _raiseSyntheticEvent(elementId, 'onKeyDown', false, undefined, true);
+            });
+            $query.keyup(function(e) {
+                var elementId = this.id;
+
+                if (modifierCodes.indexOf(e.keyCode) == -1) clearKeyCode = true;
+                else if (clearKeyCode) {
+                    clearKeyCode = false;
+                    _keyState.keyCode = 0;
+                }
+
+                $ax.setjBrowserEvent(e);
+                // Fire event before updating modifiers.
+                if (!elementId) fireEventThroughContainers('onKeyUp', undefined, false, [$ax.constants.PAGE_TYPE, $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE, $ax.constants.DYNAMIC_PANEL_TYPE, $ax.constants.REPEATER],
+                    [$ax.constants.PAGE_TYPE, $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE, $ax.constants.LAYER_TYPE]);
+                else _raiseSyntheticEvent(elementId, 'onKeyUp', false, undefined, true);
+                
+                //check if the key is handled before triggering player shortcuts
+                if(!e.isDefaultPrevented() && !elementId) {
+                    switch(e.which) {
+                        case 188:
+                            $ax.messageCenter.postMessage('previousPage');
+                            break;
+                        case 190:
+                            $ax.messageCenter.postMessage('nextPage');
+                            break;
+                        default:
+                            return; // exit this handler for other keys
+                    }
+                }
+
+            });
+        };
+    })();
+
+    // Handle adding mobile events
+    (function() {
+        // NOTE: Multi touch is NOT handled currently.
+        var CLICK_THRESHOLD_PX = 25;
+        var CLICK_THRESHOLD_PX_SQ = CLICK_THRESHOLD_PX * CLICK_THRESHOLD_PX;
+        var DBLCLICK_THRESHOLD_MS = 500;
+
+        // Location in page coordinates
+        var tapDownLoc;
+        var lastClickEventTime;
+
+        _event.initMobileEvents = function($tapQuery, $moveQuery, elementId) {
+            if(!$ax.features.supports.mobile) return;
+
+            // Handle touch start
+            $tapQuery.bind('touchstart', function(e) {
+                // We do NOT support multiple touches. This isn't necessarily the touch we want.
+                var touch = e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0];
+                if(!touch) return;
+
+                tapDownLoc = [touch.pageX, touch.pageY];
+
+                var time = (new Date()).getTime();
+                if(time - lastClickEventTime < DBLCLICK_THRESHOLD_MS) {
+                    var dObj = elementId === '' ? $ax.pageData.page : $ax.getObjectFromElementId(elementId);
+                    var axEventObject = dObj && dObj.interactionMap && dObj.interactionMap['onDoubleClick'];
+                    if(axEventObject) e.preventDefault(); //for Chrome on Android
+                }
+            }).bind('touchend', function(e) {
+                var touch = e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0];
+                if(!touch || !tapDownLoc || $ax.style.IsWidgetDisabled(elementId)) return;
+
+                var tapUpLoc = [touch.pageX, touch.pageY];
+                var xDiff = tapUpLoc[0] - tapDownLoc[0];
+                var yDiff = tapUpLoc[1] - tapDownLoc[1];
+
+                if((xDiff * xDiff + yDiff * yDiff) < CLICK_THRESHOLD_PX_SQ) {
+                    $ax.setjBrowserEvent(e);
+                    _raiseSyntheticEvent(elementId, 'onClick', false, undefined, true);
+
+                    var time = (new Date()).getTime();
+                    if(time - lastClickEventTime < DBLCLICK_THRESHOLD_MS) {
+                        _raiseSyntheticEvent(elementId, 'onDoubleClick', false, undefined, true);
+                        if(e.originalEvent && e.originalEvent.handled) e.preventDefault(); //for iOS
+                    }
+                    lastClickEventTime = time;
+                }
+            });
+
+            // Handles touch move
+            $moveQuery.bind('touchmove', function(e) {
+                $ax.setjBrowserEvent(e);
+                _raiseSyntheticEvent(elementId, 'onMouseMove', false, undefined, true);
+                if(e.originalEvent && e.originalEvent.handled) e.preventDefault();
+            });
+        };
+    })();
+
+    // Handle adding device independent click events to non-widgets
+    (function() {
+        var CLICK_THRESHOLD_PX = 25;
+        var CLICK_THRESHOLD_PX_SQ = CLICK_THRESHOLD_PX * CLICK_THRESHOLD_PX;
+
+        // Location in page cooridinates
+        var tapDownLoc;
+
+        _event.attachClick = function(query, clickHandler) {
+            if(!$ax.features.supports.mobile) {
+                query.click(clickHandler);
+                return;
+            }
+
+            $(query).bind('touchstart', function(e) {
+                // We do NOT support multiple touches. This isn't necessarily the touch we want.
+                var touch = e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0];
+                if(!touch) return;
+
+                tapDownLoc = [touch.pageX, touch.pageY];
+            });
+
+            $(query).bind('touchend', function(e) {
+                var touch = e.originalEvent && e.originalEvent.changedTouches && e.originalEvent.changedTouches[0];
+                if(!touch) return;
+
+                var tapUpLoc = [touch.pageX, touch.pageY];
+                var xDiff = tapUpLoc[0] - tapDownLoc[0];
+                var yDiff = tapUpLoc[1] - tapDownLoc[1];
+
+                if((xDiff * xDiff + yDiff * yDiff) < CLICK_THRESHOLD_PX_SQ) {
+                    clickHandler();
+                }
+            });
+        };
+    })();
+
+    // Handle firing device independent click events on widgets
+    (function() {
+        _event.fireClick = function(elementId) {
+            if(!$ax.features.supports.mobile) {
+                $('#' + elementId).click();
+                return;
+            }
+            _raiseSyntheticEvent(elementId, 'onClick', false, undefined, true);
+        };
+    })();
+
+    var _mouseLocation = $ax.mouseLocation = { x: 0, y: 0 };
+    var _lastmouseLocation = $ax.lastMouseLocation = { x: 0, y: 0 };
+
+    var _updateMouseLocation = function(e, end) {
+        if(!e) return;
+
+        if(IE_10_AND_BELOW && typeof (e.type) == 'unknown') return;
+        if(e.type != 'mousemove' && e.type != 'touchstart' && e.type != 'touchmove' && e.type != 'touchend') return;
+
+        var newX;
+        var newY;
+        if(IE_10_AND_BELOW) {
+            newX = e.clientX + $('html').scrollLeft();
+            newY = e.clientY + $('html').scrollTop();
+        } else {
+            newX = e.pageX;
+            newY = e.pageY;
+        }
+        //var body = $('body');
+        //if(body.css('position') == 'relative') newX = Math.round(newX - Number(body.css('left').replace('px', '')) - Math.max(0, ($(window).width() - body.width()) / 2));
+
+        if(_mouseLocation.x == newX && _mouseLocation.y == newY) return;
+
+        _lastmouseLocation.x = _mouseLocation.x;
+        _lastmouseLocation.y = _mouseLocation.y;
+        _mouseLocation.x = newX;
+        _mouseLocation.y = newY;
+
+        $ax.geometry.tick(_mouseLocation.x, _mouseLocation.y, end);
+    };
+    _event.updateMouseLocation = _updateMouseLocation;
+
+    var _leavingState = function(stateId) {
+        var mouseOverIds = _event.mouseOverIds;
+        if(mouseOverIds.length == 0) return;
+
+        var stateQuery = $jobj(stateId);
+        for(var i = mouseOverIds.length - 1; i >= 0; i--) {
+            var id = mouseOverIds[i];
+            if(stateQuery.find('#' + id).length) {
+                $ax.splice(mouseOverIds, $.inArray(id, mouseOverIds), 1);
+                $ax.style.SetWidgetMouseDown(id, false);
+                $ax.style.SetWidgetHover(id, false);
+            }
+        }
+
+    };
+    _event.leavingState = _leavingState;
+
+    var _raiseSelectedEvents = function(elementId, value) {
+        $ax.event.raiseSyntheticEvent(elementId, 'onSelectedChange');
+        if(value) $ax.event.raiseSyntheticEvent(elementId, 'onSelect');
+        else $ax.event.raiseSyntheticEvent(elementId, 'onUnselect');
+    };
+    $ax.event.raiseSelectedEvents = _raiseSelectedEvents;
+
+    var _raiseSyntheticEvent = function(elementId, eventName, skipShowDescription, eventInfo, nonSynthetic) {
+        // Empty string used when this is an event directly on the page.
+        var dObj = elementId === '' ? $ax.pageData.page : $ax.getObjectFromElementId(elementId);
+        var axEventObject = dObj && dObj.interactionMap && dObj.interactionMap[eventName];
+        if(!axEventObject) return;
+
+        eventInfo = eventInfo || $ax.getEventInfoFromEvent($ax.getjBrowserEvent(), skipShowDescription, elementId);
+        //        $ax.recording.maybeRecordEvent(elementId, eventInfo, axEventObject, new Date().getTime());
+        _handleEvent(elementId, eventInfo, axEventObject, false, !nonSynthetic);
+    };
+    $ax.event.raiseSyntheticEvent = _raiseSyntheticEvent;
+
+    var _hasSyntheticEvent = function(scriptId, eventName) {
+        var dObj = $ax.getObjectFromScriptId(scriptId);
+        var axEventObject = dObj && dObj.interactionMap && dObj.interactionMap[eventName];
+        return Boolean(axEventObject);
+    };
+    $ax.event.hasSyntheticEvent = _hasSyntheticEvent;
+
+    var _addEvent = function (target, eventType, handler, useCapture) {
+        //this return value is only for debug purpose
+        var succeed = undefined;
+        if(target.attachEvent) {
+            if($ax.features.supports.windowsMobile) {
+                succeed = target.attachEvent(eventType, handler);
+            } else {
+                succeed = target.attachEvent('on' + eventType, handler);
+            }
+        } else if(target.addEventListener) {
+            target.addEventListener(eventType, handler, useCapture);
+            succeed = true;
+        }
+
+        return succeed;
+    }
+    $ax.event.addEvent = _addEvent;
+
+    var _removeEvent = function(target, eventType, handler, useCapture, skipCheckingWindowsMobile) {
+        //this return value is only for debug purpose
+        var succeed = undefined;
+
+        if(target.detachEvent) {
+            if(!skipCheckingWindowsMobile && $ax.features.supports.windowsMobile) {
+                succeed = target.detachEvent(eventType, handler);
+            } else {
+                succeed = target.detachEvent('on' + eventType, handler);
+            }
+        } else if(target.removeEventListener) {
+            target.removeEventListener(eventType, handler, useCapture);
+            succeed = true;
+        }
+
+        return succeed;
+    }
+    $ax.event.removeEvent = _removeEvent;
+
+    var _initialize = function() {
+        $ax.repeater.loadRepeaters();
+
+        // Make sure key events for page are initialized first. That way they will update the value of key pressed before any other events occur.
+        _event.initKeyEvents($(window));
+
+        initSuppressingEvents();
+
+        // Anything with an item id is in a repeater and should be handled by that repeater.
+        _initializeObjectEvents($ax(function(obj, elementId) { return !$ax.repeater.getItemIdFromElementId(elementId); }));
+
+        //finally, process the pageload
+        _pageLoad();
+        //        _loadDynamicPanelsAndMasters();
+        //        $ax.repeater.init();
+
+        // and wipe out the basic links.
+        $('.basiclink').click(function() {
+            return false;
+        });
+    };
+    _event.initialize = _initialize;
+
+    $ax.event.HasIxStyles = function(diagramObject) {
+        if(diagramObject.style.stateStyles) return true;
+        if(diagramObject.adaptiveStyles) {
+            for(var viewId in diagramObject.adaptiveStyles) {
+                if(diagramObject.adaptiveStyles[viewId].stateStyles) return true;
+            }
+        }
+        return false;
+    };
+
+    $ax.event.HasTextChanged = function(diagramObject) {
+        if (!$ax.public.fn.IsTextBox(diagramObject.type) && !$ax.public.fn.IsTextArea(diagramObject.type)) return false;
+        var map = diagramObject.interactionMap;
+        return map && map.onTextChange;
+    };
+
+    $ax.event.TryFireTextChanged = function(elementId) {
+        var query = $jobj($ax.repeater.applySuffixToElementId(elementId, '_input'));
+        if(!$ax.hasElementTextChanged(elementId, query.val())) return;
+        $ax.updateElementText(elementId, query.val());
+
+        $ax.event.raiseSyntheticEvent(elementId, 'onTextChange');
+    };
+
+    $ax.event.HasSelectionChanged = function(diagramObject) {
+        if (!$ax.public.fn.IsListBox(diagramObject.type) && !$ax.public.fn.IsComboBox(diagramObject.type)) return false;
+        var map = diagramObject.interactionMap;
+        return map && map.onSelectionChange;
+    };
+
+    $ax.event.HasKeyUpOrDown = function (diagramObject) {
+        if($ax.public.fn.IsTextBox(diagramObject.type) || $ax.public.fn.IsTextArea(diagramObject.type)) return true;
+        var map = diagramObject.interactionMap;
+        return map && (map.onKeyUp || map.onKeyDown);
+    };
+
+    $ax.event.HasCheckedChanged = function(diagramObject) {
+        if (!$ax.public.fn.IsCheckBox(diagramObject.type) && !$ax.public.fn.IsRadioButton(diagramObject.type)) return false;
+        var map = diagramObject.interactionMap;
+        return map && map.onSelectedChange;
+    };
+
+    $ax.event.HasClick = function (diagramObject) {
+        var map = diagramObject.interactionMap;
+        return map && map.onClick;
+    };
+
+    //onload everything now, not only dp and master
+    var _loadDynamicPanelsAndMasters = function(objects, path, itemId) {
+        fireEventThroughContainers('onLoad', objects, true, [$ax.constants.PAGE_TYPE, $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE, $ax.constants.DYNAMIC_PANEL_TYPE],
+            [$ax.constants.ALL_TYPE], path, itemId);
+    };
+    $ax.loadDynamicPanelsAndMasters = _loadDynamicPanelsAndMasters;
+
+    var _viewChangePageAndMasters = function(forceSwitchTo) {
+        fireEventThroughContainers('onAdaptiveViewChange', undefined, true, [$ax.constants.PAGE_TYPE, $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE, $ax.constants.DYNAMIC_PANEL_TYPE],
+            [$ax.constants.PAGE_TYPE, $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE]);
+        _postAdaptiveViewChanged(forceSwitchTo);
+    };
+    $ax.viewChangePageAndMasters = _viewChangePageAndMasters;
+
+    //if forceSwitchTo is true, we will also update the checkmark in sitemap.js
+    var _postAdaptiveViewChanged = function(forceSwitchTo) {
+        //only trigger adaptive view changed if the window is on the mainframe. Also triggered on init, even if default.
+        try {
+            if(window.name == 'mainFrame' ||
+            (!CHROME_5_LOCAL && window.parent.$ && window.parent.$('#mainFrame').length > 0)) {
+                var data = {
+                    viewId: $ax.adaptive.currentViewId,
+                    forceSwitchTo: forceSwitchTo
+                };
+                $axure.messageCenter.postMessage('adaptiveViewChange', data);
+            }
+        } catch(e) { }
+    };
+    $ax.postAdaptiveViewChanged = _postAdaptiveViewChanged;
+
+    var _postResize = $ax.postResize = function(e) {
+        $ax.setjBrowserEvent(e);
+        return fireEventThroughContainers('onResize', undefined, false, [$ax.constants.PAGE_TYPE, $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE, $ax.constants.DYNAMIC_PANEL_TYPE, $ax.constants.REPEATER],
+            [$ax.constants.PAGE_TYPE, $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE]);
+    };
+
+    //fire events for table, menu and tree, including its sub items
+    var _fireEventsForTableMenuAndTree = function (object, event, skipShowDescription, eventInfo, path, synthetic) {
+        if (!path) path = [];
+        var pathCopy = path.slice();
+
+        pathCopy[path.length] = object.id;
+        var scriptId = $ax.getScriptIdFromPath(pathCopy);
+        $ax.event.raiseSyntheticEvent(scriptId, event, skipShowDescription, eventInfo, !synthetic);
+
+        if(object.objects) {
+            for(var index = 0; index < object.objects.length; index++) {
+                var subObj = object.objects[index];
+                if ($ax.public.fn.IsTableCell(subObj.type)) {
+                    pathCopy[path.length] = subObj.id;
+                    scriptId = $ax.getScriptIdFromPath(pathCopy);
+                    $ax.event.raiseSyntheticEvent(scriptId, event, skipShowDescription, eventInfo, !synthetic);
+                } else if ($ax.public.fn.IsTable(object.type) || $ax.public.fn.IsMenuObject(object.type) || $ax.public.fn.IsTreeNodeObject(object.type)) {
+                    _fireEventsForTableMenuAndTree(subObj, event, skipShowDescription, eventInfo, path, synthetic);
+                }
+            }
+        }
+    }
+
+    //remember the scroll bar position, so we can detect scroll up/down
+    var lastScrollTop;
+
+    var fireEventForPageOrMaster = function (elementId, eventName, interactionMap, isPage, skipShowDescription, synthetic) {
+        if(!interactionMap) return;
+
+        var axEvent = interactionMap[eventName];
+        var scrolling = eventName === "onScroll";
+        if (scrolling && !axEvent) axEvent = interactionMap.onScrollUp || interactionMap.onScrollDown;
+
+        if (axEvent) {
+            var currentEvent = $ax.getjBrowserEvent();
+            var eventInfo = $ax.getEventInfoFromEvent(currentEvent, skipShowDescription, elementId);
+
+            if(isPage) {
+                eventInfo.label = $ax.pageData.page.name;
+                eventInfo.friendlyType = 'Page';
+            } else eventInfo.isMasterEvent = true;
+
+            if(scrolling) _handleScrollEvent(elementId, eventInfo, currentEvent.originalEvent, _event.windowScrollingUp, _event.windowScrollingDown, interactionMap, skipShowDescription, synthetic);
+            else _handleEvent(elementId, eventInfo, axEvent, skipShowDescription, synthetic);
+        }
+    }
+    // Filters include page, referenceDiagramObject, dynamicPanel, and repeater.
+    var _callFilterCheck = function(callFilter, type) {
+        for(var index = 0; index < callFilter.length; index++) {
+            var currentType = callFilter[index];
+            if(currentType === $ax.constants.ALL_TYPE || currentType === type) return true;
+        }
+        return false;
+    };
+
+    var fireEventThroughContainers = function(eventName, objects, synthetic, searchFilter, callFilter, path, itemId) {
+        // TODO: may want to pass in this as a parameter. At that point, may want to convert some of them to an option parameter. For now this is the only case
+        var skipShowDescription = eventName == 'onLoad';
+
+        // If objects undefined, load page
+        if(!objects) {
+            if(_callFilterCheck(callFilter, $ax.constants.PAGE_TYPE)) {
+                //if scrolling, set direction, later master will know
+                if(eventName === "onScroll") {
+                    var currentScrollTop = ((SAFARI && IOS) || SHARE_APP) ? $('#ios-safari-html').scrollTop() : $(window).scrollTop();
+                    _event.windowScrollingUp = currentScrollTop < lastScrollTop;
+                    _event.windowScrollingDown = currentScrollTop > lastScrollTop;
+                }
+
+                fireEventForPageOrMaster('', eventName, $ax.pageData.page.interactionMap, true, skipShowDescription, synthetic);
+            }
+            if(searchFilter.indexOf($ax.constants.PAGE_TYPE) != -1) fireEventThroughContainers(eventName, $ax.pageData.page.diagram.objects, synthetic, searchFilter, callFilter);
+            //reset and save scrolling info at the end
+            if(currentScrollTop) {
+                lastScrollTop = currentScrollTop;
+                _event.windowScrollingUp = undefined;
+                _event.windowScrollingDown = undefined;
+            }
+
+            return;
+        }
+
+        if(!path) path = [];
+
+        var pathCopy = [];
+        for(var j = 0; j < path.length; j++) pathCopy[j] = path[j];
+
+        for(var i = 0; i < objects.length; i++) {
+            var obj = objects[i];
+            pathCopy[path.length] = obj.id;
+            if (!$ax.public.fn.IsReferenceDiagramObject(obj.type) && !$ax.public.fn.IsDynamicPanel(obj.type) && !$ax.public.fn.IsRepeater(obj.type) && !$ax.public.fn.IsLayer(obj.type)) {
+                if(_callFilterCheck(callFilter)) { //fire current event for all types
+                    if ($ax.public.fn.IsTable(obj.type) || $ax.public.fn.IsMenuObject(obj.type) || $ax.public.fn.IsTreeNodeObject(obj.type)) {
+                        _fireEventsForTableMenuAndTree(obj, eventName, skipShowDescription, undefined, path, !synthetic);
+                    } else {
+                        var scriptId = $ax.getScriptIdFromPath(pathCopy);
+                        if(scriptId && itemId) scriptId = $ax.repeater.createElementId(scriptId, itemId);
+                        $ax.event.raiseSyntheticEvent(scriptId, eventName, skipShowDescription, undefined, !synthetic);
+                    }
+                }
+                continue;
+            }
+
+            var objId = $ax.getScriptIdFromPath(pathCopy);
+            // If limboed, move on to next item
+            if(!objId) continue;
+            if(itemId) objId = $ax.repeater.createElementId(objId, itemId);
+
+            if($ax.public.fn.IsReferenceDiagramObject(obj.type)) {
+                if(_callFilterCheck(callFilter, $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE)) {
+                    fireEventForPageOrMaster(objId, eventName, $ax.pageData.masters[obj.masterId].interactionMap, false, skipShowDescription, synthetic);
+                }
+                if(searchFilter.indexOf($ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE) != -1) fireEventThroughContainers(eventName, $ax.pageData.masters[obj.masterId].diagram.objects, synthetic, searchFilter, callFilter, pathCopy, itemId);
+            } else if($ax.public.fn.IsDynamicPanel(obj.type)) {
+                if(_callFilterCheck(callFilter, $ax.constants.DYNAMIC_PANEL_TYPE)) $ax.event.raiseSyntheticEvent(objId, eventName, skipShowDescription, undefined, !synthetic);
+
+                if(searchFilter.indexOf($ax.constants.DYNAMIC_PANEL_TYPE) != -1) {
+                    var diagrams = obj.diagrams;
+                    for(var j = 0; j < diagrams.length; j++) {
+                        fireEventThroughContainers(eventName, diagrams[j].objects, synthetic, searchFilter, callFilter, path, itemId);
+                    }
+                }
+            } else if($ax.public.fn.IsRepeater(obj.type)) {
+                // TODO: possible an option for repeater item? Now fires overall for the repeater
+                if(_callFilterCheck(callFilter, $ax.constants.REPEATER)) $ax.event.raiseSyntheticEvent(objId, eventName, skipShowDescription, undefined, !synthetic);
+                if(searchFilter.indexOf($ax.constants.REPEATER) != -1) {
+                    var itemIds = $ax.getItemIdsForRepeater(objId);
+                    for(var j = 0; j < itemIds.length; j++) {
+                        fireEventThroughContainers(eventName, obj.objects, synthetic, searchFilter, callFilter, path, itemIds[j]);
+                    }
+                }
+            } else if($ax.public.fn.IsLayer(obj.type)) {
+                if(_callFilterCheck(callFilter, $ax.constants.LAYER_TYPE)) $ax.event.raiseSyntheticEvent(objId, eventName, skipShowDescription, undefined, !synthetic);
+
+                if(obj.objs && obj.objs.length > 0) {
+                    fireEventThroughContainers(eventName, obj.objs, synthetic, searchFilter, callFilter, path, itemId);
+                }
+            }
+        }
+
+        eventNesting -= 1;
+
+    }; // FOCUS stuff
+    (function() {
+
+    })();
+
+
+    var _pageLoad = function() {
+
+        // Map of axure event names to pair of what it should attach to, and what the jquery event name is.
+        var PAGE_AXURE_TO_JQUERY_EVENT_NAMES = {
+            'onScroll': [window, 'scroll'],
+            'onScrollUp': [window, 'scrollup'],
+            'onScrollDown': [window, 'scrolldown'],
+            //'onResize': [window, 'resize'],
+            'onContextMenu': [window, 'contextmenu']
+        };
+
+        var $win = $(window);
+        if(!$ax.features.supports.mobile) {
+            PAGE_AXURE_TO_JQUERY_EVENT_NAMES.onClick = ['html', 'click'];
+            PAGE_AXURE_TO_JQUERY_EVENT_NAMES.onDoubleClick = ['html', 'dblclick'];
+            PAGE_AXURE_TO_JQUERY_EVENT_NAMES.onMouseMove = ['html', 'mousemove'];
+        } else {
+            _event.initMobileEvents($win, $win, '');
+
+            $win.bind($ax.features.eventNames.mouseDownName, _updateMouseLocation);
+            $win.bind($ax.features.eventNames.mouseUpName, function(e) { _updateMouseLocation(e, true); });
+        }
+        
+        $win.scroll(function () { _setCanClick(false); });
+        $win.bind($ax.features.eventNames.mouseDownName, function () { _setCanClick(true); });
+
+        $win.bind($ax.features.eventNames.mouseMoveName, _updateMouseLocation);
+        $win.scroll($ax.flyoutManager.reregisterAllFlyouts);
+
+        for(key in PAGE_AXURE_TO_JQUERY_EVENT_NAMES) {
+            if(!PAGE_AXURE_TO_JQUERY_EVENT_NAMES.hasOwnProperty(key)) continue;
+            (function(axureName) {
+                var jqueryEventNamePair = PAGE_AXURE_TO_JQUERY_EVENT_NAMES[axureName];
+                var actionName = jqueryEventNamePair[1];
+
+                if(actionName == "scrollup" || actionName == "scrolldown") return;
+
+                var jObj = jqueryEventNamePair[0];
+                if ((SAFARI && IOS) || SHARE_APP) jObj = '#ios-safari-html';
+
+                $(jObj)[actionName](function (e) {
+                    $ax.setjBrowserEvent(e);
+                    return fireEventThroughContainers(axureName, undefined, false, [$ax.constants.PAGE_TYPE, $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE, $ax.constants.DYNAMIC_PANEL_TYPE, $ax.constants.REPEATER],
+                        [$ax.constants.PAGE_TYPE, $ax.constants.REFERENCE_DIAGRAM_OBJECT_TYPE]);
+                });
+            })(key);
+        }
+
+        eventNesting -= 1;
+        lastScrollTop = 0;
+    };
+    _event.pageLoad = _pageLoad;
+
+
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/expr.js b/src_old/resources/scripts/axure/expr.js
new file mode 100644
index 0000000..9e9c245
--- /dev/null
+++ b/src_old/resources/scripts/axure/expr.js
@@ -0,0 +1,579 @@
+// ******* Expr MANAGER ******** //
+$axure.internal(function($ax) {
+    var _expr = $ax.expr = {};
+    var _binOpHandlers = {
+        '&&': function(left, right) { return _binOpOverride(left, right, function(left) { return $ax.getBool(left) && $ax.getBool(right()); }); },
+        '||': function(left, right) { return _binOpOverride(left, right, function(left) { return $ax.getBool(left) || $ax.getBool(right()); }); },
+        '==': function(left, right) { return isEqual(left, right, true); },
+        '!=': function(left, right) { return !isEqual(left, right, true); },
+        '>': function(left, right) { return _binOpNum(left, right, function(left, right) { return left > right; }); },
+        '<': function(left, right) { return _binOpNum(left, right, function(left, right) { return left < right; }); },
+        '>=': function(left, right) { return _binOpNum(left, right, function(left, right) { return left >= right; }); },
+        '<=': function(left, right) { return _binOpNum(left, right, function(left, right) { return left <= right; }); }
+    };
+
+    var checkOps = function(left, right) {
+        return left == undefined || right == undefined;
+    };
+
+    var isEqual = function (left, right, isFunction) {
+        if (isFunction) {
+            //if left and right is function, then get the value
+            //otherwise left and right should be already the value we want
+            left = left();
+            right = right();
+        }
+
+        if(checkOps(left, right)) return false;
+
+        if(left instanceof Date && right instanceof Date) {
+            if(left.getMilliseconds() != right.getMilliseconds()) return false;
+            if(left.getSeconds() != right.getSeconds()) return false;
+            if(left.getMinutes() != right.getMinutes()) return false;
+            if(left.getHours() != right.getHours()) return false;
+            if(left.getDate() != right.getDate()) return false;
+            if(left.getMonth() != right.getMonth()) return false;
+            if(left.getYear() != right.getYear()) return false;
+            return true;
+        }
+
+        if(left instanceof Object && right instanceof Object) {
+            var prop;
+            // Go through all of lefts properties and compare them to rights.
+            for(prop in left) {
+                if(!left.hasOwnProperty(prop)) continue;
+                // If left has a property that the right doesn't they are not equal.
+                if(!right.hasOwnProperty(prop)) return false;
+                // If any of their properties are not equal, they are not equal.
+                if(!isEqual(left[prop], right[prop], false)) return false;
+            }
+
+            for(prop in right) {
+                // final check to make sure right doesn't have some extra properties that make them not equal.
+                if(left.hasOwnProperty(prop) != right.hasOwnProperty(prop)) return false;
+            }
+
+            return true;
+        }
+        return $ax.getBool(left) == $ax.getBool(right);
+    };
+
+    var _binOpOverride = function(left, right, func) {
+        left = left();
+        if(left == undefined) return false;
+        var res = func(left, right);
+        return res == undefined ? false : res;
+    };
+
+    var _binOpNum = function(left, right, func) {
+        var left = left();
+        var right = right();
+        if(checkOps(left, right)) return false;
+
+        return func(left, Number(right));
+    };
+
+    var _exprHandlers = {};
+    _exprHandlers.array = function(expr, eventInfo) {
+        var returnVal = [];
+        for(var i = 0; i < expr.items.length; i++) {
+            returnVal[returnVal.length] = _evaluateExpr(expr.items[i], eventInfo);
+        }
+        return returnVal;
+    };
+
+    _exprHandlers.binaryOp = function(expr, eventInfo) {
+        var left = function() { return expr.leftExpr && _evaluateExpr(expr.leftExpr, eventInfo); };
+        var right = function() { return expr.rightExpr && _evaluateExpr(expr.rightExpr, eventInfo); };
+
+        if(left == undefined || right == undefined) return false;
+        return _binOpHandlers[expr.op](left, right);
+    };
+
+    _exprHandlers.block = function(expr, eventInfo) {
+        var subExprs = expr.subExprs;
+        for(var i = 0; i < subExprs.length; i++) {
+            _evaluateExpr(subExprs[i], eventInfo); //ignore the result
+        }
+    };
+
+    _exprHandlers.booleanLiteral = function(expr) {
+        return expr.value;
+    };
+
+    _exprHandlers.nullLiteral = function() { return null; };
+
+    _exprHandlers.pathLiteral = function(expr, eventInfo) {
+        if(expr.isThis) return [eventInfo.srcElement];
+        if(expr.isFocused && window.lastFocusedControl) {
+            $ax('#' + window.lastFocusedControl).focus();
+            return [window.lastFocusedControl];
+        }
+        if(expr.isTarget) return [eventInfo.targetElement];
+
+        return $ax.getElementIdsFromPath(expr.value, eventInfo);
+    };
+
+    _exprHandlers.panelDiagramLiteral = function(expr, eventInfo) {
+        var elementIds = $ax.getElementIdsFromPath(expr.panelPath, eventInfo);
+        var elementIdsWithSuffix = [];
+        var suffix = '_state' + expr.panelIndex;
+        for(var i = 0; i < elementIds.length; i++) {
+            elementIdsWithSuffix[i] = $ax.repeater.applySuffixToElementId(elementIds[i], suffix);
+        }
+        return String($jobj(elementIdsWithSuffix).data('label'));
+    };
+
+    _exprHandlers.fcall = function(expr, eventInfo) {
+        var oldTarget = eventInfo.targetElement;
+        var targets = [];
+        var fcallArgs = [];
+        var exprArgs = expr.arguments;
+        for(var i = 0; i < expr.arguments.length; i++) {
+            var exprArg = exprArgs[i];
+            var fcallArg = '';
+            if(targets.length) {
+                for(var j = 0; j < targets.length; j++) {
+                    if(exprArg == null) {
+                        fcallArgs[j][i] = null;
+                        continue;
+                    }
+                    eventInfo.targetElement = targets[j];
+                    fcallArg = _evaluateExpr(exprArg, eventInfo);
+                    if(typeof (fcallArg) == 'undefined') return '';
+                    fcallArgs[j][i] = fcallArg;
+                }
+            } else {
+                if(exprArg == null) {
+                    fcallArgs[i] = null;
+                    continue;
+                }
+                fcallArg = _evaluateExpr(exprArg, eventInfo);
+                if(typeof (fcallArg) == 'undefined') return '';
+                fcallArgs[i] = fcallArg;
+            }
+
+            // We do support null exprArgs...
+            // TODO: This makes 2 assumptions that may change in the future. 1. The pathLiteral is the always the first arg. 2. there is always only 1 pathLiteral
+            if(exprArg && exprArg.exprType == 'pathLiteral') {
+                targets = fcallArg;
+
+                // fcallArgs is now an array of an array of args
+                for(j = 0; j < targets.length; j++) fcallArgs[j] = [[fcallArg[j]]];
+            }
+        }
+
+        // we want to preserve the target element from outside this function.
+        eventInfo.targetElement = oldTarget;
+
+        var retval = '';
+        if(targets.length) {
+            // Go backwards so retval is the first item.
+            for(i = targets.length - 1; i >= 0; i--) {
+                var args = fcallArgs[i];
+                // Add event info to the end
+                args[args.length] = eventInfo;
+                retval = _exprFunctions[expr.functionName].apply(this, args);
+            }
+        } else fcallArgs[fcallArgs.length] = eventInfo;
+        return targets.length ? retval : _exprFunctions[expr.functionName].apply(this, fcallArgs);
+    };
+
+    _exprHandlers.globalVariableLiteral = function(expr) {
+        return expr.variableName;
+    };
+
+    _exprHandlers.keyPressLiteral = function(expr) {
+        var keyInfo = {};
+        keyInfo.keyCode = expr.keyCode;
+        keyInfo.ctrl = expr.ctrl;
+        keyInfo.alt = expr.alt;
+        keyInfo.shift = expr.shift;
+
+        return keyInfo;
+    };
+
+    _exprHandlers.adaptiveViewLiteral = function(expr) {
+        return expr.id;
+    };
+
+    _exprHandlers.optionLiteral = function(expr) {
+        return expr.value;
+    }
+
+    var _substituteSTOs = function(expr, eventInfo) {
+        //first evaluate the local variables
+        var scope = {};
+        for(var varName in expr.localVariables) {
+            scope[varName] = $ax.expr.evaluateExpr(expr.localVariables[varName], eventInfo);
+        }
+
+        // TODO: [ben] Date and data object (obj with info for url or image) both need to return non-strings.
+        var i = 0;
+        var retval;
+        var retvalString = expr.value.replace(/\[\[(?!\[)(.*?)\]\](?=\]*)/g, function(match) {
+            var sto = expr.stos[i++];
+            if(sto.sto == 'error') return match;
+            try {
+                var result = $ax.evaluateSTO(sto, scope, eventInfo);
+            } catch(e) {
+                return match;
+            }
+
+            if((result instanceof Object) && i == 1 && expr.value.substring(0, 2) == '[[' &&
+                expr.value.substring(expr.value.length - 2) == ']]') {
+                // If the result was an object, this was the first result, and the whole thing was this expresion.
+                retval = result;
+            }
+            return ((result instanceof Object) && (result.label || result.text)) || result;
+        });
+        // If more than one group returned, the object is not valid
+        if(i != 1) retval = false;
+        return retval || retvalString;
+    };
+
+    _exprHandlers.htmlLiteral = function (expr, eventInfo) {
+        eventInfo.htmlLiteral = true;
+        var html = _substituteSTOs(expr, eventInfo);
+        eventInfo.htmlLiteral = false
+        return html;
+    };
+
+    _exprHandlers.stringLiteral = function(expr, eventInfo) {
+        return _substituteSTOs(expr, eventInfo);
+    };
+
+    var _exprFunctions = {};
+
+    _exprFunctions.SetCheckState = function(elementIds, value) {
+        var toggle = value == 'toggle';
+        var boolValue = Boolean(value) && value != 'false';
+
+        for(var i = 0; i < elementIds.length; i++) {
+            var query = $ax('#' + elementIds[i]);
+            query.selected(toggle ? !query.selected() : boolValue);
+        }
+    };
+
+    _exprFunctions.SetSelectedOption = function(elementIds, value) {
+        for(var i = 0; i < elementIds.length; i++) {
+            var elementId = elementIds[i];
+            var obj = $jobj($ax.INPUT(elementId));
+
+            if(obj.val() == value) return;
+            obj.val(value);
+
+            if($ax.event.HasSelectionChanged($ax.getObjectFromElementId(elementId))) $ax.event.raiseSyntheticEvent(elementId, 'onSelectionChange');
+        }
+    };
+
+    _exprFunctions.SetGlobalVariableValue = function(varName, value) {
+        $ax.globalVariableProvider.setVariableValue(varName, value);
+    };
+
+    _exprFunctions.SetWidgetFormText = function(elementIds, value) {
+        for(var i = 0; i < elementIds.length; i++) {
+            var elementId = elementIds[i];
+            var inputId = $ax.repeater.applySuffixToElementId(elementId, '_input');
+
+            var obj = $jobj(inputId);
+            if(obj.val() == value || (value == '' && $ax.placeholderManager.isActive(elementId))) return;
+            obj.val(value);
+            $ax.placeholderManager.updatePlaceholder(elementId, !value);
+            if($ax.event.HasTextChanged($ax.getObjectFromElementId(elementId))) $ax.event.TryFireTextChanged(elementId);
+        }
+    };
+
+    _exprFunctions.SetFocusedWidgetText = function(elementId, value) {
+        if(window.lastFocusedControl) {
+            var elementId = window.lastFocusedControl;
+            var type = $obj(elementId).type;
+            if ($ax.public.fn.IsTextBox(type) || $ax.public.fn.IsTextArea(type)) _exprFunctions.SetWidgetFormText([elementId], value);
+            else _exprFunctions.SetWidgetRichText([elementId], value, true);
+        }
+    };
+
+    _exprFunctions.GetRtfElementHeight = function(rtfElement) {
+        if(rtfElement.innerHTML == '') rtfElement.innerHTML = '&nbsp;';
+        return rtfElement.offsetHeight;
+    };
+
+    _exprFunctions.SetWidgetRichText = function(ids, value, plain) {
+        // Converts dates, widgetinfo, and the like to strings.
+        value = _exprFunctions.ToString(value);
+
+        //Replace any newlines with line breaks
+        var finalValue = value.replace(/\r\n/g, '<br>').replace(/\n/g, '<br>');
+
+        for(var i = 0; i < ids.length; i++) {
+            var id = ids[i];
+
+            // If calling this on button shape, get the id of the rich text panel inside instead
+            if($obj(id).type !== $ax.constants.LINK_TYPE) id = $ax.GetTextPanelId(id, true);
+
+            var element = window.document.getElementById(id);
+            $ax.visibility.SetVisible(element, value != '');
+
+            $ax.style.transformTextWithVerticalAlignment(id, function() {
+                var spans = $jobj(id).find('span');
+                if(plain) {
+                    // Can't set value as text because '<br/>' doesn't actually do a line break
+                    // Can't set vaule as html because it doesn't like '<' and ignores all after it
+                    // Create tags yourself
+                    var lines = value.split(/\r\n|\n/);
+                    //if we are dealing with only one line, just reuse the old one
+                    if(spans.length === 1 && lines.length === 1) {
+                        $(spans[0]).text(value);
+                        return;
+                    }
+
+                    // Wrap in span and p, style them accordingly.
+                    var span = $('<span></span>');
+                    if(spans.length > 0) {
+                        span.attr('style', $(spans[0]).attr('style'));
+                        span.attr('id', $(spans[0]).attr('id'));
+                    }
+
+                    if(lines.length == 1) span.text(value);
+                    else {
+                        for(var i = 0; i < lines.length; i++) {
+                            if(i != 0) span.append($('<br />'));
+                            var line = lines[i];
+                            if(line.length == 0) continue;
+
+                            var subSpan = $('<span />');
+                            subSpan.text(line);
+                            span.append(subSpan);
+                        }
+                    }
+
+                    var ps = $jobj(id).find('p');
+                    if(ps && ps.length) {
+                        ps[0].innerHTML = $('<div></div>').append(span).html();;
+                        if(ps.length > 1) {
+                            for(var i = 1; i < ps.length; i++) {
+                                $(ps[i]).remove();
+                            }
+                        }
+                    } else {
+                        var p = $('<p></p>');
+                        p.append(span);
+                        element.innerHTML = $('<div></div>').append(p).html();
+                    }
+                } else element.innerHTML = finalValue;
+            });
+
+            if(!plain) $ax.style.CacheOriginalText(id, true);
+        }
+    };
+
+    _exprFunctions.GetCheckState = function(ids) {
+        return $ax('#' + ids[0]).selected();
+    };
+
+    _exprFunctions.GetDisabledState = function (ids) {
+        return !$ax('#' + ids[0]).enabled();
+    };
+
+    _exprFunctions.GetSelectedOption = function (ids) {
+        var inputs = $jobj($ax.INPUT(ids[0]));
+        return inputs.length ? inputs[0].value : '';
+    };
+
+    _exprFunctions.GetNum = function(str) {
+        //Setting a GlobalVariable to some blank text then setting a widget to the value of that variable would result in 0 not ""
+        //I have fixed this another way so commenting this should be fine now
+        //if (!str) return "";
+        return isNaN(str) ? str : Number(str);
+    };
+
+    _exprFunctions.GetGlobalVariableValue = function(id) {
+        return $ax.globalVariableProvider.getVariableValue(id);
+    };
+
+    _exprFunctions.GetGlobalVariableLength = function(id) {
+        return _exprFunctions.GetGlobalVariableValue(id).length;
+    };
+
+    _exprFunctions.GetWidgetText = function(ids) {
+        if($ax.placeholderManager.isActive(ids[0])) return '';
+        var input = $ax.INPUT(ids[0]);
+        return $ax('#' + ($jobj(input).length ? input : ids[0])).text();
+    };
+
+    _exprFunctions.GetFocusedWidgetText = function() {
+        if(window.lastFocusedControl) {
+            return $ax('#' + window.lastFocusedControl).text();
+        } else {
+            return "";
+        }
+    };
+
+    _exprFunctions.GetWidgetValueLength = function(ids) {
+        var id = ids[0];
+        if(!id) return undefined;
+        if($ax.placeholderManager.isActive(id)) return 0;
+        var obj = $jobj($ax.INPUT(id));
+        if(!obj.length) obj = $jobj(id);
+        var val = obj[0].value || _exprFunctions.GetWidgetText([id]);
+        return val.length;
+    };
+
+    _exprFunctions.GetPanelState = function(ids) {
+        var id = ids[0];
+        if(!id) return undefined;
+        var stateId = $ax.visibility.GetPanelState(id);
+        return stateId && String($jobj(stateId).data('label'));
+    };
+
+    _exprFunctions.GetWidgetVisibility = function(ids) {
+        var id = ids[0];
+        if(!id) return undefined;
+        return $ax.visibility.IsIdVisible(id);
+    };
+
+    // *****************  Validation Functions ***************** //
+
+    _exprFunctions.IsValueAlpha = function(val) {
+        var isAlphaRegex = new RegExp("^[a-z\\s]+$", "gi");
+        return isAlphaRegex.test(val);
+    };
+
+    _exprFunctions.IsValueNumeric = function(val) {
+        var isNumericRegex = new RegExp("^[0-9,\\.\\s]+$", "gi");
+        return isNumericRegex.test(val);
+    };
+
+    _exprFunctions.IsValueAlphaNumeric = function(val) {
+        var isAlphaNumericRegex = new RegExp("^[0-9a-z\\s]+$", "gi");
+        return isAlphaNumericRegex.test(val);
+    };
+
+    _exprFunctions.IsValueOneOf = function(val, values) {
+        for(var i = 0; i < values.length; i++) {
+            var option = values[i];
+            if(val == option) return true;
+        }
+        //by default, return false
+        return false;
+    };
+
+    _exprFunctions.IsValueNotAlpha = function(val) {
+        return !_exprFunctions.IsValueAlpha(val);
+    };
+
+    _exprFunctions.IsValueNotNumeric = function(val) {
+        return !_exprFunctions.IsValueNumeric(val);
+    };
+
+    _exprFunctions.IsValueNotAlphaNumeric = function(val) {
+        return !_exprFunctions.IsValueAlphaNumeric(val);
+    };
+
+    _exprFunctions.IsValueNotOneOf = function(val, values) {
+        return !_exprFunctions.IsValueOneOf(val, values);
+    };
+
+    _exprFunctions.GetKeyPressed = function(eventInfo) {
+        return eventInfo.keyInfo;
+    };
+
+    _exprFunctions.GetCursorRectangles = function() {
+        var rects = new Object();
+        rects.lastRect = new $ax.drag.Rectangle($ax.lastMouseLocation.x, $ax.lastMouseLocation.y, 1, 1);
+        rects.currentRect = new $ax.drag.Rectangle($ax.mouseLocation.x, $ax.mouseLocation.y, 1, 1);
+        return rects;
+    };
+
+    _exprFunctions.GetWidgetRectangles = function (elementIds, eventInfo) {
+        var elementId = elementIds[0];
+        var rects = new Object();
+        var jObj = $jobj(elementId);
+        var invalid = jObj.length == 0;
+        var parent = jObj;
+        // Or are in valid if no obj can be found, or if it is not visible.
+        while(parent.length != 0 && !parent.is('body')) {
+            if(parent.css('display') == 'none') {
+                invalid = true;
+                break;
+            }
+            parent = parent.parent();
+        }
+        if(invalid) {
+            rects.lastRect = rects.currentRect = new $ax.drag.Rectangle(-1, -1, -1, -1);
+            return rects;
+        }
+
+        var axObj = $ax('#' + elementId);
+        var boundingRect = axObj.viewportBoundingRect();
+        rects.lastRect = new $ax.drag.Rectangle(
+            boundingRect.left,
+            boundingRect.top,
+            boundingRect.width,
+            boundingRect.height);
+        //rects.lastRect = new $ax.drag.Rectangle(
+        //        axObj.left(),
+        //        axObj.top(),
+        //        axObj.width(),
+        //        axObj.height());
+
+        rects.currentRect = rects.lastRect;
+        return rects;
+    };
+
+    _exprFunctions.GetWidget = function(elementId) {
+        return $ax.getWidgetInfo(elementId[0]);
+    };
+
+    _exprFunctions.GetAdaptiveView = function (eventInfo) {
+        if (eventInfo && eventInfo.srcElement) {
+            var id = eventInfo.srcElement;
+            var diagramObject = $ax.getObjectFromElementId(id);
+            if (diagramObject.owner.type == 'Axure:Master') {
+                var viewIdChain = $ax.style.getViewIdChain($ax.adaptive.currentViewId || '', id, diagramObject);
+                if (viewIdChain.length > 0) return viewIdChain[viewIdChain.length - 1];
+                else return '19e82109f102476f933582835c373474';
+            }
+        }
+        return $ax.adaptive.currentViewId || '';
+    };
+
+    _exprFunctions.IsEntering = function(movingRects, targetRects) {
+        return !movingRects.lastRect.IntersectsWith(targetRects.currentRect) && movingRects.currentRect.IntersectsWith(targetRects.currentRect);
+    };
+
+    _exprFunctions.IsLeaving = function(movingRects, targetRects) {
+        return movingRects.lastRect.IntersectsWith(targetRects.currentRect) && !movingRects.currentRect.IntersectsWith(targetRects.currentRect);
+    };
+
+    var _IsOver = _exprFunctions.IsOver = function(movingRects, targetRects) {
+        return movingRects.currentRect.IntersectsWith(targetRects.currentRect);
+    };
+
+    _exprFunctions.IsNotOver = function(movingRects, targetRects) {
+        return !_IsOver(movingRects, targetRects);
+    };
+
+    _exprFunctions.ValueContains = function(inputString, value) {
+        return inputString.indexOf(value) > -1;
+    };
+
+    _exprFunctions.ValueNotContains = function(inputString, value) {
+        return !_exprFunctions.ValueContains(inputString, value);
+    };
+
+    _exprFunctions.ToString = function(value) {
+        if(value.isWidget) {
+            return value.text;
+        }
+        return String(value);
+    };
+
+    var _evaluateExpr = $ax.expr.evaluateExpr = function(expr, eventInfo, toString) {
+        if(expr === undefined || expr === null) return undefined;
+        var result = _exprHandlers[expr.exprType](expr, eventInfo);
+        return toString ? _exprFunctions.ToString(result) : result;
+    };
+
+
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/flyout.js b/src_old/resources/scripts/axure/flyout.js
new file mode 100644
index 0000000..e98303f
--- /dev/null
+++ b/src_old/resources/scripts/axure/flyout.js
@@ -0,0 +1,286 @@
+// ******* Flyout MANAGER ******** //
+$axure.internal(function($ax) {
+    var _flyoutManager = $ax.flyoutManager = {};
+
+    var getFlyoutLabel = function(panelId) {
+        return panelId + '_flyout';
+    };
+
+    var _unregisterPanel = function(panelId, keepShown) {
+        $ax.geometry.unregister(getFlyoutLabel(panelId));
+        if(panelToSrc[panelId]) {
+            $ax.style.RemoveRolloverOverride(panelToSrc[panelId]);
+            delete panelToSrc[panelId];
+        }
+        if(!keepShown) {
+            $ax.action.addAnimation(panelId, $ax.action.queueTypes.fade, function() {
+                $ax('#' + panelId).hide();
+            });
+        }
+    };
+    _flyoutManager.unregisterPanel = _unregisterPanel;
+
+    var genPoint = $ax.geometry.genPoint;
+
+    var _updateFlyout = function(panelId) {
+        var label = getFlyoutLabel(panelId);
+        if(!$ax.geometry.polygonRegistered(label)) return;
+        var info = $ax.geometry.getPolygonInfo(label);
+        var rects = info && info.rects;
+
+        var targetWidget = $ax.getWidgetInfo(panelId);
+        rects.target = $ax.geometry.genRect(targetWidget);
+
+        // Src will stay the same, just updating
+        $ax.flyoutManager.registerFlyout(rects, panelId, panelToSrc[panelId]);
+
+        if(!$ax.geometry.checkInsideRegion(label)) _unregisterPanel(panelId);
+    };
+    _flyoutManager.updateFlyout = _updateFlyout;
+
+    var panelToSrc = {};
+    var _registerFlyout = function(rects, panelId, srcId) {
+        var label = _getFlyoutLabel(panelId);
+        var callback = function(info) {
+            // If leaving object or already outside it, then unregister, otherwise just return
+            if(!info.exiting && !info.outside) return;
+            _unregisterPanel(panelId);
+        };
+        var points = [];
+
+        var lastSrcId = panelToSrc[panelId];
+        if(lastSrcId != srcId) {
+            if(lastSrcId) $ax.style.RemoveRolloverOverride(lastSrcId);
+            if(srcId) {
+                $ax.style.AddRolloverOverride(srcId);
+                panelToSrc[panelId] = srcId;
+            } else delete panelToSrc[panelId];
+        }
+
+        // rects should be one or two rectangles
+        if(!rects.src) {
+            var rect = rects.target;
+            points.push(genPoint(rect.Left(), rect.Top()));
+            points.push(genPoint(rect.Right(), rect.Top()));
+            points.push(genPoint(rect.Right(), rect.Bottom()));
+            points.push(genPoint(rect.Left(), rect.Bottom()));
+        } else {
+            var r0 = rects.src;
+            var r1 = rects.target;
+
+            // Right left of right, left right of left, top below top, bottom above bottom
+            var rlr = r0.Right() <= r1.Right();
+            var lrl = r0.Left() >= r1.Left();
+            var tbt = r0.Top() >= r1.Top();
+            var bab = r0.Bottom() <= r1.Bottom();
+
+            var info = { rlr: rlr, lrl: lrl, tbt: tbt, bab: bab };
+
+            if((rlr && lrl) || (tbt && bab)) {
+                points = getSmallPolygon(r0, r1, info);
+            } else {
+                points = getLargePolygon(r0, r1, info);
+            }
+        }
+
+        $ax.geometry.registerPolygon(label, points, callback, { rects: rects });
+    };
+    _flyoutManager.registerFlyout = _registerFlyout;
+
+    var _getFlyoutLabel = function(panelId) {
+        return panelId + '_flyout';
+    };
+
+    var _reregisterAllFlyouts = function() {
+        for(var panelId in panelToSrc) _reregisterFlyout(panelId);
+    };
+    _flyoutManager.reregisterAllFlyouts = _reregisterAllFlyouts;
+
+    var _reregisterFlyout = function(panelId) {
+        var rects = $ax.geometry.getPolygonInfo(getFlyoutLabel(panelId)).rects;
+        _registerFlyout(rects, panelId, panelToSrc[panelId]);
+    };
+
+    // This is the reduced size polygon connecting r0 to r1 by means of horizontal or vertical lines.
+    var getSmallPolygon = function(r0, r1, info) {
+        var points = [];
+
+        // NOTE: currently I make the assumption that if horizontal/vertical connecting lines from the src hit the target
+        //        Meaning if horizontal, rlr and lrl are true, and if vertical, tbt and bab are true.
+
+        var r0Left = r0.Left();
+        var r0Right = r0.Right();
+        var r0Top = r0.Top();
+        var r0Bottom = r0.Bottom();
+        var r1Left = r1.Left();
+        var r1Right = r1.Right();
+        var r1Top = r1.Top();
+        var r1Bottom = r1.Bottom();
+
+        points.push(genPoint(r1Left, r1Top));
+
+        if(!info.tbt) {
+            points.push(genPoint(r0Left, r1Top));
+            points.push(genPoint(r0Left, r0Top));
+            points.push(genPoint(r0Right, r0Top));
+            points.push(genPoint(r0Right, r1Top));
+        }
+
+        points.push(genPoint(r1Right, r1Top));
+
+        if(!info.rlr) {
+            points.push(genPoint(r1Right, r0Top));
+            points.push(genPoint(r0Right, r0Top));
+            points.push(genPoint(r0Right, r0Bottom));
+            points.push(genPoint(r1Right, r0Bottom));
+        }
+
+        points.push(genPoint(r1Right, r1Bottom));
+
+        if(!info.bab) {
+            points.push(genPoint(r0Right, r1Bottom));
+            points.push(genPoint(r0Right, r0Bottom));
+            points.push(genPoint(r0Left, r0Bottom));
+            points.push(genPoint(r0Left, r1Bottom));
+        }
+
+        points.push(genPoint(r1Left, r1Bottom));
+
+        if(!info.lrl) {
+            points.push(genPoint(r1Left, r0Bottom));
+            points.push(genPoint(r0Left, r0Bottom));
+            points.push(genPoint(r0Left, r0Top));
+            points.push(genPoint(r1Left, r0Top));
+        }
+
+        return points;
+    };
+
+    // This is the original algorithm that connects the most extream corners to make polygon
+    var getLargePolygon = function(r0, r1, info) {
+        var points = [];
+
+        var r0Left = r0.Left();
+        var r0Right = r0.Right();
+        var r0Top = r0.Top();
+        var r0Bottom = r0.Bottom();
+        var r1Left = r1.Left();
+        var r1Right = r1.Right();
+        var r1Top = r1.Top();
+        var r1Bottom = r1.Bottom();
+
+        // Top lefts
+        if(info.tbt) {
+            if(!info.lrl) points.push(genPoint(r0Left, r0Top));
+            points.push(genPoint(r1Left, r1Top));
+        } else {
+            if(info.lrl) points.push(genPoint(r1Left, r1Top));
+            points.push(genPoint(r0Left, r0Top));
+        }
+
+        // Top rights
+        if(info.tbt) {
+            points.push(genPoint(r1Right, r1Top));
+            if(!info.rlr) points.push(genPoint(r0Right, r0Top));
+        } else {
+            points.push(genPoint(r0Right, r0Top));
+            if(info.rlr) points.push(genPoint(r1Right, r1Top));
+        }
+
+        // Bottom rights
+        if(info.bab) {
+            if(!info.rlr) points.push(genPoint(r0Right, r0Bottom));
+            points.push(genPoint(r1Right, r1Bottom));
+        } else {
+            if(info.rlr) points.push(genPoint(r1Right, r1Bottom));
+            points.push(genPoint(r0Right, r0Bottom));
+        }
+
+        // Bottom Lefts
+        if(info.bab) {
+            points.push(genPoint(r1Left, r1Bottom));
+            if(!info.lrl) points.push(genPoint(r0Left, r0Bottom));
+        } else {
+            points.push(genPoint(r0Left, r0Bottom));
+            if(info.lrl) points.push(genPoint(r1Left, r1Bottom));
+        }
+        return points;
+    };
+});
+
+// ******* Placeholder Manager ********* //
+
+$axure.internal(function($ax) {
+    var _placeholderManager = $ax.placeholderManager = {};
+    var idToPlaceholderInfo = {};
+
+    var _registerPlaceholder = function(elementId, text, password) {
+        idToPlaceholderInfo[elementId] = { text: text, password: password, active: false };
+    };
+    _placeholderManager.registerPlaceholder = _registerPlaceholder;
+
+    _placeholderManager.refreshPlaceholder = function (elementId) {
+        var info = idToPlaceholderInfo[elementId];
+        if (!info || !info.active) return;
+        $ax.style.SetWidgetPlaceholder(elementId, true, info.text, info.password);
+    }
+
+    var _updatePlaceholder = function(elementId, active, clearText) {
+        var inputId = $ax.repeater.applySuffixToElementId(elementId, '_input');
+
+        var info = idToPlaceholderInfo[elementId];
+        if(!info || info.active == active) return;
+        info.active = active;
+
+        if(active) var text = info.text;
+        else if(!ANDROID) text = clearText ? '' : document.getElementById(inputId).value;
+        else {
+            var currentText = document.getElementById(inputId).value;
+            if(!clearText) text = currentText;
+            else if(currentText == info.text) text = "";
+            else {
+                var lastIndex = currentText.lastIndexOf(info.text);
+                //here i am assuming the text is always inserted in front
+                text = currentText.substring(0, lastIndex);
+            }
+        }
+
+        $ax.style.SetWidgetPlaceholder(elementId, active, text, info.password);
+    };
+    _placeholderManager.updatePlaceholder = _updatePlaceholder;
+
+    var _isActive = function(elementId) {
+        var info = idToPlaceholderInfo[elementId];
+        return Boolean(info && info.active);
+    };
+    _placeholderManager.isActive = _isActive;
+
+    var _selectRange = function(elementId, start, end) {
+        $jobj(elementId).each(function() {
+            if(this.setSelectionRange) {
+                var validTypes = ["text", "search", "url", "tel", "password"];
+                if(this.tagName.toLowerCase() != "input" || validTypes.indexOf(this.type) > -1) {
+                    this.focus();
+                    this.setSelectionRange(start, end);
+                }
+            } else if(this.createTextRange) {
+                var range = this.createTextRange();
+                range.collapse(true);
+                range.moveEnd('character', end);
+                range.moveStart('character', start);
+                range.select();
+            }
+        });
+    };
+    _placeholderManager.selectRange = _selectRange;
+
+    var _moveCaret = function(id, index) {
+        var inputIndex = id.indexOf('_input');
+        if(inputIndex == -1) return;
+        var inputId = id.substring(0, inputIndex);
+
+        if(!_isActive(inputId)) return;
+        _selectRange(id, index, index);
+    };
+    _placeholderManager.moveCaret = _moveCaret;
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/geometry.js b/src_old/resources/scripts/axure/geometry.js
new file mode 100644
index 0000000..4bdc0f0
--- /dev/null
+++ b/src_old/resources/scripts/axure/geometry.js
@@ -0,0 +1,294 @@
+// ******* Region MANAGER ******** //
+$axure.internal(function($ax) {
+    var _geometry = $ax.geometry = {};
+    var regionMap = {};
+    var regionList = [];
+
+    var _unregister = function(label) {
+        var regionIndex = regionList.indexOf(label);
+        if(regionIndex != -1) {
+            var end = $ax.splice(regionList, regionIndex + 1);
+            $ax.splice(regionList, regionIndex, regionList.length - regionIndex);
+            regionList = regionList.concat(end);
+        }
+        delete regionMap[label];
+    };
+    _geometry.unregister = _unregister;
+
+    var clear = function() {
+        regionMap = {};
+        regionList = [];
+    };
+
+    var _polygonRegistered = function(label) {
+        return Boolean(regionMap[label]);
+    };
+    _geometry.polygonRegistered = _polygonRegistered;
+
+    // Must be counterclockwise, or enter/exit will be wrong
+    var _registerPolygon = function(label, points, callback, info) {
+        var regionIndex = regionList.indexOf(label);
+        if(regionIndex == -1) regionList.push(label);
+        regionMap[label] = { points: points, callback: callback, info: info };
+    };
+    _geometry.registerPolygon = _registerPolygon;
+
+    var _getPolygonInfo = function(label) {
+        if(!_polygonRegistered(label)) return undefined;
+        return regionMap[label].info;
+    };
+    _geometry.getPolygonInfo = _getPolygonInfo;
+
+
+
+    var _genRect = function(info, roundHalfPixel) {
+        var x = info.pagex();
+        var y = info.pagey();
+        var w = info.width();
+        var h = info.height();
+
+        if(roundHalfPixel) {
+            if(x % 1 != 0) {
+                x = Math.floor(x);
+                w++;
+            }
+            if(y % 1 != 0) {
+                y = Math.floor(y);
+                h++;
+            }
+        }
+
+        var r = x + w;
+        var b = y + h;
+
+        var rect = {
+            X: function() { return x; },
+            Y: function() { return y; },
+            Wigth: function() { return w; },
+            Height: function() { return h; },
+            Left: function() { return x; },
+            Right: function() { return r; },
+            Top: function() { return y; },
+            Bottom: function() { return b; }
+        };
+        return rect;
+    };
+    _geometry.genRect = _genRect;
+
+    var _genPoint = function(x, y) {
+        return { x: x, y: y };
+    };
+    _geometry.genPoint = _genPoint;
+
+    var oldPoint = _genPoint(0, 0);
+    _geometry.tick = function(x, y, end) {
+        var lastPoint = oldPoint;
+        var nextPoint = oldPoint = _genPoint(x, y);
+        var line = { p1: lastPoint, p2: nextPoint };
+        if(!regionList.length) return;
+
+        for(var i = 0; i < regionList.length; i++) {
+            var region = regionMap[regionList[i]];
+            var points = region.points;
+            for(var j = 0; j < points.length; j++) {
+                var startSegment = points[j];
+                var endSegment = points[(j + 1) % points.length];
+                var intersectInfo = linesIntersect(line, { p1: startSegment, p2: endSegment });
+                if(intersectInfo) {
+                    region.callback(intersectInfo);
+                    break;
+                }
+            }
+        }
+
+        if(end) clear();
+    };
+
+    // Info if the one line touches the other (even barely), false otherwise
+    // Info includes point, if l1 is entering or exiting l2, and any ties that happened, or parallel info
+    var linesIntersect = function(l1, l2) {
+        var retval = {};
+        var ties = {};
+
+        var l1p1 = l1.p1.x < l1.p2.x || (l1.p1.x == l1.p2.x && l1.p1.y < l1.p2.y) ? l1.p1 : l1.p2;
+        var l1p2 = l1.p1.x < l1.p2.x || (l1.p1.x == l1.p2.x && l1.p1.y < l1.p2.y) ? l1.p2 : l1.p1;
+        var m1 = (l1p2.y - l1p1.y) / (l1p2.x - l1p1.x);
+
+        var l2p1 = l2.p1.x < l2.p2.x || (l2.p1.x == l2.p2.x && l2.p1.y < l2.p2.y) ? l2.p1 : l2.p2;
+        var l2p2 = l2.p1.x < l2.p2.x || (l2.p1.x == l2.p2.x && l2.p1.y < l2.p2.y) ? l2.p2 : l2.p1;
+        var m2 = (l2p2.y - l2p1.y) / (l2p2.x - l2p1.x);
+
+        var l1Vert = l1.p1.x == l1.p2.x;
+        var l2Vert = l2.p1.x == l2.p2.x;
+        if(l1Vert || l2Vert) {
+            if(l1Vert && l2Vert) {
+                // If the lines don't follow the same path, return
+                if(l1p1.x != l2p1.x) return false;
+                // if they never meet, return
+                if(l1p2.y < l2p1.y || l1p1.y > l2p2.y) return false;
+                var firstVert = l1p1.y >= l2p1.y ? l1p1 : l2p1;
+                var secondVert = l1p2.y <= l2p2.y ? l1p2 : l2p2;
+                // First is from the perspective of l1
+                retval.parallel = {
+                    first: l1p1 == l1.p1 ? firstVert : secondVert,
+                    second: l1p2 == l1.p2 ? secondVert : firstVert,
+                    sameDirection: (l1p1 == l1.p1) == (l2p1 == l2.p1)
+                };
+
+                return retval;
+            }
+
+            var x1 = l2Vert ? l1p1.x : l2p1.x;
+            var x2 = l2Vert ? l1p2.x : l2p2.x;
+            var xVert = l2Vert ? l2p1.x : l1p1.x;
+
+            var y = l2Vert ? l1p1.y + (xVert - x1) * m1 : l2p1.y + (xVert - x1) * m2;
+            var y1 = l2Vert ? l2p1.y : l1p1.y;
+            var y2 = l2Vert ? l2p2.y : l1p2.y;
+            if(xVert >= x1 && xVert <= x2 && y >= y1 && y <= y2) {
+                retval.point = { x: xVert, y: y };
+                retval.exiting = l2Vert == (y1 == (l2Vert ? l2.p1.y : l1.p1.y)) == (x1 == (l2Vert ? l1.p1.x : l2.p1.x));
+                retval.entering = !retval.exiting;
+
+                // Calculate ties
+                if(x1 == xVert) {
+                    ties[l2Vert ? 'l1' : 'l2'] = (x1 == (l2Vert ? l1.p1.x : l2.p1.x)) ? 'start' : 'end';
+                    retval.ties = ties;
+                } else if(x2 == xVert) {
+                    ties[l2Vert ? 'l1' : 'l2'] = (x2 == (l2Vert ? l1.p2.x : l2.p2.x)) ? 'end' : 'start';
+                    retval.ties = ties;
+                }
+                if(y1 == y) {
+                    ties[l2Vert ? 'l2' : 'l1'] = (y1 == (l2Vert ? l2.p1.y : l1.p1.y)) ? 'start' : 'end';
+                    retval.ties = ties;
+                } else if(y2 == y) {
+                    ties[l2Vert ? 'l2' : 'l1'] = (y2 == (l2Vert ? l2.p2.y : l1.p2.y)) ? 'end' : 'start';
+                    retval.ties = ties;
+                }
+
+                return retval;
+            }
+            return false;
+        }
+        // If here, no vertical lines
+
+        if(m1 == m2) {
+            // If the lines don't follow the same path, return
+            if(l1p1.y != (l2p1.y + (l1p1.x - l2p1.x) * m1)) return false;
+            // if they never meet, return
+            if(l1p2.x < l2p1.x || l1p1.x > l2p2.x) return false;
+            var first = l1p1.x >= l2p1.x ? l1p1 : l2p1;
+            var second = l1p2.x <= l2p2.x ? l1p2 : l2p2;
+            // First is from the perspective of l1
+            retval.parallel = {
+                first: l1p1 == l1.p1 ? first : second,
+                second: l1p2 == l1.p2 ? second : first,
+                sameDirection: (l1p1 == l1.p1) == (l2p1 == l2.p1)
+            };
+
+            return retval;
+        }
+
+        var x = (l2p1.y - l2p1.x * m2 - l1p1.y + l1p1.x * m1) / (m1 - m2);
+
+        // Check if x is out of bounds
+        if(x >= l1p1.x && x <= l1p2.x && x >= l2p1.x && x <= l2p2.x) {
+            var y = l1p1.y + (x - l1p1.x) * m1;
+            retval.point = { x: x, y: y };
+            retval.entering = m1 > m2 == (l1p1 == l1.p1) == (l2p1 == l2.p1);
+            retval.exiting = !retval.entering;
+
+            // Calculate ties
+            if(l1.p1.x == x) {
+                ties.l1 = 'start';
+                retval.ties = ties;
+            } else if(l1.p2.x == x) {
+                ties.l1 = 'end';
+                retval.ties = ties;
+            }
+            if(l2.p1.x == x) {
+                ties.l2 = 'start';
+                retval.ties = ties;
+            } else if(l2.p2.x == x) {
+                ties.l2 = 'end';
+                retval.ties = ties;
+            }
+
+            return retval;
+        }
+        return false;
+    };
+
+    var _checkInsideRegion = function(label, point) {
+        if(!_polygonRegistered(label)) return false;
+
+        return _checkInside(regionMap[label].points, point || $ax.mouseLocation);
+    };
+    _geometry.checkInsideRegion = _checkInsideRegion;
+
+    // Returns true if point is inside the polygon, including ties
+    var _checkInside = function(polygon, point) {
+        // Make horizontal line wider than the polygon, with the y of point to test location
+        var firstX = polygon[0].x;
+        var secondX = firstX;
+        var i;
+        for(i = 1; i < polygon.length; i++) {
+            var polyX = polygon[i].x;
+            firstX = Math.min(firstX, polyX);
+            secondX = Math.max(secondX, polyX);
+        }
+        var line = {
+            p1: _genPoint(--firstX, point.y),
+            p2: _genPoint(++secondX, point.y)
+        };
+
+        // If entered true, with closest intersection says you are inside the polygon.
+        var entered = false;
+        // Closest is the closest intersection to the left of the point
+        var closest = line.p1.x;
+        // This is for if intersections hit the same point, to find out which is correct
+        var cos = -2;
+
+        var getCos = function(line) {
+            var x = line.p2.x - line.p1.x;
+            var y = line.p2.y - line.p1.y;
+            return x / Math.sqrt(x * x + y * y);
+        };
+
+        for(i = 0; i < polygon.length; i++) {
+            var polyLine = { p1: polygon[i], p2: polygon[(i + 1) % polygon.length] };
+            var intersectInfo = linesIntersect(line, polyLine);
+            if(!intersectInfo) continue;
+
+            if(intersectInfo.parallel) {
+                // Only really care about this if it actually touches the point
+                if(intersectInfo.parallel.first.x <= point.x && intersectInfo.parallel.second.x >= point.x) return true;
+                continue;
+            }
+
+            var intersectionX = intersectInfo.point.x;
+            if(intersectionX > point.x || intersectionX < closest) continue;
+            if(intersectionX == point.x) return true;
+
+            // If closer than last time, reset cosine.
+            if(intersectionX != closest) cos = -2;
+
+            // For getting cosine, need to possibly reverse the direction of polyLine.
+            if(intersectInfo.ties) {
+                // Tie must be on l2, if the ties is end, reverse so cosine indicates how close the angle is to that of 'point' from here.
+                if(intersectInfo.ties.l2 == 'end') polyLine = { p1: polyLine.p2, p2: polyLine.p1 };
+            } else {
+                // It is on both side, so you can take the larger one
+                if(polyLine.p1.x > polyLine.p2.x) polyLine = { p1: polyLine.p2, p2: polyLine.p1 };
+            }
+            var currCos = getCos(polyLine);
+            if(currCos > cos) {
+                cos = currCos;
+                closest = intersectionX;
+                entered = intersectInfo.entering;
+            }
+        }
+        return entered;
+    };
+    _geometry.checkInside = _checkInside;
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/globals.js b/src_old/resources/scripts/axure/globals.js
new file mode 100644
index 0000000..0c5c4e8
--- /dev/null
+++ b/src_old/resources/scripts/axure/globals.js
@@ -0,0 +1,7 @@
+$axure.internal(function($ax) {
+    var _globals = $ax.globals = {};
+
+    $ax.globals.MaxZIndex = 1000;
+    $ax.globals.MinZIndex = -1000;
+    
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/ie.js b/src_old/resources/scripts/axure/ie.js
new file mode 100644
index 0000000..cd99447
--- /dev/null
+++ b/src_old/resources/scripts/axure/ie.js
@@ -0,0 +1,344 @@
+
+//// ******* Internet Explorer MANAGER ******** //
+////this is to handle all the stupid IE Stuff
+//$axure.internal(function($ax) {
+//    if(!IE_10_AND_BELOW) return;
+
+//    var _ieColorManager = {};
+//    if(Number(BROWSER_VERSION) < 9) $ax.ieColorManager = _ieColorManager;
+
+//    var _applyIEFixedPosition = function() {
+//        if(Number(BROWSER_VERSION) >= 7) return;
+
+//        $axure(function(diagramObject) { return diagramObject.fixedVertical; }).$()
+//            .appendTo($('body'))
+//            .css('position', 'absolute').css('margin-left', 0 + 'px').css('margin-top', 0 + 'px');
+
+//        var handleScroll = function() {
+//            $axure(function(diagramObject) { return diagramObject.fixedVertical; })
+//                .each(function(diagramObject, elementId) {
+//                    var win = $(window);
+//                    var windowWidth = win.width();
+//                    var windowHeight = win.height();
+//                    var windowScrollLeft = win.scrollLeft();
+//                    var windowScrollTop = win.scrollTop();
+
+//                    var newLeft = 0;
+//                    var newTop = 0;
+//                    var elementQuery = $('#' + elementId);
+//                    var elementAxQuery = $ax('#' + elementId);
+//                    var width = elementAxQuery.width();
+//                    var height = elementAxQuery.height();
+
+//                    var horz = diagramObject.fixedHorizontal;
+//                    if(horz == 'left') {
+//                        newLeft = windowScrollLeft + diagramObject.fixedMarginHorizontal;
+//                    } else if(horz == 'center') {
+//                        newLeft = windowScrollLeft + ((windowWidth - width) / 2) + diagramObject.fixedMarginHorizontal;
+//                    } else if(horz == 'right') {
+//                        newLeft = windowScrollLeft + windowWidth - width - diagramObject.fixedMarginHorizontal;
+//                    }
+
+//                    var vert = diagramObject.fixedVertical;
+//                    if(vert == 'top') {
+//                        newTop = windowScrollTop + diagramObject.fixedMarginVertical;
+//                    } else if(vert == 'middle') {
+//                        newTop = windowScrollTop + ((windowHeight - height) / 2) + diagramObject.fixedMarginVertical;
+//                    } else if(vert == 'bottom') {
+//                        newTop = windowScrollTop + windowHeight - height - diagramObject.fixedMarginVertical;
+//                    }
+//                    elementQuery.css('top', newTop + 'px').css('left', newLeft + 'px');
+//                });
+//        };
+
+//        $(window).scroll(handleScroll);
+//        $axure.resize(handleScroll);
+//        handleScroll();
+//    };
+
+//    var _applyBackground = function() {
+//        if(Number(BROWSER_VERSION) >= 9) return;
+
+//        var styleChain = $ax.adaptive.getAdaptiveIdChain($ax.adaptive.currentViewId);
+//        var argb = _getArgb($ax.pageData.page, styleChain);
+//        var hexColor = _getHexColor(argb, false);
+//        if(hexColor) $('body').css('background-color', hexColor);
+
+//        _applyBackgroundToQuery($ax('*'));
+//    };
+
+//    var _applyBackgroundToQuery = function(query) {
+//        if(Number(BROWSER_VERSION) >= 9) return;
+
+//        var styleChain = $ax.adaptive.getAdaptiveIdChain($ax.adaptive.currentViewId);
+//        query.each(function(obj, elementId) {
+//            if ($ax.public.fn.IsDynamicPanel(obj.type)) {
+//                var stateCount = obj.diagrams.length;
+//                for(var j = 0; j < stateCount; j++) {
+//                    var stateId = $ax.repeater.applySuffixToElementId(elementId, '_state' + j);
+//                    var argb = _getArgb(obj.diagrams[j], styleChain);
+//                    var hexColor = _getHexColor(argb, true);
+//                    if(hexColor) $jobj(stateId).css('background-color', hexColor);
+//                }
+//            } else if ($ax.public.fn.IsRepeater(obj.type)) {
+
+//            }
+//        });
+//    };
+//    _ieColorManager.applyBackground = _applyBackgroundToQuery;
+
+//    var _getArgb = function(diagram, styleChain) {
+//        var argb = undefined;
+//        for(var i = 0; i < styleChain.length && !argb; i++) {
+//            var style = diagram.adaptiveStyles[styleChain[i]];
+//            argb = style.fill && style.fill.color;
+//        }
+//        if(!argb) argb = diagram.style.fill.color;
+//        return argb;
+//    };
+
+//    var gMult = 256;
+//    var rMult = gMult * 256;
+//    var aMult = rMult * 256;
+
+//    var _getHexColor = function(argb, allowWhite) {
+//        var a = Math.floor(argb / aMult);
+//        argb -= a * aMult;
+
+//        var r = Math.floor(argb / rMult);
+//        argb -= r * rMult;
+
+//        var g = Math.floor(argb / gMult);
+//        var b = argb - g * gMult;
+
+//        return _getColorFromArgb(a, r, g, b, allowWhite);
+//    };
+
+//    var _getColorFromArgb = function(a, r, g, b, allowWhite) {
+//        if(Number(BROWSER_VERSION) >= 9) return undefined;
+
+//        //convert the color with alpha to a color with no alpha (assuming white background)
+//        r = Math.min((r * a) / 255 + 255 - a, 255);
+//        g = Math.min((g * a) / 255 + 255 - a, 255);
+//        b = Math.min((b * a) / 255 + 255 - a, 255);
+
+//        if(a == 0) return undefined;
+//        if(!allowWhite && (r == 255 && g == 255 && b == 255)) return undefined;
+
+//        var color = '#';
+//        color += Math.floor(r / 16).toString(16);
+//        color += Math.floor(r % 16).toString(16);
+//        color += Math.floor(g / 16).toString(16);
+//        color += Math.floor(g % 16).toString(16);
+//        color += Math.floor(b / 16).toString(16);
+//        color += Math.floor(b % 16).toString(16);
+//        return color;
+//    };
+//    _ieColorManager.getColorFromArgb = _getColorFromArgb;
+
+//    var getIEOffset = function(transform, rect) {
+//        var translatedVertexes = [
+//            $axure.utils.Vector2D(0, 0), //we dont translate, so the orgin is fixed
+//            transform.mul($axure.utils.Vector2D(0, rect.height)),
+//            transform.mul($axure.utils.Vector2D(rect.width, 0)),
+//            transform.mul($axure.utils.Vector2D(rect.width, rect.height))];
+
+//        var minX = 0, minY = 0, maxX = 0, maxY = 0;
+//        $.each(translatedVertexes, function(index, p) {
+//            minX = Math.min(minX, p.x);
+//            minY = Math.min(minY, p.y);
+//            maxX = Math.max(maxX, p.x);
+//            maxY = Math.max(maxY, p.y);
+//        });
+
+//        return $axure.utils.Vector2D(
+//            (maxX - minX - rect.width) / 2,
+//            (maxY - minY - rect.height) / 2);
+//    };
+
+//    var _filterFromTransform = function(transform) {
+//        return "progid:DXImageTransform.Microsoft.Matrix(M11=" + transform.m11 +
+//            ", M12=" + transform.m12 + ", M21=" + transform.m21 +
+//                ", M22=" + transform.m22 + ", SizingMethod='auto expand')";
+//    };
+
+//    var _applyIERotation = function() {
+//        if(Number(BROWSER_VERSION) >= 9) return;
+
+//        $axure(function(diagramObject) {
+//            return ((diagramObject.style.rotation && Math.abs(diagramObject.style.rotation) > 0.1)
+//                || (diagramObject.style.textRotation && Math.abs(diagramObject.style.textRotation) > 0.1))
+//                && !diagramObject.isContained;
+//        }).each(function(diagramObject, elementId) {
+//            var rotation = diagramObject.style.rotation || 0;
+//            var $element = $('#' + elementId);
+//            var axElement = $ax('#' + elementId);
+//            var width = axElement.width();
+//            var height = axElement.height();
+//            var originX = width / 2;
+//            var originY = height / 2;
+
+//            var shapeIeOffset;
+//            $element.children().each(function() {
+//                var $child = $(this);
+//                var axChild = $ax('#' + $child.attr('id'));
+//                var childWidth = axChild.width();
+//                var childHeight = axChild.height() + $child.position().top;
+//                var centerX = $child.position().left + (childWidth / 2);
+//                var centerY = $child.position().top + (childHeight / 2);
+//                var deltaX = centerX - originX;
+//                var deltaY = centerY - originY;
+
+//                var effectiveRotation = rotation;
+//                var textObject = $ax.getObjectFromElementId($child.attr('id'));
+//                if(textObject) {
+//                    if(textObject.style.textRotation) effectiveRotation = textObject.style.textRotation;
+//                    else return;
+//                }
+
+//                var transform = $ax.utils.Matrix2D.identity().rotate(effectiveRotation);
+//                var filter = _filterFromTransform(transform);
+
+//                $child.css('filter', filter)
+//                    .width(childWidth + 1)
+//                    .height(childHeight + 1);
+
+//                var p = transform.mul($ax.utils.Vector2D(deltaX, deltaY));
+//                var ieOffset = getIEOffset(transform, { width: childWidth, height: childHeight });
+//                if(!textObject) {
+//                    shapeIeOffset = ieOffset;
+//                } else {
+//                    // This is a close approximation, but not exact
+//                    if(diagramObject.style.verticalAlignment != 'top') ieOffset.y -= shapeIeOffset.y + Math.abs(shapeIeOffset.x);
+//                }
+
+//                $child.css("margin-left", -ieOffset.x - deltaX + p.x).css("margin-top", -ieOffset.y - deltaY + p.y);
+//            });
+//        });
+//    };
+
+//    var _fixIEStretchBackground = function() {
+//        if(Number(BROWSER_VERSION) >= 9) return;
+//        var pageStyle = $ax.adaptive.getPageStyle();
+//        if(!pageStyle.imageRepeat || pageStyle.imageRepeat == 'auto') return;
+
+//        $('body').css('background-image', 'none');
+//        var viewId = $ax.adaptive.currentViewId;
+//        var imageInfo = viewId ? $ax.pageData.viewIdToBackgroundImageInfo && $ax.pageData.viewIdToBackgroundImageInfo[viewId] : $ax.pageData.defaultBackgroundImageInfo;
+//        if(imageInfo && imageInfo.path) {
+//            if($('#bg_img').length == 0) $('body').append('<img id="bg_img"/>');
+//            $('#bg_img').attr('src', imageInfo.path).css('position', 'fixed').css('z-index', '-10000');
+//            _resizeIEBackground();
+//        } else $('#bg_img').remove();
+//    };
+
+//    var _resizeIEBackground = function() {
+//        if(Number(BROWSER_VERSION) >= 9) return;
+//        //var page = $ax.pageData.page;
+//        var viewId = $ax.adaptive.currentViewId;
+//        var pageStyle = $ax.adaptive.getPageStyle();
+//        if(!$ax.pageData.defaultBackgroundImageInfo && !$ax.pageData.viewIdToBackgroundImageInfo) return;
+//        var imageInfo = viewId ? $ax.pageData.viewIdToBackgroundImageInfo[viewId] : $ax.pageData.defaultBackgroundImageInfo;
+//        if(!imageInfo) return;
+//        var imageWidth = imageInfo.width;
+//        var imageHeight = imageInfo.height;
+//        var windowWidth = $(window).width();
+//        var windowHeight = $(window).height();
+//        var isCover = pageStyle.imageRepeat == 'cover';
+
+//        var wRatio = windowWidth / imageWidth;
+//        var hRatio = windowHeight / imageHeight;
+//        var ratio = wRatio;
+//        if(isCover) {
+//            if(hRatio > wRatio) ratio = hRatio;
+//        } else {
+//            if(hRatio < wRatio) ratio = hRatio;
+//        }
+//        var width = imageWidth * ratio;
+//        var height = imageHeight * ratio;
+
+//        var left = '0px';
+//        if((isCover && width > windowWidth) || (!isCover && width < windowWidth)) {
+//            if(pageStyle.imageHorizontalAlignment == 'center') {
+//                left = ((windowWidth - width) / 2) + 'px';
+//            } else if(pageStyle.imageHorizontalAlignment == 'far') {
+//                left = (windowWidth - width) + 'px';
+//            }
+//        }
+
+//        var top = '0px';
+//        if((isCover && height > windowHeight) || (!isCover && height < windowHeight)) {
+//            if(pageStyle.imageVerticalAlignment == 'center') {
+//                top = ((windowHeight - height) / 2) + 'px';
+//            } else if(pageStyle.imageVerticalAlignment == 'far') {
+//                top = (windowHeight - height) + 'px';
+//            }
+//        }
+
+//        $('#bg_img').css('top', top).css('left', left).css('width', width).css('height', height);
+//    };
+
+//    var _fixAllPngs = function() {
+//        if(!(/MSIE ((5\.5)|6)/.test(window.navigator.userAgent) && window.navigator.platform == "Win32")) return;
+
+//        $('img[src$=".png"]').each(function() {
+//            if(!this.complete) {
+//                this.onload = function() { $axure.utils.fixPng(this); };
+//            } else {
+//                $axure.utils.fixPng(this);
+//            }
+//        });
+//    };
+
+//    var _fixInputSize = function() {
+//        if(Number(BROWSER_VERSION) >= 8 || window.navigator.userAgent.indexOf("Trident/4.0") > -1) return;
+//        var inputs = $('input').not(':input[type=button], :input[type=submit], :input[type=radio], :input[type=checkbox]');
+//        inputs.each(function() {
+//            var $input = $(this);
+//            var axInput = $ax('#' + $input.attr('id'));
+//            $input.css('height', (axInput.height() - 4 + 'px')).css('width', (axInput.width() - 2 + 'px'));
+//        });
+
+//        var textAreas = $($ax.constants.TEXT_AREA_TYPE);
+//        textAreas.each(function() {
+//            var $textArea = $(this);
+//            var axText = $ax('#' + $textArea.attr('id'));
+//            $textArea.css('height', (axText.height() - 6 + 'px')).css('width', (axText.width() - 6 + 'px'));
+//        });
+//    };
+
+//    var _fixInputBackground = function() {
+//        var inputs = $('input').not(':input[type=button], :input[type=submit], :input[type=radio], :input[type=checkbox]');
+//        inputs = inputs.add($($ax.constants.TEXT_AREA_TYPE));
+//        inputs.each(function() {
+//            var $input = $(this);
+//            if($input.css('background-color') == 'transparent') {
+//                $input.css('background-image', 'url(../../transparent.gif)');
+//            } else {
+//                $input.css('background-image', '');
+//            }
+//        });
+//    };
+
+//    $(document).ready(function() {
+//        _fixIEStretchBackground();
+//        _applyIEFixedPosition();
+//        $axure.resize(function() {
+//            _resizeIEBackground();
+//        });
+//        $ax.adaptive.bind('viewChanged', function() {
+//            _fixIEStretchBackground();
+//            _applyBackground();
+//            _fixInputBackground();
+//        });
+
+
+//        _fixAllPngs();
+//        _applyIERotation();
+//        _applyBackground();
+//        _fixInputSize();
+//        _fixInputBackground();
+//    });
+
+
+//});
diff --git a/src_old/resources/scripts/axure/init.temp.js b/src_old/resources/scripts/axure/init.temp.js
new file mode 100644
index 0000000..a6869f1
--- /dev/null
+++ b/src_old/resources/scripts/axure/init.temp.js
@@ -0,0 +1,326 @@
+$axure.internal(function($ax) {
+
+    $(window.document).ready(function () {
+        
+        //var readyStart = (new Date()).getTime();
+
+        //this is because the page id is not formatted as a guid
+        var pageId = $ax.pageData.page.packageId;
+
+        var pageData = {
+            id: pageId,
+            pageName: $ax.pageData.page.name,
+            location: window.location.toString(),
+            notes: $ax.pageData.page.notes,
+            widgetNotes: $ax.pageData.page.annotations,
+            //clipToView: $ax.pageData.clipToView,
+            defaultAdaptiveView: $ax.pageData.defaultAdaptiveView,
+            adaptiveViews: $ax.pageData.adaptiveViews,
+            masterNotes: []
+        };
+
+        var fnPrefix = '';
+        function pushNextPrefix() {
+            if (fnPrefix.length == 0) fnPrefix = 'A';
+            else fnPrefix = fnPrefix[0] == 'Z' ? 'A'.repeat(fnPrefix.length + 1) : String.fromCharCode(fnPrefix.charCodeAt(0) + 1).repeat(fnPrefix.length);
+        }
+
+        function populateNotes(pageForNotes) {
+            for (var master in pageForNotes.masters) {
+                //var master = pageForNotes.masters[i];
+                var masterData = pageForNotes.masters[master];
+                var hasWidgetNotes = masterData.annotations && masterData.annotations.length > 0;
+                if ((master.notes && !$.isEmptyObject(masterData.notes)) || hasWidgetNotes) {
+                    if(hasWidgetNotes) pushNextPrefix();
+                    var m = {};
+                    m.pageName = masterData.name;
+                    m.notes = masterData.notes;
+                    m.widgetNotes = masterData.annotations;
+                    pageData.masterNotes.push(m);
+                    if(hasWidgetNotes) populateOwnerToFn(m.widgetNotes);
+                }
+                populateNotes(master);
+            }
+        }
+
+        var ownerToFns = {};
+        function populateOwnerToFn(widgetNotes) {
+            if(typeof widgetNotes == 'undefined') return false;
+            for (var i = 0; i < widgetNotes.length; i++) {
+                var widgetNote = widgetNotes[i];
+                widgetNote['fn'] = fnPrefix + widgetNote['fn'];
+                var fn = widgetNote['fn'];
+                var ownerId = widgetNote['ownerId'];
+                if (ownerId !== undefined && ownerId.length > 0) {
+                    var ownerLabels = ownerToFns[ownerId];
+                    if (ownerLabels == undefined) ownerLabels = [];
+                    ownerLabels.push(fn);
+                    ownerToFns[ownerId] = ownerLabels;
+                }
+            }
+        }
+
+        populateOwnerToFn(pageData.widgetNotes);
+        populateNotes($ax.pageData);
+        pageData.ownerToFns = ownerToFns;
+
+        $ax.pageData.notesData = pageData;
+
+        //var anns = [];
+        //$ax('*').each(function (dObj, elementId) {
+        //    pushAnnotation(dObj, elementId);
+        //});
+
+        //function pushAnnotation(dObj, elementId) {
+        //    var ann = dObj.annotation;
+        //    if(ann) {
+        //        ann = $ax.deepCopy(ann);
+        //        ann["id"] = elementId;
+        //        ann["label"] = dObj.label + " (" + dObj.friendlyType + ")";
+        //        anns.push(ann);
+        //    }
+
+        //    if(dObj.type === 'repeater' && dObj.objects) {
+        //        //if it's repeater, save the id as repeaterId@scriptId
+        //        for(var i = 0, len = dObj.objects.length; i < len; i++) {
+        //            var child = dObj.objects[i];
+        //            var scriptId = $ax.getScriptIdFromPath([child.id], elementId);
+        //            pushAnnotation(child, elementId + '@' + scriptId);
+        //        }
+        //    }
+        //}
+
+        //pageData.widgetNotes = anns;
+
+        //only trigger the page.data setting if the window is on the mainframe
+        var isMainFrame = false;
+        try {
+            if(window.name == 'mainFrame' ||
+            (!CHROME_5_LOCAL && window.parent.$ && window.parent.$('#mainFrame').length > 0)) {
+                isMainFrame = true;
+
+                $ax.messageCenter.addMessageListener(function(message, data) {
+                    if(message == 'finishInit') {
+                        _processTempInit();
+                    }
+                });
+
+                $axure.messageCenter.setState('page.data', pageData);
+                window.focus();
+            }
+        } catch(e) { }
+
+        //attach here for chrome local
+        //$(window).on('load', function() {
+        //    $ax.style.initializeObjectTextAlignment($ax('*'));
+        //});
+
+        if(!isMainFrame) _processTempInit();
+    });
+
+    var touchCount = 0;
+    var lastTouch = Date.now();
+    var _registerTouchCount = $ax.registerTouchCount = function (e) {
+        var now = Date.now();
+        if (now - lastTouch < 375) {
+            if (++touchCount === 3) {
+                $(':input').blur();
+                $ax.messageCenter.postMessage('tripleClick', true);
+                e.preventDefault();
+            };
+        } else {
+            touchCount = 1;
+        }
+        lastTouch = now;
+    };
+
+    // Block IOS stalling second tap.
+    // Stop third click from also clicking mobile card
+    var _clearTouchCount = $ax.clearTouchCount = function (e) {
+        if (touchCount === 3) {
+            touchCount = 0;
+            e.preventDefault();
+        }
+    };
+
+    var _processTempInit = function() {
+        //var start = (new Date()).getTime();
+        //var end = (new Date()).getTime();
+        //window.alert('elapsed ' + (end - start));
+
+        $('iframe').each(function() {
+            var origSrc = $(this).attr('basesrc');
+
+            var $this = $(this);
+            if(origSrc) {
+                var newSrcUrl = origSrc.toLowerCase().indexOf('http://') == -1 ? $ax.globalVariableProvider.getLinkUrl(origSrc) : origSrc;
+                $this.attr('src', newSrcUrl);
+            }
+
+            if(IOS) {
+                $this.parent().css('overflow', 'auto').css('-webkit-overflow-scrolling', 'touch').css('-ms-overflow-x', 'hidden').css('overflow-x', 'hidden');
+            }
+        });
+
+        $axure.messageCenter.addMessageListener(function(message, data) {
+            if(message == 'setGlobalVar') {
+                $ax.globalVariableProvider.setVariableValue(data.globalVarName, data.globalVarValue, true);
+            }
+        });
+
+        window.lastFocusedClickable = null;
+        var _lastFocusedClickableSelector = 'input, a';
+        var shouldOutline = true;
+
+        $ax(function (dObj) { return dObj.tabbable; }).each(function (dObj, elementId) {
+            if ($ax.public.fn.IsLayer(dObj.type)) $ax.event.layerMapFocus(dObj, elementId);
+            var focusableId = $ax.event.getFocusableWidgetOrChildId(elementId);
+            var $focusable = $('#' + focusableId);
+            $focusable.attr("tabIndex", 0);
+            if($focusable.is('div') || $focusable.is('img')) {
+                $focusable.bind($ax.features.eventNames.mouseDownName, function() {
+                    shouldOutline = false;
+                });
+                attachFocusAndBlur($focusable);
+            }
+        });
+
+        $(window.document).bind($ax.features.eventNames.mouseUpName, function() {
+            shouldOutline = true;
+        });
+
+        attachFocusAndBlur($(_lastFocusedClickableSelector));
+
+        function attachFocusAndBlur($query) {
+            $query.focus(function () {
+                if(shouldOutline) {
+                    $(this).css('outline', '');
+                } else {
+                    $(this).css('outline', 'none');
+                }
+                window.lastFocusedClickable = this;
+            }).blur(function () {
+                if(window.lastFocusedClickable == this) window.lastFocusedClickable = null;
+            });
+        }
+
+        $(window.document).bind('keyup', function (e) {
+            switch(e.which) {
+                case 13:
+                case 32:
+                    if(window.lastFocusedClickable) $(window.lastFocusedClickable).click();
+                    break;
+                default: return; // exit this handler for other keys
+            }
+        });
+
+        //if($ax.document.configuration.hideAddress) {
+        //    $(window).on('load', function() {
+        //        window.setTimeout(function() {
+        //            window.scrollTo(0, 0.9);
+        //        }, 0);
+        //    });
+        //}
+
+        //if($ax.document.configuration.preventScroll) {
+        //    $(window.document).bind('touchmove', function(e) {
+        //        var inScrollable = $ax.legacy.GetScrollable(e.target) != window.document.body;
+        //        if(!inScrollable) {
+        //            e.preventDefault();
+        //        }
+        //    });
+
+        //    $ax(function(diagramObject) {
+        //        return $ax.public.fn.IsDynamicPanel(diagramObject.type) && diagramObject.scrollbars != 'none';
+        //    }).$().children().bind('touchstart', function() {
+        //        var target = this;
+        //        var top = target.scrollTop;
+        //        if(top <= 0) target.scrollTop = 1;
+        //        if(top + target.offsetHeight >= target.scrollHeight) target.scrollTop = target.scrollHeight - target.offsetHeight - 1;
+        //    });
+        //}
+
+        if(OS_MAC && WEBKIT) {
+            $ax(function(diagramObject) {
+                return $ax.public.fn.IsComboBox(diagramObject.type);
+            }).each(function(obj, id) {
+                $jobj($ax.INPUT(id)).css('-webkit-appearance', 'menulist-button');
+            });
+        }
+
+        if($ax.features.supports.mobile) {
+            $('html').first().on('touchstart', _registerTouchCount);
+            $('html').first().on('touchend', _clearTouchCount);
+
+            // Stop pinch zoom (stopping all gestures for now)
+            // Gesturestart is only supported in Safari
+            if (SAFARI) {
+                document.addEventListener("gesturestart", function (e) {
+                    e.preventDefault();
+                });
+            }
+        }
+
+        $ax.annotation.initialize();
+
+        $ax.legacy.BringFixedToFront();
+        $ax.event.initialize();
+        $ax.style.initialize();
+        $ax.visibility.initialize();
+        $ax.repeater.initialize();
+        $ax.dynamicPanelManager.initialize(); //needs to be called after visibility is initialized
+        $ax.adaptive.initialize();
+        $ax.loadDynamicPanelsAndMasters();
+        $ax.adaptive.loadFinished();
+        var start = (new Date()).getTime();
+        $ax.repeater.initRefresh();
+        var end = (new Date()).getTime();
+        console.log('loadTime: ' + (end - start) / 1000);
+        $ax.style.prefetch();
+
+        $(window).resize();
+
+        //var readyEnd = (new Date()).getTime();
+        //window.alert('elapsed ' + (readyEnd - readyStart));
+    };
+});
+
+/* extend canvas */
+var gv_hasCanvas = false;
+(function() {
+    var _canvas = document.createElement('canvas'), proto, abbrev;
+    if(gv_hasCanvas = !!(_canvas.getContext && _canvas.getContext('2d')) && typeof (CanvasGradient) !== 'undefined') {
+        function chain(func) {
+            return function() {
+                return func.apply(this, arguments) || this;
+            };
+        }
+
+        with(proto = CanvasRenderingContext2D.prototype) for(var func in abbrev = {
+            a: arc,
+            b: beginPath,
+            n: clearRect,
+            c: clip,
+            p: closePath,
+            g: createLinearGradient,
+            f: fill,
+            j: fillRect,
+            z: function(s) { this.fillStyle = s; },
+            l: lineTo,
+            w: function(w) { this.lineWidth = w; },
+            m: moveTo,
+            q: quadraticCurveTo,
+            h: rect,
+            r: restore,
+            o: rotate,
+            s: save,
+            x: scale,
+            y: function(s) { this.strokeStyle = s; },
+            u: setTransform,
+            k: stroke,
+            i: strokeRect,
+            t: translate
+        }) proto[func] = chain(abbrev[func]);
+        CanvasGradient.prototype.a = chain(CanvasGradient.prototype.addColorStop);
+    }
+})();
diff --git a/src_old/resources/scripts/axure/ios.js b/src_old/resources/scripts/axure/ios.js
new file mode 100644
index 0000000..15333b7
--- /dev/null
+++ b/src_old/resources/scripts/axure/ios.js
@@ -0,0 +1,91 @@
+$axure.internal(function ($ax) {
+    if ((IOS && SAFARI) || SHARE_APP) {
+        var outerHtml = document.documentElement;
+        outerHtml.id = 'ios-safari';
+        var html = document.createElement('html');
+        html.id = 'ios-safari-html';
+        outerHtml.appendChild(html);
+        var body = document.body;
+        html.appendChild(body);
+        Object.defineProperty(document, 'body', {
+            get: function () {
+                return body;
+            }
+        });
+        var fixedBody = document.createElement('body');
+        fixedBody.id = 'ios-safari-fixed';
+        outerHtml.appendChild(fixedBody);
+        var fixedBase = document.createElement('div');
+        fixedBase.id = 'base-fixed';
+        fixedBody.appendChild(fixedBase);
+
+        var isDevice = false;
+        var deviceWidth = 0;
+        var updateHtmlWidth = function (panelWidthOffset, scale, height, scaleN) {
+            var iosSafHtml = $('#ios-safari-html');
+            iosSafHtml.css('overflow', '');
+            iosSafHtml.css('overflow-x', '');
+            iosSafHtml.css('height', '');
+            if (isDevice) {
+                iosSafHtml.width(deviceWidth / scaleN);
+                iosSafHtml.css('overflow-x', 'hidden');
+            } else {
+                var isLandscape = window.orientation != 0 && window.orientation != 180;
+                var mobileWidth = isLandscape ? window.screen.height : window.screen.width
+                iosSafHtml.width((mobileWidth - panelWidthOffset) / scaleN);
+            }
+            if (scale == 1) {
+                iosSafHtml.css('overflow-x', 'hidden');
+                iosSafHtml.css('height', (height / scaleN) + 'px');
+            } else if (scale == 2) iosSafHtml.css('overflow', 'hidden');
+        };
+
+        updateHtmlWidth(0);
+
+        $axure('*').each(function (obj, element) {
+            if (obj && obj.fixedVertical && obj.fixedKeepInFront) {
+                var parent = $axure('#' + element).getParents(false, ['item', 'state'])[0];
+                if (!parent) {
+                    $('#base-fixed').append($('#' + element));
+                }
+            }
+        });
+
+        $axure.messageCenter.addMessageListener(function (message, data) {
+            if (message == "setContentScale") {
+                updateHtmlWidth(data.panelWidthOffset, data.scale, data.viewportHeight, data.scaleN);
+            } else if (message == "setDeviceMode") {
+                isDevice = data.device && !data.scaleToWidth;
+                if (isDevice) deviceWidth = data.width;
+                updateHtmlWidth(0);
+            }
+        });
+
+
+        $('#ios-safari-html').scroll(function () {
+            $axure.updateWindowInfo();
+        });
+        
+        var scrollStartY;
+        var maxScrollY
+        var touchStart;
+        $axure('*').each(function (obj, element) {
+            if (obj && obj.scrollbars && obj.scrollbars.toLowerCase() != 'none') {
+                if (obj.scrollbars == 'horizontalAsNeeded') return;
+
+                $('#' + element).on('touchstart', function (e) {
+                    touchStart = e.pageY;
+                    var stateId = $ax.visibility.GetPanelState($('#' + element).attr('id'));
+                    scrollStartY = $('#' + stateId).scrollTop();
+                    maxScrollY = $('#' + stateId)[0].scrollHeight - $('#' + stateId).height();
+                });
+
+                $('#' + element).on('touchmove', function (e) {
+                    if (maxScrollY <= 0) return false;
+                    if (scrollStartY == 0 && e.pageY > touchStart) e.preventDefault();
+                    if (scrollStartY == maxScrollY && e.pageY < touchStart) e.preventDefault();
+                });
+            }
+        });        
+    }
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/jquery.nicescroll.min.js b/src_old/resources/scripts/axure/jquery.nicescroll.min.js
new file mode 100644
index 0000000..c863c67
--- /dev/null
+++ b/src_old/resources/scripts/axure/jquery.nicescroll.min.js
@@ -0,0 +1 @@
+!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e(require("jquery")):e(jQuery)}(function(e){"use strict";var o=!1,t=!1,r=0,i=2e3,s=0,n=e,l=document,a=window,c=n(a),d=[];var u=a.requestAnimationFrame||a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||!1,h=a.cancelAnimationFrame||a.webkitCancelAnimationFrame||a.mozCancelAnimationFrame||!1;if(u)a.cancelAnimationFrame||(h=function(e){});else{var p=0;u=function(e,o){var t=(new Date).getTime(),r=Math.max(0,16-(t-p)),i=a.setTimeout(function(){e(t+r)},r);return p=t+r,i},h=function(e){a.clearTimeout(e)}}var m,f,g,v=a.MutationObserver||a.WebKitMutationObserver||!1,w=Date.now||function(){return(new Date).getTime()},b={zindex:"auto",cursoropacitymin:0,cursoropacitymax:1,cursorcolor:"#424242",cursorwidth:"6px",cursorborder:"1px solid #fff",cursorborderradius:"5px",scrollspeed:40,mousescrollstep:27,touchbehavior:!1,emulatetouch:!1,hwacceleration:!0,usetransition:!0,boxzoom:!1,dblclickzoom:!0,gesturezoom:!0,grabcursorenabled:!0,autohidemode:!0,background:"",iframeautoresize:!0,cursorminheight:32,preservenativescrolling:!0,railoffset:!1,railhoffset:!1,bouncescroll:!0,spacebarenabled:!0,railpadding:{top:0,right:0,left:0,bottom:0},disableoutline:!0,horizrailenabled:!0,railalign:"right",railvalign:"bottom",enabletranslate3d:!0,enablemousewheel:!0,enablekeyboard:!0,smoothscroll:!0,sensitiverail:!0,enablemouselockapi:!0,cursorfixedheight:!1,directionlockdeadzone:6,hidecursordelay:400,nativeparentscrolling:!0,enablescrollonselection:!0,overflowx:!0,overflowy:!0,cursordragspeed:.3,rtlmode:"auto",cursordragontouch:!1,oneaxismousemode:"auto",scriptpath:(f=l.currentScript||!!(m=l.getElementsByTagName("script")).length&&m[m.length-1],g=f?f.src.split("?")[0]:"",g.split("/").length>0?g.split("/").slice(0,-1).join("/")+"/":""),preventmultitouchscrolling:!0,disablemutationobserver:!1,enableobserver:!0,scrollbarid:!1},y=!1,x=function(e,p){var m=this;this.version="3.7.6",this.name="nicescroll",this.me=p;var f=n("body"),g=this.opt={doc:f,win:!1};if(n.extend(g,b),g.snapbackspeed=80,e)for(var x in g)void 0!==e[x]&&(g[x]=e[x]);if(g.disablemutationobserver&&(v=!1),this.doc=g.doc,this.iddoc=this.doc&&this.doc[0]&&this.doc[0].id||"",this.ispage=/^BODY|HTML/.test(g.win?g.win[0].nodeName:this.doc[0].nodeName),this.haswrapper=!1!==g.win,this.win=g.win||(this.ispage?c:this.doc),this.docscroll=this.ispage&&!this.haswrapper?c:this.win,this.body=f,this.viewport=!1,this.isfixed=!1,this.iframe=!1,this.isiframe="IFRAME"==this.doc[0].nodeName&&"IFRAME"==this.win[0].nodeName,this.istextarea="TEXTAREA"==this.win[0].nodeName,this.forcescreen=!1,this.canshowonmouseevent="scroll"!=g.autohidemode,this.onmousedown=!1,this.onmouseup=!1,this.onmousemove=!1,this.onmousewheel=!1,this.onkeypress=!1,this.ongesturezoom=!1,this.onclick=!1,this.onscrollstart=!1,this.onscrollend=!1,this.onscrollcancel=!1,this.onzoomin=!1,this.onzoomout=!1,this.view=!1,this.page=!1,this.scroll={x:0,y:0},this.scrollratio={x:0,y:0},this.cursorheight=20,this.scrollvaluemax=0,"auto"==g.rtlmode){var z=this.win[0]==a?this.body:this.win,k=z.css("writing-mode")||z.css("-webkit-writing-mode")||z.css("-ms-writing-mode")||z.css("-moz-writing-mode");"horizontal-tb"==k||"lr-tb"==k||""===k?(this.isrtlmode="rtl"==z.css("direction"),this.isvertical=!1):(this.isrtlmode="vertical-rl"==k||"tb"==k||"tb-rl"==k||"rl-tb"==k,this.isvertical="vertical-rl"==k||"tb"==k||"tb-rl"==k)}else this.isrtlmode=!0===g.rtlmode,this.isvertical=!1;if(this.scrollrunning=!1,this.scrollmom=!1,this.observer=!1,this.observerremover=!1,this.observerbody=!1,!1!==g.scrollbarid)this.id=g.scrollbarid;else do{this.id="ascrail"+i++}while(l.getElementById(this.id));this.rail=!1,this.cursor=!1,this.cursorfreezed=!1,this.selectiondrag=!1,this.zoom=!1,this.zoomactive=!1,this.hasfocus=!1,this.hasmousefocus=!1,this.railslocked=!1,this.locked=!1,this.hidden=!1,this.cursoractive=!0,this.wheelprevented=!1,this.overflowx=g.overflowx,this.overflowy=g.overflowy,this.nativescrollingarea=!1,this.checkarea=0,this.events=[],this.saved={},this.delaylist={},this.synclist={},this.lastdeltax=0,this.lastdeltay=0,this.detected=function(){if(y)return y;var e=l.createElement("DIV"),o=e.style,t=navigator.userAgent,r=navigator.platform,i={};return i.haspointerlock="pointerLockElement"in l||"webkitPointerLockElement"in l||"mozPointerLockElement"in l,i.isopera="opera"in a,i.isopera12=i.isopera&&"getUserMedia"in navigator,i.isoperamini="[object OperaMini]"===Object.prototype.toString.call(a.operamini),i.isie="all"in l&&"attachEvent"in e&&!i.isopera,i.isieold=i.isie&&!("msInterpolationMode"in o),i.isie7=i.isie&&!i.isieold&&(!("documentMode"in l)||7===l.documentMode),i.isie8=i.isie&&"documentMode"in l&&8===l.documentMode,i.isie9=i.isie&&"performance"in a&&9===l.documentMode,i.isie10=i.isie&&"performance"in a&&10===l.documentMode,i.isie11="msRequestFullscreen"in e&&l.documentMode>=11,i.ismsedge="msCredentials"in a,i.ismozilla="MozAppearance"in o,i.iswebkit=!i.ismsedge&&"WebkitAppearance"in o,i.ischrome=i.iswebkit&&"chrome"in a,i.ischrome38=i.ischrome&&"touchAction"in o,i.ischrome22=!i.ischrome38&&i.ischrome&&i.haspointerlock,i.ischrome26=!i.ischrome38&&i.ischrome&&"transition"in o,i.cantouch="ontouchstart"in l.documentElement||"ontouchstart"in a,i.hasw3ctouch=!!a.PointerEvent&&(navigator.maxTouchPoints>0||navigator.msMaxTouchPoints>0),i.hasmstouch=!i.hasw3ctouch&&(a.MSPointerEvent||!1),i.ismac=/^mac$/i.test(r),i.isios=i.cantouch&&/iphone|ipad|ipod/i.test(r),i.isios4=i.isios&&!("seal"in Object),i.isios7=i.isios&&"webkitHidden"in l,i.isios8=i.isios&&"hidden"in l,i.isios10=i.isios&&a.Proxy,i.isandroid=/android/i.test(t),i.haseventlistener="addEventListener"in e,i.trstyle=!1,i.hastransform=!1,i.hastranslate3d=!1,i.transitionstyle=!1,i.hastransition=!1,i.transitionend=!1,i.trstyle="transform",i.hastransform="transform"in o||function(){for(var e=["msTransform","webkitTransform","MozTransform","OTransform"],t=0,r=e.length;t<r;t++)if(void 0!==o[e[t]]){i.trstyle=e[t];break}i.hastransform=!!i.trstyle}(),i.hastransform&&(o[i.trstyle]="translate3d(1px,2px,3px)",i.hastranslate3d=/translate3d/.test(o[i.trstyle])),i.transitionstyle="transition",i.prefixstyle="",i.transitionend="transitionend",i.hastransition="transition"in o||function(){i.transitionend=!1;for(var e=["webkitTransition","msTransition","MozTransition","OTransition","OTransition","KhtmlTransition"],t=["-webkit-","-ms-","-moz-","-o-","-o","-khtml-"],r=["webkitTransitionEnd","msTransitionEnd","transitionend","otransitionend","oTransitionEnd","KhtmlTransitionEnd"],s=0,n=e.length;s<n;s++)if(e[s]in o){i.transitionstyle=e[s],i.prefixstyle=t[s],i.transitionend=r[s];break}i.ischrome26&&(i.prefixstyle=t[1]),i.hastransition=i.transitionstyle}(),i.cursorgrabvalue=function(){var e=["grab","-webkit-grab","-moz-grab"];(i.ischrome&&!i.ischrome38||i.isie)&&(e=[]);for(var t=0,r=e.length;t<r;t++){var s=e[t];if(o.cursor=s,o.cursor==s)return s}return"url(https://cdnjs.cloudflare.com/ajax/libs/slider-pro/1.3.0/css/images/openhand.cur),n-resize"}(),i.hasmousecapture="setCapture"in e,i.hasMutationObserver=!1!==v,e=null,y=i,i}();var T=n.extend({},this.detected);this.canhwscroll=T.hastransform&&g.hwacceleration,this.ishwscroll=this.canhwscroll&&m.haswrapper,this.isrtlmode?this.isvertical?this.hasreversehr=!(T.iswebkit||T.isie||T.isie11):this.hasreversehr=!(T.iswebkit||T.isie&&!T.isie10&&!T.isie11):this.hasreversehr=!1,this.istouchcapable=!1,(T.cantouch||!T.hasw3ctouch&&!T.hasmstouch)&&(!T.cantouch||T.isios||T.isandroid||!T.iswebkit&&!T.ismozilla)||(this.istouchcapable=!0),g.enablemouselockapi||(T.hasmousecapture=!1,T.haspointerlock=!1),this.debounced=function(e,o,t){m&&(m.delaylist[e]||!1||(m.delaylist[e]={h:u(function(){m.delaylist[e].fn.call(m),m.delaylist[e]=!1},t)},o.call(m)),m.delaylist[e].fn=o)},this.synched=function(e,o){m.synclist[e]?m.synclist[e]=o:(m.synclist[e]=o,u(function(){m&&(m.synclist[e]&&m.synclist[e].call(m),m.synclist[e]=null)}))},this.unsynched=function(e){m.synclist[e]&&(m.synclist[e]=!1)},this.css=function(e,o){for(var t in o)m.saved.css.push([e,t,e.css(t)]),e.css(t,o[t])},this.scrollTop=function(e){return void 0===e?m.getScrollTop():m.setScrollTop(e)},this.scrollLeft=function(e){return void 0===e?m.getScrollLeft():m.setScrollLeft(e)};var E=function(e,o,t,r,i,s,n){this.st=e,this.ed=o,this.spd=t,this.p1=r||0,this.p2=i||1,this.p3=s||0,this.p4=n||1,this.ts=w(),this.df=o-e};function M(){var e=m.doc.css(T.trstyle);return!(!e||"matrix"!=e.substr(0,6))&&e.replace(/^.*\((.*)\)$/g,"$1").replace(/px/g,"").split(/, +/)}if(E.prototype={B2:function(e){return 3*(1-e)*(1-e)*e},B3:function(e){return 3*(1-e)*e*e},B4:function(e){return e*e*e},getPos:function(){return(w()-this.ts)/this.spd},getNow:function(){var e=(w()-this.ts)/this.spd,o=this.B2(e)+this.B3(e)+this.B4(e);return e>=1?this.ed:this.st+this.df*o|0},update:function(e,o){return this.st=this.getNow(),this.ed=e,this.spd=o,this.ts=w(),this.df=this.ed-this.st,this}},this.ishwscroll){this.doc.translate={x:0,y:0,tx:"0px",ty:"0px"},T.hastranslate3d&&T.isios&&this.doc.css("-webkit-backface-visibility","hidden"),this.getScrollTop=function(e){if(!e){var o=M();if(o)return 16==o.length?-o[13]:-o[5];if(m.timerscroll&&m.timerscroll.bz)return m.timerscroll.bz.getNow()}return m.doc.translate.y},this.getScrollLeft=function(e){if(!e){var o=M();if(o)return 16==o.length?-o[12]:-o[4];if(m.timerscroll&&m.timerscroll.bh)return m.timerscroll.bh.getNow()}return m.doc.translate.x},this.notifyScrollEvent=function(e){var o=l.createEvent("UIEvents");o.initUIEvent("scroll",!1,!1,a,1),o.niceevent=!0,e.dispatchEvent(o)};var L=this.isrtlmode?1:-1;T.hastranslate3d&&g.enabletranslate3d?(this.setScrollTop=function(e,o){m.doc.translate.y=e,m.doc.translate.ty=-1*e+"px",m.doc.css(T.trstyle,"translate3d("+m.doc.translate.tx+","+m.doc.translate.ty+",0)"),o||m.notifyScrollEvent(m.win[0])},this.setScrollLeft=function(e,o){m.doc.translate.x=e,m.doc.translate.tx=e*L+"px",m.doc.css(T.trstyle,"translate3d("+m.doc.translate.tx+","+m.doc.translate.ty+",0)"),o||m.notifyScrollEvent(m.win[0])}):(this.setScrollTop=function(e,o){m.doc.translate.y=e,m.doc.translate.ty=-1*e+"px",m.doc.css(T.trstyle,"translate("+m.doc.translate.tx+","+m.doc.translate.ty+")"),o||m.notifyScrollEvent(m.win[0])},this.setScrollLeft=function(e,o){m.doc.translate.x=e,m.doc.translate.tx=e*L+"px",m.doc.css(T.trstyle,"translate("+m.doc.translate.tx+","+m.doc.translate.ty+")"),o||m.notifyScrollEvent(m.win[0])})}else this.getScrollTop=function(){return m.docscroll.scrollTop()},this.setScrollTop=function(e){m.docscroll.scrollTop(e)},this.getScrollLeft=function(){return m.hasreversehr?m.detected.ismozilla?m.page.maxw-Math.abs(m.docscroll.scrollLeft()):m.page.maxw-m.docscroll.scrollLeft():m.docscroll.scrollLeft()},this.setScrollLeft=function(e){return setTimeout(function(){if(m)return m.hasreversehr&&(e=m.detected.ismozilla?-(m.page.maxw-e):m.page.maxw-e),m.docscroll.scrollLeft(e)},1)};this.getTarget=function(e){return!!e&&(e.target?e.target:!!e.srcElement&&e.srcElement)},this.hasParent=function(e,o){if(!e)return!1;for(var t=e.target||e.srcElement||e||!1;t&&t.id!=o;)t=t.parentNode||!1;return!1!==t};var C={thin:1,medium:3,thick:5};function N(e,o,t){var r=e.css(o),i=parseFloat(r);if(isNaN(i)){var s=3==(i=C[r]||0)?t?m.win.outerHeight()-m.win.innerHeight():m.win.outerWidth()-m.win.innerWidth():1;return m.isie8&&i&&(i+=1),s?i:0}return i}this.getDocumentScrollOffset=function(){return{top:a.pageYOffset||l.documentElement.scrollTop,left:a.pageXOffset||l.documentElement.scrollLeft}},this.getOffset=function(){if(m.isfixed){var e=m.win.offset(),o=m.getDocumentScrollOffset();return e.top-=o.top,e.left-=o.left,e}var t=m.win.offset();if(!m.viewport)return t;var r=m.viewport.offset();return{top:t.top-r.top,left:t.left-r.left}},this.updateScrollBar=function(e){var o,t;if(m.ishwscroll)m.rail.css({height:m.win.innerHeight()-(g.railpadding.top+g.railpadding.bottom)}),m.railh&&m.railh.css({width:m.win.innerWidth()-(g.railpadding.left+g.railpadding.right)});else{var r=m.getOffset();if((o={top:r.top,left:r.left-(g.railpadding.left+g.railpadding.right)}).top+=N(m.win,"border-top-width",!0),o.left+=m.rail.align?m.win.outerWidth()-N(m.win,"border-right-width")-m.rail.width:N(m.win,"border-left-width"),(t=g.railoffset)&&(t.top&&(o.top+=t.top),t.left&&(o.left+=t.left)),m.railslocked||m.rail.css({top:o.top,left:o.left,height:(e?e.h:m.win.innerHeight())-(g.railpadding.top+g.railpadding.bottom)}),m.zoom&&m.zoom.css({top:o.top+1,left:1==m.rail.align?o.left-20:o.left+m.rail.width+4}),m.railh&&!m.railslocked){o={top:r.top,left:r.left},(t=g.railhoffset)&&(t.top&&(o.top+=t.top),t.left&&(o.left+=t.left));var i=m.railh.align?o.top+N(m.win,"border-top-width",!0)+m.win.innerHeight()-m.railh.height:o.top+N(m.win,"border-top-width",!0),s=o.left+N(m.win,"border-left-width");m.railh.css({top:i-(g.railpadding.top+g.railpadding.bottom),left:s,width:m.railh.width})}}},this.doRailClick=function(e,o,t){var r,i,s,n;m.railslocked||(m.cancelEvent(e),"pageY"in e||(e.pageX=e.clientX+l.documentElement.scrollLeft,e.pageY=e.clientY+l.documentElement.scrollTop),o?(r=t?m.doScrollLeft:m.doScrollTop,s=t?(e.pageX-m.railh.offset().left-m.cursorwidth/2)*m.scrollratio.x:(e.pageY-m.rail.offset().top-m.cursorheight/2)*m.scrollratio.y,m.unsynched("relativexy"),r(0|s)):(r=t?m.doScrollLeftBy:m.doScrollBy,s=t?m.scroll.x:m.scroll.y,n=t?e.pageX-m.railh.offset().left:e.pageY-m.rail.offset().top,i=t?m.view.w:m.view.h,r(s>=n?i:-i)))},m.newscrolly=m.newscrollx=0,m.hasanimationframe="requestAnimationFrame"in a,m.hascancelanimationframe="cancelAnimationFrame"in a,m.hasborderbox=!1,this.init=function(){if(m.saved.css=[],T.isoperamini)return!0;if(T.isandroid&&!("hidden"in l))return!0;g.emulatetouch=g.emulatetouch||g.touchbehavior,m.hasborderbox=a.getComputedStyle&&"border-box"===a.getComputedStyle(l.body)["box-sizing"];var e={"overflow-y":"hidden"};if((T.isie11||T.isie10)&&(e["-ms-overflow-style"]="none"),m.ishwscroll&&(this.doc.css(T.transitionstyle,T.prefixstyle+"transform 0ms ease-out"),T.transitionend&&m.bind(m.doc,T.transitionend,m.onScrollTransitionEnd,!1)),m.zindex="auto",m.ispage||"auto"!=g.zindex?m.zindex=g.zindex:m.zindex=function(){var e=m.win;if("zIndex"in e)return e.zIndex();for(;e.length>0;){if(9==e[0].nodeType)return!1;var o=e.css("zIndex");if(!isNaN(o)&&0!==o)return parseInt(o);e=e.parent()}return!1}()||"auto",!m.ispage&&"auto"!=m.zindex&&m.zindex>s&&(s=m.zindex),m.isie&&0===m.zindex&&"auto"==g.zindex&&(m.zindex="auto"),!m.ispage||!T.isieold){var i=m.docscroll;m.ispage&&(i=m.haswrapper?m.win:m.doc),m.css(i,e),m.ispage&&(T.isie11||T.isie)&&m.css(n("html"),e),!T.isios||m.ispage||m.haswrapper||m.css(f,{"-webkit-overflow-scrolling":"touch"});var d=n(l.createElement("div"));d.css({position:"relative",top:0,float:"right",width:g.cursorwidth,height:0,"background-color":g.cursorcolor,border:g.cursorborder,"background-clip":"padding-box","-webkit-border-radius":g.cursorborderradius,"-moz-border-radius":g.cursorborderradius,"border-radius":g.cursorborderradius}),d.addClass("nicescroll-cursors"),m.cursor=d;var u=n(l.createElement("div"));u.attr("id",m.id),u.addClass("nicescroll-rails nicescroll-rails-vr");var h,p,w=["left","right","top","bottom"];for(var b in w)p=w[b],(h=g.railpadding[p]||0)&&u.css("padding-"+p,h+"px");u.append(d),u.width=Math.max(parseFloat(g.cursorwidth),d.outerWidth()),u.css({width:u.width+"px",zIndex:m.zindex,background:g.background,cursor:"default"}),u.visibility=!0,u.scrollable=!0,u.align="left"==g.railalign?0:1,m.rail=u,m.rail.drag=!1;var y,x=!1;if(!g.boxzoom||m.ispage||T.isieold||(x=l.createElement("div"),m.bind(x,"click",m.doZoom),m.bind(x,"mouseenter",function(){m.zoom.css("opacity",g.cursoropacitymax)}),m.bind(x,"mouseleave",function(){m.zoom.css("opacity",g.cursoropacitymin)}),m.zoom=n(x),m.zoom.css({cursor:"pointer",zIndex:m.zindex,backgroundImage:"url("+g.scriptpath+"zoomico.png)",height:18,width:18,backgroundPosition:"0 0"}),g.dblclickzoom&&m.bind(m.win,"dblclick",m.doZoom),T.cantouch&&g.gesturezoom&&(m.ongesturezoom=function(e){return e.scale>1.5&&m.doZoomIn(e),e.scale<.8&&m.doZoomOut(e),m.cancelEvent(e)},m.bind(m.win,"gestureend",m.ongesturezoom))),m.railh=!1,g.horizrailenabled&&(m.css(i,{overflowX:"hidden"}),(d=n(l.createElement("div"))).css({position:"absolute",top:0,height:g.cursorwidth,width:0,backgroundColor:g.cursorcolor,border:g.cursorborder,backgroundClip:"padding-box","-webkit-border-radius":g.cursorborderradius,"-moz-border-radius":g.cursorborderradius,"border-radius":g.cursorborderradius}),T.isieold&&d.css("overflow","hidden"),d.addClass("nicescroll-cursors"),m.cursorh=d,(y=n(l.createElement("div"))).attr("id",m.id+"-hr"),y.addClass("nicescroll-rails nicescroll-rails-hr"),y.height=Math.max(parseFloat(g.cursorwidth),d.outerHeight()),y.css({height:y.height+"px",zIndex:m.zindex,background:g.background}),y.append(d),y.visibility=!0,y.scrollable=!0,y.align="top"==g.railvalign?0:1,m.railh=y,m.railh.drag=!1),m.ispage)u.css({position:"fixed",top:0,height:"100%"}),u.css(u.align?{right:0}:{left:0}),m.body.append(u),m.railh&&(y.css({position:"fixed",left:0,width:"100%"}),y.css(y.align?{bottom:0}:{top:0}),m.body.append(y));else{if(m.ishwscroll){"static"==m.win.css("position")&&m.css(m.win,{position:"relative"});var z="HTML"==m.win[0].nodeName?m.body:m.win;n(z).scrollTop(0).scrollLeft(0),m.zoom&&(m.zoom.css({position:"absolute",top:1,right:0,"margin-right":u.width+4}),z.append(m.zoom)),u.css({position:"absolute",top:0}),u.css(u.align?{right:0}:{left:0}),z.append(u),y&&(y.css({position:"absolute",left:0,bottom:0}),y.css(y.align?{bottom:0}:{top:0}),z.append(y))}else{m.isfixed="fixed"==m.win.css("position");var k=m.isfixed?"fixed":"absolute";m.isfixed||(m.viewport=m.getViewport(m.win[0])),m.viewport&&(m.body=m.viewport,/fixed|absolute/.test(m.viewport.css("position"))||m.css(m.viewport,{position:"relative"})),u.css({position:k}),m.zoom&&m.zoom.css({position:k}),m.updateScrollBar(),m.body.append(u),m.zoom&&m.body.append(m.zoom),m.railh&&(y.css({position:k}),m.body.append(y))}T.isios&&m.css(m.win,{"-webkit-tap-highlight-color":"rgba(0,0,0,0)","-webkit-touch-callout":"none"}),g.disableoutline&&(T.isie&&m.win.attr("hideFocus","true"),T.iswebkit&&m.win.css("outline","none"))}if(!1===g.autohidemode?(m.autohidedom=!1,m.rail.css({opacity:g.cursoropacitymax}),m.railh&&m.railh.css({opacity:g.cursoropacitymax})):!0===g.autohidemode||"leave"===g.autohidemode?(m.autohidedom=n().add(m.rail),T.isie8&&(m.autohidedom=m.autohidedom.add(m.cursor)),m.railh&&(m.autohidedom=m.autohidedom.add(m.railh)),m.railh&&T.isie8&&(m.autohidedom=m.autohidedom.add(m.cursorh))):"scroll"==g.autohidemode?(m.autohidedom=n().add(m.rail),m.railh&&(m.autohidedom=m.autohidedom.add(m.railh))):"cursor"==g.autohidemode?(m.autohidedom=n().add(m.cursor),m.railh&&(m.autohidedom=m.autohidedom.add(m.cursorh))):"hidden"==g.autohidemode&&(m.autohidedom=!1,m.hide(),m.railslocked=!1),T.cantouch||m.istouchcapable||g.emulatetouch||T.hasmstouch){m.scrollmom=new S(m);m.ontouchstart=function(e){if(m.locked)return!1;if(e.pointerType&&("mouse"===e.pointerType||e.pointerType===e.MSPOINTER_TYPE_MOUSE))return!1;if(m.hasmoving=!1,m.scrollmom.timer&&(m.triggerScrollEnd(),m.scrollmom.stop()),!m.railslocked){var o=m.getTarget(e);if(o)if(/INPUT/i.test(o.nodeName)&&/range/i.test(o.type))return m.stopPropagation(e);var t="mousedown"===e.type;if(!("clientX"in e)&&"changedTouches"in e&&(e.clientX=e.changedTouches[0].clientX,e.clientY=e.changedTouches[0].clientY),m.forcescreen){var r=e;(e={original:e.original?e.original:e}).clientX=r.screenX,e.clientY=r.screenY}if(g.horizrailenabled?m.rail.drag={x:e.clientX,y:e.clientY,sx:m.scroll.x,sy:m.scroll.y,st:m.getScrollTop(),sl:m.getScrollLeft(),pt:2,dl:!1,tg:o}:m.rail.drag={x:0,y:e.clientY,sx:0,sy:m.scroll.y,st:m.getScrollTop(),sl:0,pt:2,dl:!1,tg:o},m.ispage||!g.directionlockdeadzone)m.rail.drag.dl="f";else{var i=c.width(),s=c.height(),l=m.getContentSize(),a=l.h-s,d=l.w-i;m.rail.scrollable&&!m.railh.scrollable?m.rail.drag.ck=a>0&&"v":!m.rail.scrollable&&m.railh.scrollable?m.rail.drag.ck=d>0&&"h":m.rail.drag.ck=!1}if(g.emulatetouch&&m.isiframe&&T.isie){var u=m.win.position();m.rail.drag.x+=u.left,m.rail.drag.y+=u.top}if(m.hasmoving=!1,m.lastmouseup=!1,g.horizrailenabled?m.scrollmom.reset(e.clientX,e.clientY):m.scrollmom.reset(0,e.clientY),o&&t){if(!/INPUT|SELECT|BUTTON|TEXTAREA/i.test(o.nodeName))return T.hasmousecapture&&o.setCapture(),g.emulatetouch?(o.onclick&&!o._onclick&&(o._onclick=o.onclick,o.onclick=function(e){if(m.hasmoving)return!1;o._onclick.call(this,e)}),m.cancelEvent(e)):m.stopPropagation(e);/SUBMIT|CANCEL|BUTTON/i.test(n(o).attr("type"))&&(m.preventclick={tg:o,click:!1})}}},m.ontouchend=function(e){if(!m.rail.drag)return!0;if(2==m.rail.drag.pt){if(e.pointerType&&("mouse"===e.pointerType||e.pointerType===e.MSPOINTER_TYPE_MOUSE))return!1;m.rail.drag=!1;var o="mouseup"===e.type;if(m.hasmoving&&(m.scrollmom.doMomentum(),m.lastmouseup=!0,m.hideCursor(),T.hasmousecapture&&l.releaseCapture(),o))return m.cancelEvent(e)}else if(1==m.rail.drag.pt)return m.onmouseup(e)};var E=g.emulatetouch&&m.isiframe&&!T.hasmousecapture,M=.3*g.directionlockdeadzone|0;m.ontouchmove=function(e,o){if(!m.rail.drag)return!0;if(e.targetTouches&&g.preventmultitouchscrolling&&e.targetTouches.length>1)return!0;if(e.pointerType&&("mouse"===e.pointerType||e.pointerType===e.MSPOINTER_TYPE_MOUSE))return!0;if(2==m.rail.drag.pt){var t,r;if("changedTouches"in e&&(e.clientX=e.changedTouches[0].clientX,e.clientY=e.changedTouches[0].clientY),r=t=0,E&&!o){var i=m.win.position();r=-i.left,t=-i.top}var s=e.clientY+t,n=s-m.rail.drag.y,a=e.clientX+r;g.horizrailenabled||(a=0+r);var c=a-m.rail.drag.x,d=m.rail.drag.st-n;if(m.ishwscroll&&g.bouncescroll)d<0?d=Math.round(d/2):d>m.page.maxh&&(d=m.page.maxh+Math.round((d-m.page.maxh)/2));else if(d<0?(d=0,s=0):d>m.page.maxh&&(d=m.page.maxh,s=0),0===s&&!m.hasmoving)return m.ispage||(m.rail.drag=!1),!0;var u=m.getScrollLeft();if(m.railh&&m.railh.scrollable&&(u=m.isrtlmode?c-m.rail.drag.sl:m.rail.drag.sl-c,m.ishwscroll&&g.bouncescroll?u<0?u=Math.round(u/2):u>m.page.maxw&&(u=m.page.maxw+Math.round((u-m.page.maxw)/2)):(u<0&&(u=0,a=0),u>m.page.maxw&&(u=m.page.maxw,a=0))),!m.hasmoving){if(m.rail.drag.y===e.clientY&&m.rail.drag.x===e.clientX)return m.cancelEvent(e);var h=Math.abs(n),p=Math.abs(c),f=g.directionlockdeadzone;if(m.rail.drag.ck?"v"==m.rail.drag.ck?p>f&&h<=M?m.rail.drag=!1:h>f&&(m.rail.drag.dl="v"):"h"==m.rail.drag.ck&&(h>f&&p<=M?m.rail.drag=!1:p>f&&(m.rail.drag.dl="h")):h>f&&p>f?m.rail.drag.dl="f":h>f?m.rail.drag.dl=p>M?"f":"v":p>f&&(m.rail.drag.dl=h>M?"f":"h"),!m.rail.drag.dl)return m.cancelEvent(e);g.horizrailenabled?m.triggerScrollStart(e.clientX,e.clientY,0,0,0):m.triggerScrollStart(0,e.clientY,0,0,0),m.hasmoving=!0}return m.preventclick&&!m.preventclick.click&&(m.preventclick.click=m.preventclick.tg.onclick||!1,m.preventclick.tg.onclick=m.onpreventclick),m.rail.drag.dl&&("v"==m.rail.drag.dl?u=m.rail.drag.sl:"h"==m.rail.drag.dl&&(d=m.rail.drag.st)),m.synched("touchmove",function(){m.rail.drag&&2==m.rail.drag.pt&&(m.prepareTransition&&m.resetTransition(),m.rail.scrollable&&m.setScrollTop(d),m.scrollmom.update(a,s),m.railh&&m.railh.scrollable?(m.setScrollLeft(u),m.showCursor(d,u)):m.showCursor(d),T.isie10&&l.selection.clear())}),m.cancelEvent(e)}return 1==m.rail.drag.pt?m.onmousemove(e):void 0},m.ontouchstartCursor=function(e,o){if(!m.rail.drag||3==m.rail.drag.pt){if(m.locked)return m.cancelEvent(e);m.cancelScroll(),g.horizrailenabled?m.rail.drag={x:e.touches[0].clientX,y:e.touches[0].clientY,sx:m.scroll.x,sy:m.scroll.y,pt:3,hr:!!o}:m.rail.drag={x:0,y:e.touches[0].clientY,sx:0,sy:m.scroll.y,pt:3,hr:!!o};var t=m.getTarget(e);return!m.ispage&&T.hasmousecapture&&t.setCapture(),m.isiframe&&!T.hasmousecapture&&(m.saved.csspointerevents=m.doc.css("pointer-events"),m.css(m.doc,{"pointer-events":"none"})),m.cancelEvent(e)}},m.ontouchendCursor=function(e){if(m.rail.drag){if(T.hasmousecapture&&l.releaseCapture(),m.isiframe&&!T.hasmousecapture&&m.doc.css("pointer-events",m.saved.csspointerevents),3!=m.rail.drag.pt)return;return m.rail.drag=!1,m.cancelEvent(e)}},m.ontouchmoveCursor=function(e){if(m.rail.drag){if(3!=m.rail.drag.pt)return;if(m.cursorfreezed=!0,m.rail.drag.hr){if(g.horizrailenabled){m.scroll.x=m.rail.drag.sx+(e.touches[0].clientX-m.rail.drag.x),m.scroll.x<0&&(m.scroll.x=0);var o=m.scrollvaluemaxw;m.scroll.x>o&&(m.scroll.x=o)}}else{m.scroll.y=m.rail.drag.sy+(e.touches[0].clientY-m.rail.drag.y),m.scroll.y<0&&(m.scroll.y=0);var t=m.scrollvaluemax;m.scroll.y>t&&(m.scroll.y=t)}return m.synched("touchmove",function(){m.rail.drag&&3==m.rail.drag.pt&&(m.showCursor(),m.rail.drag.hr?m.doScrollLeft(Math.round(m.scroll.x*m.scrollratio.x),g.cursordragspeed):m.doScrollTop(Math.round(m.scroll.y*m.scrollratio.y),g.cursordragspeed))}),m.cancelEvent(e)}}}if(m.onmousedown=function(e,o){if(!m.rail.drag||1==m.rail.drag.pt){if(m.railslocked)return m.cancelEvent(e);m.cancelScroll(),g.horizrailenabled?m.rail.drag={x:e.clientX,y:e.clientY,sx:m.scroll.x,sy:m.scroll.y,pt:1,hr:o||!1}:m.rail.drag={x:0,y:e.clientY,sx:0,sy:m.scroll.y,pt:1,hr:o||!1};var t=m.getTarget(e);return T.hasmousecapture&&t.setCapture(),m.isiframe&&!T.hasmousecapture&&(m.saved.csspointerevents=m.doc.css("pointer-events"),m.css(m.doc,{"pointer-events":"none"})),m.hasmoving=!1,m.cancelEvent(e)}},m.onmouseup=function(e){if(m.rail.drag)return 1!=m.rail.drag.pt||(T.hasmousecapture&&l.releaseCapture(),m.isiframe&&!T.hasmousecapture&&m.doc.css("pointer-events",m.saved.csspointerevents),m.rail.drag=!1,m.cursorfreezed=!1,m.hasmoving&&m.triggerScrollEnd(),m.cancelEvent(e))},m.onmousemove=function(e){if(m.rail.drag){if(1!==m.rail.drag.pt)return;if(T.ischrome&&0===e.which)return m.onmouseup(e);if(m.cursorfreezed=!0,g.horizrailenabled?m.hasmoving||m.triggerScrollStart(e.clientX,e.clientY,0,0,0):m.hasmoving||m.triggerScrollStart(0,e.clientY,0,0,0),m.hasmoving=!0,m.rail.drag.hr){if(g.horizrailenabled){m.scroll.x=m.rail.drag.sx+(e.clientX-m.rail.drag.x),m.scroll.x<0&&(m.scroll.x=0);var o=m.scrollvaluemaxw;m.scroll.x>o&&(m.scroll.x=o)}}else{m.scroll.y=m.rail.drag.sy+(e.clientY-m.rail.drag.y),m.scroll.y<0&&(m.scroll.y=0);var t=m.scrollvaluemax;m.scroll.y>t&&(m.scroll.y=t)}return m.synched("mousemove",function(){m.cursorfreezed&&(m.showCursor(),m.rail.drag.hr?m.scrollLeft(Math.round(m.scroll.x*m.scrollratio.x)):m.scrollTop(Math.round(m.scroll.y*m.scrollratio.y)))}),m.cancelEvent(e)}m.checkarea=0},T.cantouch||g.emulatetouch)m.onpreventclick=function(e){if(m.preventclick)return m.preventclick.tg.onclick=m.preventclick.click,m.preventclick=!1,m.cancelEvent(e)},m.onclick=!T.isios&&function(e){return!m.lastmouseup||(m.lastmouseup=!1,m.cancelEvent(e))},g.grabcursorenabled&&T.cursorgrabvalue&&(m.css(m.ispage?m.doc:m.win,{cursor:T.cursorgrabvalue}),m.css(m.rail,{cursor:T.cursorgrabvalue}));else{var L=function(e){if(m.selectiondrag){if(e){var o=m.win.outerHeight(),t=e.pageY-m.selectiondrag.top;t>0&&t<o&&(t=0),t>=o&&(t-=o),m.selectiondrag.df=t}if(0!==m.selectiondrag.df){var r=-2*m.selectiondrag.df/6|0;m.doScrollBy(r),m.debounced("doselectionscroll",function(){L()},50)}}};m.hasTextSelected="getSelection"in l?function(){return l.getSelection().rangeCount>0}:"selection"in l?function(){return"None"!=l.selection.type}:function(){return!1},m.onselectionstart=function(e){m.ispage||(m.selectiondrag=m.win.offset())},m.onselectionend=function(e){m.selectiondrag=!1},m.onselectiondrag=function(e){m.selectiondrag&&m.hasTextSelected()&&m.debounced("selectionscroll",function(){L(e)},250)}}if(T.hasw3ctouch?(m.css(m.ispage?n("html"):m.win,{"touch-action":"none"}),m.css(m.rail,{"touch-action":"none"}),m.css(m.cursor,{"touch-action":"none"}),m.bind(m.win,"pointerdown",m.ontouchstart),m.bind(l,"pointerup",m.ontouchend),m.delegate(l,"pointermove",m.ontouchmove)):T.hasmstouch?(m.css(m.ispage?n("html"):m.win,{"-ms-touch-action":"none"}),m.css(m.rail,{"-ms-touch-action":"none"}),m.css(m.cursor,{"-ms-touch-action":"none"}),m.bind(m.win,"MSPointerDown",m.ontouchstart),m.bind(l,"MSPointerUp",m.ontouchend),m.delegate(l,"MSPointerMove",m.ontouchmove),m.bind(m.cursor,"MSGestureHold",function(e){e.preventDefault()}),m.bind(m.cursor,"contextmenu",function(e){e.preventDefault()})):T.cantouch&&(m.bind(m.win,"touchstart",m.ontouchstart,!1,!0),m.bind(l,"touchend",m.ontouchend,!1,!0),m.bind(l,"touchcancel",m.ontouchend,!1,!0),m.delegate(l,"touchmove",m.ontouchmove,!1,!0)),g.emulatetouch&&(m.bind(m.win,"mousedown",m.ontouchstart,!1,!0),m.bind(l,"mouseup",m.ontouchend,!1,!0),m.bind(l,"mousemove",m.ontouchmove,!1,!0)),(g.cursordragontouch||!T.cantouch&&!g.emulatetouch)&&(m.rail.css({cursor:"default"}),m.railh&&m.railh.css({cursor:"default"}),m.jqbind(m.rail,"mouseenter",function(){if(!m.ispage&&!m.win.is(":visible"))return!1;m.canshowonmouseevent&&m.showCursor(),m.rail.active=!0}),m.jqbind(m.rail,"mouseleave",function(){m.rail.active=!1,m.rail.drag||m.hideCursor()}),g.sensitiverail&&(m.bind(m.rail,"click",function(e){m.doRailClick(e,!1,!1)}),m.bind(m.rail,"dblclick",function(e){m.doRailClick(e,!0,!1)}),m.bind(m.cursor,"click",function(e){m.cancelEvent(e)}),m.bind(m.cursor,"dblclick",function(e){m.cancelEvent(e)})),m.railh&&(m.jqbind(m.railh,"mouseenter",function(){if(!m.ispage&&!m.win.is(":visible"))return!1;m.canshowonmouseevent&&m.showCursor(),m.rail.active=!0}),m.jqbind(m.railh,"mouseleave",function(){m.rail.active=!1,m.rail.drag||m.hideCursor()}),g.sensitiverail&&(m.bind(m.railh,"click",function(e){m.doRailClick(e,!1,!0)}),m.bind(m.railh,"dblclick",function(e){m.doRailClick(e,!0,!0)}),m.bind(m.cursorh,"click",function(e){m.cancelEvent(e)}),m.bind(m.cursorh,"dblclick",function(e){m.cancelEvent(e)})))),g.cursordragontouch&&(this.istouchcapable||T.cantouch)&&(m.bind(m.cursor,"touchstart",m.ontouchstartCursor),m.bind(m.cursor,"touchmove",m.ontouchmoveCursor),m.bind(m.cursor,"touchend",m.ontouchendCursor),m.cursorh&&m.bind(m.cursorh,"touchstart",function(e){m.ontouchstartCursor(e,!0)}),m.cursorh&&m.bind(m.cursorh,"touchmove",m.ontouchmoveCursor),m.cursorh&&m.bind(m.cursorh,"touchend",m.ontouchendCursor)),g.emulatetouch||T.isandroid||T.isios?(m.bind(T.hasmousecapture?m.win:l,"mouseup",m.ontouchend),m.onclick&&m.bind(l,"click",m.onclick),g.cursordragontouch?(m.bind(m.cursor,"mousedown",m.onmousedown),m.bind(m.cursor,"mouseup",m.onmouseup),m.cursorh&&m.bind(m.cursorh,"mousedown",function(e){m.onmousedown(e,!0)}),m.cursorh&&m.bind(m.cursorh,"mouseup",m.onmouseup)):(m.bind(m.rail,"mousedown",function(e){e.preventDefault()}),m.railh&&m.bind(m.railh,"mousedown",function(e){e.preventDefault()}))):(m.bind(T.hasmousecapture?m.win:l,"mouseup",m.onmouseup),m.bind(l,"mousemove",m.onmousemove),m.onclick&&m.bind(l,"click",m.onclick),m.bind(m.cursor,"mousedown",m.onmousedown),m.bind(m.cursor,"mouseup",m.onmouseup),m.railh&&(m.bind(m.cursorh,"mousedown",function(e){m.onmousedown(e,!0)}),m.bind(m.cursorh,"mouseup",m.onmouseup)),!m.ispage&&g.enablescrollonselection&&(m.bind(m.win[0],"mousedown",m.onselectionstart),m.bind(l,"mouseup",m.onselectionend),m.bind(m.cursor,"mouseup",m.onselectionend),m.cursorh&&m.bind(m.cursorh,"mouseup",m.onselectionend),m.bind(l,"mousemove",m.onselectiondrag)),m.zoom&&(m.jqbind(m.zoom,"mouseenter",function(){m.canshowonmouseevent&&m.showCursor(),m.rail.active=!0}),m.jqbind(m.zoom,"mouseleave",function(){m.rail.active=!1,m.rail.drag||m.hideCursor()}))),g.enablemousewheel&&(m.isiframe||m.mousewheel(T.isie&&m.ispage?l:m.win,m.onmousewheel),m.mousewheel(m.rail,m.onmousewheel),m.railh&&m.mousewheel(m.railh,m.onmousewheelhr)),m.ispage||T.cantouch||/HTML|^BODY/.test(m.win[0].nodeName)||(m.win.attr("tabindex")||m.win.attr({tabindex:++r}),m.bind(m.win,"focus",function(e){o=m.getTarget(e).id||m.getTarget(e)||!1,m.hasfocus=!0,m.canshowonmouseevent&&m.noticeCursor()}),m.bind(m.win,"blur",function(e){o=!1,m.hasfocus=!1}),m.bind(m.win,"mouseenter",function(e){t=m.getTarget(e).id||m.getTarget(e)||!1,m.hasmousefocus=!0,m.canshowonmouseevent&&m.noticeCursor()}),m.bind(m.win,"mouseleave",function(e){t=!1,m.hasmousefocus=!1,m.rail.drag||m.hideCursor()})),m.onkeypress=function(e){if(m.railslocked&&0===m.page.maxh)return!0;e=e||a.event;var r=m.getTarget(e);if(r&&/INPUT|TEXTAREA|SELECT|OPTION/.test(r.nodeName)&&(!(r.getAttribute("type")||r.type||!1)||!/submit|button|cancel/i.tp))return!0;if(n(r).attr("contenteditable"))return!0;if(m.hasfocus||m.hasmousefocus&&!o||m.ispage&&!o&&!t){var i=e.keyCode;if(m.railslocked&&27!=i)return m.cancelEvent(e);var s=e.ctrlKey||!1,l=e.shiftKey||!1,c=!1;switch(i){case 38:case 63233:m.doScrollBy(72),c=!0;break;case 40:case 63235:m.doScrollBy(-72),c=!0;break;case 37:case 63232:m.railh&&(s?m.doScrollLeft(0):m.doScrollLeftBy(72),c=!0);break;case 39:case 63234:m.railh&&(s?m.doScrollLeft(m.page.maxw):m.doScrollLeftBy(-72),c=!0);break;case 33:case 63276:m.doScrollBy(m.view.h),c=!0;break;case 34:case 63277:m.doScrollBy(-m.view.h),c=!0;break;case 36:case 63273:m.railh&&s?m.doScrollPos(0,0):m.doScrollTo(0),c=!0;break;case 35:case 63275:m.railh&&s?m.doScrollPos(m.page.maxw,m.page.maxh):m.doScrollTo(m.page.maxh),c=!0;break;case 32:g.spacebarenabled&&(l?m.doScrollBy(m.view.h):m.doScrollBy(-m.view.h),c=!0);break;case 27:m.zoomactive&&(m.doZoom(),c=!0)}if(c)return m.cancelEvent(e)}},g.enablekeyboard&&m.bind(l,T.isopera&&!T.isopera12?"keypress":"keydown",m.onkeypress),m.bind(l,"keydown",function(e){(e.ctrlKey||!1)&&(m.wheelprevented=!0)}),m.bind(l,"keyup",function(e){e.ctrlKey||!1||(m.wheelprevented=!1)}),m.bind(a,"blur",function(e){m.wheelprevented=!1}),m.bind(a,"resize",m.onscreenresize),m.bind(a,"orientationchange",m.onscreenresize),m.bind(a,"load",m.lazyResize),T.ischrome&&!m.ispage&&!m.haswrapper){var C=m.win.attr("style"),N=parseFloat(m.win.css("width"))+1;m.win.css("width",N),m.synched("chromefix",function(){m.win.attr("style",C)})}if(m.onAttributeChange=function(e){m.lazyResize(m.isieold?250:30)},g.enableobserver&&(m.isie11||!1===v||(m.observerbody=new v(function(e){if(e.forEach(function(e){if("attributes"==e.type)return f.hasClass("modal-open")&&f.hasClass("modal-dialog")&&!n.contains(n(".modal-dialog")[0],m.doc[0])?m.hide():m.show()}),m.me.clientWidth!=m.page.width||m.me.clientHeight!=m.page.height)return m.lazyResize(30)}),m.observerbody.observe(l.body,{childList:!0,subtree:!0,characterData:!1,attributes:!0,attributeFilter:["class"]})),!m.ispage&&!m.haswrapper)){var P=m.win[0];!1!==v?(m.observer=new v(function(e){e.forEach(m.onAttributeChange)}),m.observer.observe(P,{childList:!0,characterData:!1,attributes:!0,subtree:!1}),m.observerremover=new v(function(e){e.forEach(function(e){if(e.removedNodes.length>0)for(var o in e.removedNodes)if(m&&e.removedNodes[o]===P)return m.remove()})}),m.observerremover.observe(P.parentNode,{childList:!0,characterData:!1,attributes:!1,subtree:!1})):(m.bind(P,T.isie&&!T.isie9?"propertychange":"DOMAttrModified",m.onAttributeChange),T.isie9&&P.attachEvent("onpropertychange",m.onAttributeChange),m.bind(P,"DOMNodeRemoved",function(e){e.target===P&&m.remove()}))}!m.ispage&&g.boxzoom&&m.bind(a,"resize",m.resizeZoom),m.istextarea&&(m.bind(m.win,"keydown",m.lazyResize),m.bind(m.win,"mouseup",m.lazyResize)),m.lazyResize(30)}if("IFRAME"==this.doc[0].nodeName){var R=function(){var o;m.iframexd=!1;try{(o="contentDocument"in this?this.contentDocument:this.contentWindow._doc).domain}catch(e){m.iframexd=!0,o=!1}if(m.iframexd)return"console"in a&&console.log("NiceScroll error: policy restriced iframe"),!0;if(m.forcescreen=!0,m.isiframe&&(m.iframe={doc:n(o),html:m.doc.contents().find("html")[0],body:m.doc.contents().find("body")[0]},m.getContentSize=function(){return{w:Math.max(m.iframe.html.scrollWidth,m.iframe.body.scrollWidth),h:Math.max(m.iframe.html.scrollHeight,m.iframe.body.scrollHeight)}},m.docscroll=n(m.iframe.body)),!T.isios&&g.iframeautoresize&&!m.isiframe){m.win.scrollTop(0),m.doc.height("");var t=Math.max(o.getElementsByTagName("html")[0].scrollHeight,o.body.scrollHeight);m.doc.height(t)}m.lazyResize(30),m.css(n(m.iframe.body),e),T.isios&&m.haswrapper&&m.css(n(o.body),{"-webkit-transform":"translate3d(0,0,0)"}),"contentWindow"in this?m.bind(this.contentWindow,"scroll",m.onscroll):m.bind(o,"scroll",m.onscroll),g.enablemousewheel&&m.mousewheel(o,m.onmousewheel),g.enablekeyboard&&m.bind(o,T.isopera?"keypress":"keydown",m.onkeypress),T.cantouch?(m.bind(o,"touchstart",m.ontouchstart),m.bind(o,"touchmove",m.ontouchmove)):g.emulatetouch&&(m.bind(o,"mousedown",m.ontouchstart),m.bind(o,"mousemove",function(e){return m.ontouchmove(e,!0)}),g.grabcursorenabled&&T.cursorgrabvalue&&m.css(n(o.body),{cursor:T.cursorgrabvalue})),m.bind(o,"mouseup",m.ontouchend),m.zoom&&(g.dblclickzoom&&m.bind(o,"dblclick",m.doZoom),m.ongesturezoom&&m.bind(o,"gestureend",m.ongesturezoom))};this.doc[0].readyState&&"complete"===this.doc[0].readyState&&setTimeout(function(){R.call(m.doc[0],!1)},500),m.bind(this.doc,"load",R)}},this.showCursor=function(e,o){if(m.cursortimeout&&(clearTimeout(m.cursortimeout),m.cursortimeout=0),m.rail){if(m.autohidedom&&(m.autohidedom.stop().css({opacity:g.cursoropacitymax}),m.cursoractive=!0),m.rail.drag&&1==m.rail.drag.pt||(void 0!==e&&!1!==e&&(m.scroll.y=e/m.scrollratio.y|0),void 0!==o&&(m.scroll.x=o/m.scrollratio.x|0)),m.cursor.css({height:m.cursorheight,top:m.scroll.y}),m.cursorh){var t=m.hasreversehr?m.scrollvaluemaxw-m.scroll.x:m.scroll.x;m.cursorh.css({width:m.cursorwidth,left:!m.rail.align&&m.rail.visibility?t+m.rail.width:t}),m.cursoractive=!0}m.zoom&&m.zoom.stop().css({opacity:g.cursoropacitymax})}},this.hideCursor=function(e){m.cursortimeout||m.rail&&m.autohidedom&&(m.hasmousefocus&&"leave"===g.autohidemode||(m.cursortimeout=setTimeout(function(){m.rail.active&&m.showonmouseevent||(m.autohidedom.stop().animate({opacity:g.cursoropacitymin}),m.zoom&&m.zoom.stop().animate({opacity:g.cursoropacitymin}),m.cursoractive=!1),m.cursortimeout=0},e||g.hidecursordelay)))},this.noticeCursor=function(e,o,t){m.showCursor(o,t),m.rail.active||m.hideCursor(e)},this.getContentSize=m.ispage?function(){return{w:Math.max(l.body.scrollWidth,l.documentElement.scrollWidth),h:Math.max(l.body.scrollHeight,l.documentElement.scrollHeight)}}:m.haswrapper?function(){return{w:m.doc[0].offsetWidth,h:m.doc[0].offsetHeight}}:function(){return{w:m.docscroll[0].scrollWidth,h:m.docscroll[0].scrollHeight}},this.onResize=function(e,o){if(!m||!m.win)return!1;var t=m.page.maxh,r=m.page.maxw,i=m.view.h,s=m.view.w;if(m.view={w:m.ispage?m.win.width():m.win[0].clientWidth,h:m.ispage?m.win.height():m.win[0].clientHeight},m.page=o||m.getContentSize(),m.page.maxh=Math.max(0,m.page.h-m.view.h),m.page.maxw=Math.max(0,m.page.w-m.view.w),m.page.maxh==t&&m.page.maxw==r&&m.view.w==s&&m.view.h==i){if(m.ispage)return m;var n=m.win.offset();if(m.lastposition){var l=m.lastposition;if(l.top==n.top&&l.left==n.left)return m}m.lastposition=n}return 0===m.page.maxh?(m.hideRail(),m.scrollvaluemax=0,m.scroll.y=0,m.scrollratio.y=0,m.cursorheight=0,m.setScrollTop(0),m.rail&&(m.rail.scrollable=!1)):(m.page.maxh-=g.railpadding.top+g.railpadding.bottom,m.rail.scrollable=!0),0===m.page.maxw?(m.hideRailHr(),m.scrollvaluemaxw=0,m.scroll.x=0,m.scrollratio.x=0,m.cursorwidth=0,m.setScrollLeft(0),m.railh&&(m.railh.scrollable=!1)):(m.page.maxw-=g.railpadding.left+g.railpadding.right,m.railh&&(m.railh.scrollable=g.horizrailenabled)),m.railslocked=m.locked||0===m.page.maxh&&0===m.page.maxw,m.railslocked?(m.ispage||m.updateScrollBar(m.view),!1):(m.hidden||(m.rail.visibility||m.showRail(),m.railh&&!m.railh.visibility&&m.showRailHr()),m.istextarea&&m.win.css("resize")&&"none"!=m.win.css("resize")&&(m.view.h-=20),m.cursorheight=Math.min(m.view.h,Math.round(m.view.h*(m.view.h/m.page.h))),m.cursorheight=g.cursorfixedheight?g.cursorfixedheight:Math.max(g.cursorminheight,m.cursorheight),m.cursorwidth=Math.min(m.view.w,Math.round(m.view.w*(m.view.w/m.page.w))),m.cursorwidth=g.cursorfixedheight?g.cursorfixedheight:Math.max(g.cursorminheight,m.cursorwidth),m.scrollvaluemax=m.view.h-m.cursorheight-(g.railpadding.top+g.railpadding.bottom),m.hasborderbox||(m.scrollvaluemax-=m.cursor[0].offsetHeight-m.cursor[0].clientHeight),m.railh&&(m.railh.width=m.page.maxh>0?m.rail.width:m.view.w,m.scrollvaluemaxw=m.railh.width-m.cursorwidth-(g.railpadding.left+g.railpadding.right)),m.ispage||m.updateScrollBar(m.view),m.scrollratio={x:m.page.maxw/m.scrollvaluemaxw,y:m.page.maxh/m.scrollvaluemax},m.getScrollTop()>m.page.maxh?m.doScrollTop(m.page.maxh):(m.scroll.y=m.getScrollTop()/m.scrollratio.y|0,m.scroll.x=m.getScrollLeft()/m.scrollratio.x|0,m.cursoractive&&m.noticeCursor()),m.scroll.y&&0===m.getScrollTop()&&m.doScrollTo(m.scroll.y*m.scrollratio.y|0),m)},this.resize=m.onResize;var P=0;function R(e,o,t,r){m._bind(e,o,function(r){var i={original:r=r||a.event,target:r.target||r.srcElement,type:"wheel",deltaMode:"MozMousePixelScroll"==r.type?0:1,deltaX:0,deltaZ:0,preventDefault:function(){return r.preventDefault?r.preventDefault():r.returnValue=!1,!1},stopImmediatePropagation:function(){r.stopImmediatePropagation?r.stopImmediatePropagation():r.cancelBubble=!0}};return"mousewheel"==o?(r.wheelDeltaX&&(i.deltaX=-.025*r.wheelDeltaX),r.wheelDeltaY&&(i.deltaY=-.025*r.wheelDeltaY),!i.deltaY&&!i.deltaX&&(i.deltaY=-.025*r.wheelDelta)):i.deltaY=r.detail,t.call(e,i)},r)}this.onscreenresize=function(e){clearTimeout(P);var o=!m.ispage&&!m.haswrapper;o&&m.hideRails(),P=setTimeout(function(){m&&(o&&m.showRails(),m.resize()),P=0},120)},this.lazyResize=function(e){return clearTimeout(P),e=isNaN(e)?240:e,P=setTimeout(function(){m&&m.resize(),P=0},e),m},this.jqbind=function(e,o,t){m.events.push({e:e,n:o,f:t,q:!0}),n(e).on(o,t)},this.mousewheel=function(e,o,t){var r="jquery"in e?e[0]:e;if("onwheel"in l.createElement("div"))m._bind(r,"wheel",o,t||!1);else{var i=void 0!==l.onmousewheel?"mousewheel":"DOMMouseScroll";R(r,i,o,t||!1),"DOMMouseScroll"==i&&R(r,"MozMousePixelScroll",o,t||!1)}};var Y=!1;if(T.haseventlistener){try{var _=Object.defineProperty({},"passive",{get:function(){Y=!0}});a.addEventListener("test",null,_)}catch(e){}this.stopPropagation=function(e){return!!e&&((e=e.original?e.original:e).stopPropagation(),!1)},this.cancelEvent=function(e){return e.cancelable&&e.preventDefault(),e.stopImmediatePropagation(),e.preventManipulation&&e.preventManipulation(),!1}}else Event.prototype.preventDefault=function(){this.returnValue=!1},Event.prototype.stopPropagation=function(){this.cancelBubble=!0},a.constructor.prototype.addEventListener=l.constructor.prototype.addEventListener=Element.prototype.addEventListener=function(e,o,t){this.attachEvent("on"+e,o)},a.constructor.prototype.removeEventListener=l.constructor.prototype.removeEventListener=Element.prototype.removeEventListener=function(e,o,t){this.detachEvent("on"+e,o)},this.cancelEvent=function(e){return(e=e||a.event)&&(e.cancelBubble=!0,e.cancel=!0,e.returnValue=!1),!1},this.stopPropagation=function(e){return(e=e||a.event)&&(e.cancelBubble=!0),!1};this.delegate=function(e,o,t,r,i){var s=d[o]||!1;s||(s={a:[],l:[],f:function(e){for(var o=s.l,t=!1,r=o.length-1;r>=0;r--)if(!1===(t=o[r].call(e.target,e)))return!1;return t}},m.bind(e,o,s.f,r,i),d[o]=s),m.ispage?(s.a=[m.id].concat(s.a),s.l=[t].concat(s.l)):(s.a.push(m.id),s.l.push(t))},this.undelegate=function(e,o,t,r,i){var s=d[o]||!1;if(s&&s.l)for(var n=0,l=s.l.length;n<l;n++)s.a[n]===m.id&&(s.a.splice(n),s.l.splice(n),0===s.a.length&&(m._unbind(e,o,s.l.f),d[o]=null))},this.bind=function(e,o,t,r,i){var s="jquery"in e?e[0]:e;m._bind(s,o,t,r||!1,i||!1)},this._bind=function(e,o,t,r,i){m.events.push({e:e,n:o,f:t,b:r,q:!1}),Y&&(i||e==l||e==l.body||e==a)?e.addEventListener(o,t,{passive:!1,capture:r}):e.addEventListener(o,t,r||!1)},this._unbind=function(e,o,t,r){d[o]?m.undelegate(e,o,t,r):e.removeEventListener(o,t,r)},this.unbindAll=function(){for(var e=0;e<m.events.length;e++){var o=m.events[e];o.q?o.e.unbind(o.n,o.f):m._unbind(o.e,o.n,o.f,o.b)}},this.showRails=function(){return m.showRail().showRailHr()},this.showRail=function(){return 0===m.page.maxh||!m.ispage&&"none"==m.win.css("display")||(m.rail.visibility=!0,m.rail.css("display","block")),m},this.showRailHr=function(){return m.railh&&(0===m.page.maxw||!m.ispage&&"none"==m.win.css("display")||(m.railh.visibility=!0,m.railh.css("display","block"))),m},this.hideRails=function(){return m.hideRail().hideRailHr()},this.hideRail=function(){return m.rail.visibility=!1,m.rail.css("display","none"),m},this.hideRailHr=function(){return m.railh&&(m.railh.visibility=!1,m.railh.css("display","none")),m},this.show=function(){return m.hidden=!1,m.railslocked=!1,m.showRails()},this.hide=function(){return m.hidden=!0,m.railslocked=!0,m.hideRails()},this.toggle=function(){return m.hidden?m.show():m.hide()},this.remove=function(){m.stop(),m.cursortimeout&&clearTimeout(m.cursortimeout);for(var e in m.delaylist)m.delaylist[e]&&h(m.delaylist[e].h);m.doZoomOut(),m.unbindAll(),T.isie9&&m.win[0].detachEvent("onpropertychange",m.onAttributeChange),!1!==m.observer&&m.observer.disconnect(),!1!==m.observerremover&&m.observerremover.disconnect(),!1!==m.observerbody&&m.observerbody.disconnect(),m.events=null,m.cursor&&m.cursor.remove(),m.cursorh&&m.cursorh.remove(),m.rail&&m.rail.remove(),m.railh&&m.railh.remove(),m.zoom&&m.zoom.remove();for(var o=0;o<m.saved.css.length;o++){var t=m.saved.css[o];t[0].css(t[1],void 0===t[2]?"":t[2])}m.saved=!1,m.me.data("__nicescroll","");var r=n.nicescroll;r.each(function(e){if(this&&this.id===m.id){delete r[e];for(var o=++e;o<r.length;o++,e++)r[e]=r[o];r.length--,r.length&&delete r[r.length]}});for(var i in m)m[i]=null,delete m[i];m=null},this.scrollstart=function(e){return this.onscrollstart=e,m},this.scrollend=function(e){return this.onscrollend=e,m},this.scrollcancel=function(e){return this.onscrollcancel=e,m},this.zoomin=function(e){return this.onzoomin=e,m},this.zoomout=function(e){return this.onzoomout=e,m},this.isScrollable=function(e){var o=e.target?e.target:e;if("OPTION"==o.nodeName)return!0;for(;o&&1==o.nodeType&&o!==this.me[0]&&!/^BODY|HTML/.test(o.nodeName);){var t=n(o),r=t.css("overflowY")||t.css("overflowX")||t.css("overflow")||"";if(/scroll|auto/.test(r))return o.clientHeight!=o.scrollHeight;o=!!o.parentNode&&o.parentNode}return!1},this.getViewport=function(e){for(var o=!(!e||!e.parentNode)&&e.parentNode;o&&1==o.nodeType&&!/^BODY|HTML/.test(o.nodeName);){var t=n(o);if(/fixed|absolute/.test(t.css("position")))return t;var r=t.css("overflowY")||t.css("overflowX")||t.css("overflow")||"";if(/scroll|auto/.test(r)&&o.clientHeight!=o.scrollHeight)return t;if(t.getNiceScroll().length>0)return t;o=!!o.parentNode&&o.parentNode}return!1},this.triggerScrollStart=function(e,o,t,r,i){if(m.onscrollstart){var s={type:"scrollstart",current:{x:e,y:o},request:{x:t,y:r},end:{x:m.newscrollx,y:m.newscrolly},speed:i};m.onscrollstart.call(m,s)}},this.triggerScrollEnd=function(){if(m.onscrollend){var e=m.getScrollLeft(),o=m.getScrollTop(),t={type:"scrollend",current:{x:e,y:o},end:{x:e,y:o}};m.onscrollend.call(m,t)}};var I=0,O=0,H=0,B=1;function X(e,o,t,r){m.scrollrunning||(m.newscrolly=m.getScrollTop(),m.newscrollx=m.getScrollLeft(),H=w());var i=w()-H;if(H=w(),i>350?B=1:B+=(2-B)/10,o=o*B|0,e=e*B|0){if(r)if(e<0){if(m.getScrollLeft()>=m.page.maxw)return!0}else if(m.getScrollLeft()<=0)return!0;var s=e>0?1:-1;O!==s&&(m.scrollmom&&m.scrollmom.stop(),m.newscrollx=m.getScrollLeft(),O=s),m.lastdeltax-=e}if(o){if(function(){var e=m.getScrollTop();if(o<0){if(e>=m.page.maxh)return!0}else if(e<=0)return!0}()){if(g.nativeparentscrolling&&t&&!m.ispage&&!m.zoomactive)return!0;var n=m.view.h>>1;m.newscrolly<-n?(m.newscrolly=-n,o=-1):m.newscrolly>m.page.maxh+n?(m.newscrolly=m.page.maxh+n,o=1):o=0}var l=o>0?1:-1;I!==l&&(m.scrollmom&&m.scrollmom.stop(),m.newscrolly=m.getScrollTop(),I=l),m.lastdeltay-=o}(o||e)&&m.synched("relativexy",function(){var e=m.lastdeltay+m.newscrolly;m.lastdeltay=0;var o=m.lastdeltax+m.newscrollx;m.lastdeltax=0,m.rail.drag||m.doScrollPos(o,e)})}var D=!1;function A(e,o,t){var r,i;if(!t&&D)return!0;(0===e.deltaMode?(r=-e.deltaX*(g.mousescrollstep/54)|0,i=-e.deltaY*(g.mousescrollstep/54)|0):1===e.deltaMode&&(r=-e.deltaX*g.mousescrollstep*50/80|0,i=-e.deltaY*g.mousescrollstep*50/80|0),o&&g.oneaxismousemode&&0===r&&i)&&(r=i,i=0,t&&(r<0?m.getScrollLeft()>=m.page.maxw:m.getScrollLeft()<=0)&&(i=r,r=0));if(m.isrtlmode&&(r=-r),!X(r,i,t,!0))return D=!1,e.stopImmediatePropagation(),e.preventDefault();t&&(D=!0)}if(this.onmousewheel=function(e){if(m.wheelprevented||m.locked)return!1;if(m.railslocked)return m.debounced("checkunlock",m.resize,250),!1;if(m.rail.drag)return m.cancelEvent(e);if("auto"===g.oneaxismousemode&&0!==e.deltaX&&(g.oneaxismousemode=!1),g.oneaxismousemode&&0===e.deltaX&&!m.rail.scrollable)return!m.railh||!m.railh.scrollable||m.onmousewheelhr(e);var o=w(),t=!1;if(g.preservenativescrolling&&m.checkarea+600<o&&(m.nativescrollingarea=m.isScrollable(e),t=!0),m.checkarea=o,m.nativescrollingarea)return!0;var r=A(e,!1,t);return r&&(m.checkarea=0),r},this.onmousewheelhr=function(e){if(!m.wheelprevented){if(m.railslocked||!m.railh.scrollable)return!0;if(m.rail.drag)return m.cancelEvent(e);var o=w(),t=!1;return g.preservenativescrolling&&m.checkarea+600<o&&(m.nativescrollingarea=m.isScrollable(e),t=!0),m.checkarea=o,!!m.nativescrollingarea||(m.railslocked?m.cancelEvent(e):A(e,!0,t))}},this.stop=function(){return m.cancelScroll(),m.scrollmon&&m.scrollmon.stop(),m.cursorfreezed=!1,m.scroll.y=Math.round(m.getScrollTop()*(1/m.scrollratio.y)),m.noticeCursor(),m},this.getTransitionSpeed=function(e){return 80+e/72*g.scrollspeed|0},g.smoothscroll)if(m.ishwscroll&&T.hastransition&&g.usetransition&&g.smoothscroll){var q="";this.resetTransition=function(){q="",m.doc.css(T.prefixstyle+"transition-duration","0ms")},this.prepareTransition=function(e,o){var t=o?e:m.getTransitionSpeed(e),r=t+"ms";return q!==r&&(q=r,m.doc.css(T.prefixstyle+"transition-duration",r)),t},this.doScrollLeft=function(e,o){var t=m.scrollrunning?m.newscrolly:m.getScrollTop();m.doScrollPos(e,t,o)},this.doScrollTop=function(e,o){var t=m.scrollrunning?m.newscrollx:m.getScrollLeft();m.doScrollPos(t,e,o)},this.cursorupdate={running:!1,start:function(){var e=this;if(!e.running){e.running=!0;var o=function(){e.running&&u(o),m.showCursor(m.getScrollTop(),m.getScrollLeft()),m.notifyScrollEvent(m.win[0])};u(o)}},stop:function(){this.running=!1}},this.doScrollPos=function(e,o,t){var r=m.getScrollTop(),i=m.getScrollLeft();if(((m.newscrolly-r)*(o-r)<0||(m.newscrollx-i)*(e-i)<0)&&m.cancelScroll(),g.bouncescroll?(o<0?o=o/2|0:o>m.page.maxh&&(o=m.page.maxh+(o-m.page.maxh)/2|0),e<0?e=e/2|0:e>m.page.maxw&&(e=m.page.maxw+(e-m.page.maxw)/2|0)):(o<0?o=0:o>m.page.maxh&&(o=m.page.maxh),e<0?e=0:e>m.page.maxw&&(e=m.page.maxw)),m.scrollrunning&&e==m.newscrollx&&o==m.newscrolly)return!1;m.newscrolly=o,m.newscrollx=e;var s=m.getScrollTop(),n=m.getScrollLeft(),l={};l.x=e-n,l.y=o-s;var a=0|Math.sqrt(l.x*l.x+l.y*l.y),c=m.prepareTransition(a);m.scrollrunning||(m.scrollrunning=!0,m.triggerScrollStart(n,s,e,o,c),m.cursorupdate.start()),m.scrollendtrapped=!0,T.transitionend||(m.scrollendtrapped&&clearTimeout(m.scrollendtrapped),m.scrollendtrapped=setTimeout(m.onScrollTransitionEnd,c)),m.setScrollTop(m.newscrolly),m.setScrollLeft(m.newscrollx)},this.cancelScroll=function(){if(!m.scrollendtrapped)return!0;var e=m.getScrollTop(),o=m.getScrollLeft();return m.scrollrunning=!1,T.transitionend||clearTimeout(T.transitionend),m.scrollendtrapped=!1,m.resetTransition(),m.setScrollTop(e),m.railh&&m.setScrollLeft(o),m.timerscroll&&m.timerscroll.tm&&clearInterval(m.timerscroll.tm),m.timerscroll=!1,m.cursorfreezed=!1,m.cursorupdate.stop(),m.showCursor(e,o),m},this.onScrollTransitionEnd=function(){if(m.scrollendtrapped){var e=m.getScrollTop(),o=m.getScrollLeft();if(e<0?e=0:e>m.page.maxh&&(e=m.page.maxh),o<0?o=0:o>m.page.maxw&&(o=m.page.maxw),e!=m.newscrolly||o!=m.newscrollx)return m.doScrollPos(o,e,g.snapbackspeed);m.scrollrunning&&m.triggerScrollEnd(),m.scrollrunning=!1,m.scrollendtrapped=!1,m.resetTransition(),m.timerscroll=!1,m.setScrollTop(e),m.railh&&m.setScrollLeft(o),m.cursorupdate.stop(),m.noticeCursor(!1,e,o),m.cursorfreezed=!1}}}else this.doScrollLeft=function(e,o){var t=m.scrollrunning?m.newscrolly:m.getScrollTop();m.doScrollPos(e,t,o)},this.doScrollTop=function(e,o){var t=m.scrollrunning?m.newscrollx:m.getScrollLeft();m.doScrollPos(t,e,o)},this.doScrollPos=function(e,o,t){var r=m.getScrollTop(),i=m.getScrollLeft();((m.newscrolly-r)*(o-r)<0||(m.newscrollx-i)*(e-i)<0)&&m.cancelScroll();var s=!1;if(m.bouncescroll&&m.rail.visibility||(o<0?(o=0,s=!0):o>m.page.maxh&&(o=m.page.maxh,s=!0)),m.bouncescroll&&m.railh.visibility||(e<0?(e=0,s=!0):e>m.page.maxw&&(e=m.page.maxw,s=!0)),m.scrollrunning&&m.newscrolly===o&&m.newscrollx===e)return!0;m.newscrolly=o,m.newscrollx=e,m.dst={},m.dst.x=e-i,m.dst.y=o-r,m.dst.px=i,m.dst.py=r;var n=0|Math.sqrt(m.dst.x*m.dst.x+m.dst.y*m.dst.y),l=m.getTransitionSpeed(n);m.bzscroll={};var a=s?1:.58;m.bzscroll.x=new E(i,m.newscrollx,l,0,0,a,1),m.bzscroll.y=new E(r,m.newscrolly,l,0,0,a,1);w();var c=function(){if(m.scrollrunning){var e=m.bzscroll.y.getPos();m.setScrollLeft(m.bzscroll.x.getNow()),m.setScrollTop(m.bzscroll.y.getNow()),e<=1?m.timer=u(c):(m.scrollrunning=!1,m.timer=0,m.triggerScrollEnd())}};m.scrollrunning||(m.triggerScrollStart(i,r,e,o,l),m.scrollrunning=!0,m.timer=u(c))},this.cancelScroll=function(){return m.timer&&h(m.timer),m.timer=0,m.bzscroll=!1,m.scrollrunning=!1,m};else this.doScrollLeft=function(e,o){var t=m.getScrollTop();m.doScrollPos(e,t,o)},this.doScrollTop=function(e,o){var t=m.getScrollLeft();m.doScrollPos(t,e,o)},this.doScrollPos=function(e,o,t){var r=e>m.page.maxw?m.page.maxw:e;r<0&&(r=0);var i=o>m.page.maxh?m.page.maxh:o;i<0&&(i=0),m.synched("scroll",function(){m.setScrollTop(i),m.setScrollLeft(r)})},this.cancelScroll=function(){};this.doScrollBy=function(e,o){X(0,e)},this.doScrollLeftBy=function(e,o){X(e,0)},this.doScrollTo=function(e,o){var t=o?Math.round(e*m.scrollratio.y):e;t<0?t=0:t>m.page.maxh&&(t=m.page.maxh),m.cursorfreezed=!1,m.doScrollTop(e)},this.checkContentSize=function(){var e=m.getContentSize();e.h==m.page.h&&e.w==m.page.w||m.resize(!1,e)},m.onscroll=function(e){m.rail.drag||m.cursorfreezed||m.synched("scroll",function(){m.scroll.y=Math.round(m.getScrollTop()/m.scrollratio.y),m.railh&&(m.scroll.x=Math.round(m.getScrollLeft()/m.scrollratio.x)),m.noticeCursor()})},m.bind(m.docscroll,"scroll",m.onscroll),this.doZoomIn=function(e){if(!m.zoomactive){m.zoomactive=!0,m.zoomrestore={style:{}};var o=["position","top","left","zIndex","backgroundColor","marginTop","marginBottom","marginLeft","marginRight"],t=m.win[0].style;for(var r in o){var i=o[r];m.zoomrestore.style[i]=void 0!==t[i]?t[i]:""}m.zoomrestore.style.width=m.win.css("width"),m.zoomrestore.style.height=m.win.css("height"),m.zoomrestore.padding={w:m.win.outerWidth()-m.win.width(),h:m.win.outerHeight()-m.win.height()},T.isios4&&(m.zoomrestore.scrollTop=c.scrollTop(),c.scrollTop(0)),m.win.css({position:T.isios4?"absolute":"fixed",top:0,left:0,zIndex:s+100,margin:0});var n=m.win.css("backgroundColor");return(""===n||/transparent|rgba\(0, 0, 0, 0\)|rgba\(0,0,0,0\)/.test(n))&&m.win.css("backgroundColor","#fff"),m.rail.css({zIndex:s+101}),m.zoom.css({zIndex:s+102}),m.zoom.css("backgroundPosition","0 -18px"),m.resizeZoom(),m.onzoomin&&m.onzoomin.call(m),m.cancelEvent(e)}},this.doZoomOut=function(e){if(m.zoomactive)return m.zoomactive=!1,m.win.css("margin",""),m.win.css(m.zoomrestore.style),T.isios4&&c.scrollTop(m.zoomrestore.scrollTop),m.rail.css({"z-index":m.zindex}),m.zoom.css({"z-index":m.zindex}),m.zoomrestore=!1,m.zoom.css("backgroundPosition","0 0"),m.onResize(),m.onzoomout&&m.onzoomout.call(m),m.cancelEvent(e)},this.doZoom=function(e){return m.zoomactive?m.doZoomOut(e):m.doZoomIn(e)},this.resizeZoom=function(){if(m.zoomactive){var e=m.getScrollTop();m.win.css({width:c.width()-m.zoomrestore.padding.w+"px",height:c.height()-m.zoomrestore.padding.h+"px"}),m.onResize(),m.setScrollTop(Math.min(m.page.maxh,e))}},this.init(),n.nicescroll.push(this)},S=function(e){var o=this;this.nc=e,this.lastx=0,this.lasty=0,this.speedx=0,this.speedy=0,this.lasttime=0,this.steptime=0,this.snapx=!1,this.snapy=!1,this.demulx=0,this.demuly=0,this.lastscrollx=-1,this.lastscrolly=-1,this.chkx=0,this.chky=0,this.timer=0,this.reset=function(e,t){o.stop(),o.steptime=0,o.lasttime=w(),o.speedx=0,o.speedy=0,o.lastx=e,o.lasty=t,o.lastscrollx=-1,o.lastscrolly=-1},this.update=function(e,t){var r=w();o.steptime=r-o.lasttime,o.lasttime=r;var i=t-o.lasty,s=e-o.lastx,n=o.nc.getScrollTop()+i,l=o.nc.getScrollLeft()+s;o.snapx=l<0||l>o.nc.page.maxw,o.snapy=n<0||n>o.nc.page.maxh,o.speedx=s,o.speedy=i,o.lastx=e,o.lasty=t},this.stop=function(){o.nc.unsynched("domomentum2d"),o.timer&&clearTimeout(o.timer),o.timer=0,o.lastscrollx=-1,o.lastscrolly=-1},this.doSnapy=function(e,t){var r=!1;t<0?(t=0,r=!0):t>o.nc.page.maxh&&(t=o.nc.page.maxh,r=!0),e<0?(e=0,r=!0):e>o.nc.page.maxw&&(e=o.nc.page.maxw,r=!0),r?o.nc.doScrollPos(e,t,o.nc.opt.snapbackspeed):o.nc.triggerScrollEnd()},this.doMomentum=function(e){var t=w(),r=e?t+e:o.lasttime,i=o.nc.getScrollLeft(),s=o.nc.getScrollTop(),n=o.nc.page.maxh,l=o.nc.page.maxw;o.speedx=l>0?Math.min(60,o.speedx):0,o.speedy=n>0?Math.min(60,o.speedy):0;var a=r&&t-r<=60;(s<0||s>n||i<0||i>l)&&(a=!1);var c=!(!o.speedy||!a)&&o.speedy,d=!(!o.speedx||!a)&&o.speedx;if(c||d){var u=Math.max(16,o.steptime);if(u>50){var h=u/50;o.speedx*=h,o.speedy*=h,u=50}o.demulxy=0,o.lastscrollx=o.nc.getScrollLeft(),o.chkx=o.lastscrollx,o.lastscrolly=o.nc.getScrollTop(),o.chky=o.lastscrolly;var p=o.lastscrollx,m=o.lastscrolly,f=function(){var e=w()-t>600?.04:.02;o.speedx&&(p=Math.floor(o.lastscrollx-o.speedx*(1-o.demulxy)),o.lastscrollx=p,(p<0||p>l)&&(e=.1)),o.speedy&&(m=Math.floor(o.lastscrolly-o.speedy*(1-o.demulxy)),o.lastscrolly=m,(m<0||m>n)&&(e=.1)),o.demulxy=Math.min(1,o.demulxy+e),o.nc.synched("domomentum2d",function(){if(o.speedx){o.nc.getScrollLeft();o.chkx=p,o.nc.setScrollLeft(p)}if(o.speedy){o.nc.getScrollTop();o.chky=m,o.nc.setScrollTop(m)}o.timer||(o.nc.hideCursor(),o.doSnapy(p,m))}),o.demulxy<1?o.timer=setTimeout(f,u):(o.stop(),o.nc.hideCursor(),o.doSnapy(p,m))};f()}else o.doSnapy(o.nc.getScrollLeft(),o.nc.getScrollTop())}},z=e.fn.scrollTop;e.cssHooks.pageYOffset={get:function(e,o,t){var r=n.data(e,"__nicescroll")||!1;return r&&r.ishwscroll?r.getScrollTop():z.call(e)},set:function(e,o){var t=n.data(e,"__nicescroll")||!1;return t&&t.ishwscroll?t.setScrollTop(parseInt(o)):z.call(e,o),this}},e.fn.scrollTop=function(e){if(void 0===e){var o=this[0]&&n.data(this[0],"__nicescroll")||!1;return o&&o.ishwscroll?o.getScrollTop():z.call(this)}return this.each(function(){var o=n.data(this,"__nicescroll")||!1;o&&o.ishwscroll?o.setScrollTop(parseInt(e)):z.call(n(this),e)})};var k=e.fn.scrollLeft;n.cssHooks.pageXOffset={get:function(e,o,t){var r=n.data(e,"__nicescroll")||!1;return r&&r.ishwscroll?r.getScrollLeft():k.call(e)},set:function(e,o){var t=n.data(e,"__nicescroll")||!1;return t&&t.ishwscroll?t.setScrollLeft(parseInt(o)):k.call(e,o),this}},e.fn.scrollLeft=function(e){if(void 0===e){var o=this[0]&&n.data(this[0],"__nicescroll")||!1;return o&&o.ishwscroll?o.getScrollLeft():k.call(this)}return this.each(function(){var o=n.data(this,"__nicescroll")||!1;o&&o.ishwscroll?o.setScrollLeft(parseInt(e)):k.call(n(this),e)})};var T=function(e){var o=this;if(this.length=0,this.name="nicescrollarray",this.each=function(e){return n.each(o,e),o},this.push=function(e){o[o.length]=e,o.length++},this.eq=function(e){return o[e]},e)for(var t=0;t<e.length;t++){var r=n.data(e[t],"__nicescroll")||!1;r&&(this[this.length]=r,this.length++)}return this};!function(e,o,t){for(var r=0,i=o.length;r<i;r++)t(e,o[r])}(T.prototype,["show","hide","toggle","onResize","resize","remove","stop","doScrollPos"],function(e,o){e[o]=function(){var e=arguments;return this.each(function(){this[o].apply(this,e)})}}),e.fn.getNiceScroll=function(e){return void 0===e?new T(this):this[e]&&n.data(this[e],"__nicescroll")||!1},(e.expr.pseudos||e.expr[":"]).nicescroll=function(e){return void 0!==n.data(e,"__nicescroll")},n.fn.niceScroll=function(e,o){void 0!==o||"object"!=typeof e||"jquery"in e||(o=e,e=!1);var t=new T;return this.each(function(){var r=n(this),i=n.extend({},o);if(e){var s=n(e);i.doc=s.length>1?n(e,r):s,i.win=r}!("doc"in i)||"win"in i||(i.win=r);var l=r.data("__nicescroll")||!1;l||(i.doc=i.doc||r,l=new x(i,r),r.data("__nicescroll",l)),t.push(l)}),1===t.length?t[0]:t},a.NiceScroll={getjQuery:function(){return e}},n.nicescroll||(n.nicescroll=new T,n.nicescroll.options=b)});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/legacy.js b/src_old/resources/scripts/axure/legacy.js
new file mode 100644
index 0000000..a46148a
--- /dev/null
+++ b/src_old/resources/scripts/axure/legacy.js
@@ -0,0 +1,166 @@
+//stored on each browser event
+var windowEvent;
+
+$axure.internal(function($ax) {
+    var _legacy = {};
+    $ax.legacy = _legacy;
+
+    var Forms = window.document.getElementsByTagName("FORM");
+    for(var i = 0; i < Forms.length; i++) {
+        var Form = Forms[i];
+        Form.onclick = $ax.legacy.SuppressBubble;
+    }
+
+    $ax.legacy.SuppressBubble = function(event) {
+        if(IE_10_AND_BELOW) {
+            window.event.cancelBubble = true;
+            window.event.returnValue = false;
+        } else {
+            if(event) {
+                event.stopPropagation();
+            }
+        }
+    };
+    
+    $ax.legacy.BringToFront = function(id, skipFixed) {
+        _bringToFrontHelper(id);
+        if(!skipFixed) $ax.legacy.BringFixedToFront();
+    };
+
+    var _bringToFrontHelper = function(id) {
+        var target = window.document.getElementById(id);
+        if(target == null) return;
+        $ax.globals.MaxZIndex = $ax.globals.MaxZIndex + 1;
+        target.style.zIndex = $ax.globals.MaxZIndex;
+    };
+
+    $ax.legacy.BringFixedToFront = function() {
+        $ax(function(diagramObject) { return diagramObject.fixedKeepInFront; }).each(function(diagramObject, scriptId) {
+            _bringToFrontHelper(scriptId);
+        });
+    };
+
+    $ax.legacy.SendToBack = function(id) {
+        var target = window.document.getElementById(id);
+        if(target == null) return;
+        target.style.zIndex = $ax.globals.MinZIndex = $ax.globals.MinZIndex - 1;
+    };
+
+    $ax.legacy.RefreshScreen = function() {
+        var oldColor = window.document.body.style.backgroundColor;
+        var setColor = (oldColor == "rgb(0,0,0)") ? "#FFFFFF" : "#000000";
+        window.document.body.style.backgroundColor = setColor;
+        window.document.body.style.backgroundColor = oldColor;
+    };
+
+    $ax.legacy.getAbsoluteLeft = function(currentNode, elementId) {
+        var oldDisplay = currentNode.css('display');
+        var displaySet = false;
+        if(oldDisplay == 'none') {
+            currentNode.css('display', '');
+            displaySet = true;
+        }
+        var left = currentNode.offset().left;
+
+        // Special Layer code
+        if($ax.getTypeFromElementId(elementId) == 'layer') {
+            var first = true;
+            var children = currentNode.children();
+            for(var i = 0; i < children.length; i++) {
+                var child = $(children[i]);
+                var subDisplaySet = false;
+                if(child.css('display') == 'none') {
+                    child.css('display', '');
+                    subDisplaySet = true;
+                }
+                if(first) left = child.offset().left;
+                else left = Math.min(child.offset().left, left);
+                first = false;
+
+                if(subDisplaySet) child.css('display', 'none');
+            }
+        }
+
+        if (displaySet) currentNode.css('display', oldDisplay);
+
+        return $axure.fn.bodyToWorld(left, true);
+    };
+
+    $ax.legacy.getAbsoluteTop = function(currentNode, elementId) {
+        var oldDisplay = currentNode.css('display');
+        var displaySet = false;
+        if(oldDisplay == 'none') {
+            currentNode.css('display', '');
+            displaySet = true;
+        }
+        var top = currentNode.offset().top;
+
+        // Special Layer code
+        if ($ax.getTypeFromElementId(elementId) == 'layer') {
+            var first = true;
+            var children = currentNode.children();
+            for (var i = 0; i < children.length; i++) {
+                var child = $(children[i]);
+                var subDisplaySet = false;
+                if (child.css('display') == 'none') {
+                    child.css('display', '');
+                    subDisplaySet = true;
+                }
+                if (first) top = child.offset().top;
+                else top = Math.min(child.offset().top, top);
+                first = false;
+
+                if (subDisplaySet) child.css('display', 'none');
+            }
+        }
+
+        if(displaySet) currentNode.css('display', oldDisplay);
+        return top;
+    };
+
+    // ******************  Annotation and Link Functions ****************** //
+
+    $ax.legacy.GetAnnotationHtml = function(annJson) {
+        var retVal = "";
+        for(var noteName in annJson) {
+            if(noteName != "label" && noteName != "id") {
+                retVal += "<div class='annotationName'>" + noteName + "</div>";
+                retVal += "<div class='annotationValue'>" + linkify(annJson[noteName]) + "</div>";
+            }
+        }
+        return retVal;
+
+        function linkify(text) {
+            var urlRegex = /(\b(((https?|ftp|file):\/\/)|(www\.))[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
+            return text.replace(urlRegex, function (url, b, c) {
+                var url2 = (c == 'www.') ? 'http://' + url : url;
+                return '<a href="' + url2 + '" target="_blank" class="noteLink">' + url + '</a>';
+            });
+        }
+    };
+
+
+    $ax.legacy.GetScrollable = function(target) {
+        var $target = $(target);
+        var last = $target;
+        // Start past inital target. Can't scroll to target in itself, must be some ancestor.
+        var current = last.parent();
+
+        while(!current.is('body') && !current.is('html')) {
+            var elementId = current.attr('id');
+            var diagramObject = elementId && $ax.getObjectFromElementId(elementId);
+            if (diagramObject && $ax.public.fn.IsDynamicPanel(diagramObject.type) && diagramObject.scrollbars != 'none') {
+                //returns the panel diagram div which handles scrolling
+                return $ax.dynamicPanelManager.getShownState(current.attr('id'))[0];
+            }
+            last = current;
+            current = current.parent();
+        }
+        // Need to do this because of ie
+        if(IE_10_AND_BELOW) return window.document.documentElement;
+        else return window.document.body;
+    };
+
+
+
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/math.js b/src_old/resources/scripts/axure/math.js
new file mode 100644
index 0000000..cf2f75d
--- /dev/null
+++ b/src_old/resources/scripts/axure/math.js
@@ -0,0 +1,554 @@
+$axure.internal(function($ax) {
+    $ax.public.fn.matrixMultiply = function(matrix, vector) {
+        if(!matrix.tx) matrix.tx = 0;
+        if(!matrix.ty) matrix.ty = 0;
+        var outX = matrix.m11 * vector.x + matrix.m12 * vector.y + matrix.tx;
+        var outY = matrix.m21 * vector.x + matrix.m22 * vector.y + matrix.ty;
+        return { x: outX, y: outY };
+    }
+
+    $ax.public.fn.matrixInverse = function(matrix) {
+        if(!matrix.tx) matrix.tx = 0;
+        if(!matrix.ty) matrix.ty = 0;
+
+        var determinant = matrix.m11*matrix.m22 - matrix.m12*matrix.m21;
+        //var threshold = (M11 * M11 + M22 *M22 + M12 *M12+ M21 *M21) / 100000;
+        //if(determinant.DeltaEquals(0, threshold) && determinant < 0.01) {
+        //    return Invalid;
+        //}
+        return  {
+            m11 : matrix.m22/determinant,
+            m12 : -matrix.m12/determinant,
+            tx : (matrix.ty*matrix.m12 - matrix.tx*matrix.m22)/determinant,
+            m21: -matrix.m21 / determinant,
+            m22: matrix.m11 / determinant,
+            ty: (matrix.tx * matrix.m21 - matrix.ty * matrix.m11) / determinant
+        };
+    }
+
+
+    $ax.public.fn.matrixMultiplyMatrix = function (matrix1, matrix2) {
+        if (!matrix1.tx) matrix1.tx = 0;
+        if (!matrix1.ty) matrix1.ty = 0;
+        if (!matrix2.tx) matrix2.tx = 0;
+        if (!matrix2.ty) matrix2.ty = 0;
+
+        return {
+            m11: matrix1.m12*matrix2.m21 + matrix1.m11*matrix2.m11,
+            m12: matrix1.m12*matrix2.m22 + matrix1.m11*matrix2.m12,
+            tx: matrix1.m12 * matrix2.ty + matrix1.m11 * matrix2.tx + matrix1.tx,
+            m21: matrix1.m22 * matrix2.m21 + matrix1.m21 * matrix2.m11,
+            m22: matrix1.m22 * matrix2.m22 + matrix1.m21 * matrix2.m12,
+            ty: matrix1.m22 * matrix2.ty + matrix1.m21 * matrix2.tx + matrix1.ty,
+        };
+    }
+
+
+    $ax.public.fn.transformFromElement = function (element) {
+        var st = window.getComputedStyle(element, null);
+
+        var tr = st.getPropertyValue("-webkit-transform") ||
+            st.getPropertyValue("-moz-transform") ||
+            st.getPropertyValue("-ms-transform") ||
+            st.getPropertyValue("-o-transform") ||
+            st.getPropertyValue("transform");
+
+        if (tr.indexOf('none') < 0) {
+            var matrix = tr.split('(')[1];
+            matrix = matrix.split(')')[0];
+            matrix = matrix.split(',');
+            for (var l = 0; l < matrix.length; l++) {
+                matrix[l] = Number(matrix[l]);
+            }
+
+        } else { matrix = [1.0, 0.0, 0.0, 1.0, 0.0, 0.0]; }
+
+        return matrix;
+        // matrix[0] = cosine, matrix[1] = sine. 
+        // Assuming the element is still orthogonal.
+    }
+
+    $ax.public.fn.vectorMinus = function(vector1, vector2) { return { x: vector1.x - vector2.x, y: vector1.y - vector2.y }; }
+
+    $ax.public.fn.vectorPlus = function (vector1, vector2) { return { x: vector1.x + vector2.x, y: vector1.y + vector2.y }; }
+
+    $ax.public.fn.vectorMidpoint = function (vector1, vector2) { return { x: (vector1.x + vector2.x) / 2.0, y: (vector1.y + vector2.y) / 2.0 }; }
+
+    $ax.public.fn.fourCornersToBasis = function (fourCorners) {
+        return {
+            widthVector: $ax.public.fn.vectorMinus(fourCorners.widgetTopRight, fourCorners.widgetTopLeft),
+            heightVector: $ax.public.fn.vectorMinus(fourCorners.widgetBottomLeft, fourCorners.widgetTopLeft)
+        };
+    }
+
+    $ax.public.fn.matrixString = function(m11, m21, m12, m22, tx, ty) {
+        return "Matrix(" + m11 + "," + m21 + "," + m12 + "," + m22 + ", " + tx + ", " + ty + ")";
+    }
+    
+    //$ax.public.fn.getWidgetBoundingRect = function (widgetId) {
+    //    var emptyRect = { left: 0, top: 0, centerPoint: { x: 0, y: 0 }, width: 0, height: 0 };
+    //    var element = document.getElementById(widgetId);
+    //    if (!element) return emptyRect;
+
+    //    var object = $obj(widgetId);
+    //    if (object && object.type && $ax.public.fn.IsLayer(object.type)) {
+    //        var layerChildren = _getLayerChildrenDeep(widgetId);
+    //        if (!layerChildren) return emptyRect;
+    //        else return _getBoundingRectForMultipleWidgets(layerChildren);
+    //    }
+    //    return _getBoundingRectForSingleWidget(widgetId);
+    //};
+
+    var _getLayerChildrenDeep = $ax.public.fn.getLayerChildrenDeep = function (layerId, includeLayers, includeHidden) {
+        var deep = [];
+        var children = $ax('#' + layerId).getChildren()[0].children;
+        for (var index = 0; index < children.length; index++) {
+            var childId = children[index];
+            if(!includeHidden && !$ax.visibility.IsIdVisible(childId)) continue;
+            if ($ax.public.fn.IsLayer($obj(childId).type)) {
+                if (includeLayers) deep.push(childId);
+                var recursiveChildren = _getLayerChildrenDeep(childId, includeLayers, includeHidden);
+                for (var j = 0; j < recursiveChildren.length; j++) deep.push(recursiveChildren[j]);
+            } else deep.push(childId);
+        }
+        return deep;
+    };
+
+    //var _getBoundingRectForMultipleWidgets = function (widgetsIdArray, relativeToPage) {
+    //    if (!widgetsIdArray || widgetsIdArray.constructor !== Array) return undefined;
+    //    if (widgetsIdArray.length == 0) return { left: 0, top: 0, centerPoint: { x: 0, y: 0 }, width: 0, height: 0 };
+    //    var widgetRect = _getBoundingRectForSingleWidget(widgetsIdArray[0], relativeToPage, true);
+    //    var boundingRect = { left: widgetRect.left, right: widgetRect.right, top: widgetRect.top, bottom: widgetRect.bottom };
+
+    //    for (var index = 1; index < widgetsIdArray.length; index++) {
+    //        widgetRect = _getBoundingRectForSingleWidget(widgetsIdArray[index], relativeToPage);
+    //        boundingRect.left = Math.min(boundingRect.left, widgetRect.left);
+    //        boundingRect.top = Math.min(boundingRect.top, widgetRect.top);
+    //        boundingRect.right = Math.max(boundingRect.right, widgetRect.right);
+    //        boundingRect.bottom = Math.max(boundingRect.bottom, widgetRect.bottom);
+    //    }
+
+    //    boundingRect.centerPoint = { x: (boundingRect.right + boundingRect.left) / 2.0, y: (boundingRect.bottom + boundingRect.top) / 2.0 };
+    //    boundingRect.width = boundingRect.right - boundingRect.left;
+    //    boundingRect.height = boundingRect.bottom - boundingRect.top;
+    //    return boundingRect;
+    //};
+
+    //var _getBoundingRectForSingleWidget = function (widgetId, relativeToPage, justSides) {
+    //    var element = document.getElementById(widgetId);
+    //    var boundingRect, tempBoundingRect, position;
+    //    var displayChanged = _displayHackStart(element);
+
+    //    if (_isCompoundVectorHtml(element)) {
+    //        //tempBoundingRect =  _getCompoundImageBoundingClientSize(widgetId);
+    //        //position = { left: tempBoundingRect.left, top: tempBoundingRect.top };
+    //        position = $(element).position();
+    //        tempBoundingRect = {};
+    //        tempBoundingRect.left = position.left; //= _getCompoundImageBoundingClientSize(widgetId);
+    //        tempBoundingRect.top = position.top;
+    //        tempBoundingRect.width = Number(element.getAttribute('data-width'));
+    //        tempBoundingRect.height = Number(element.getAttribute('data-height'));
+    //    } else {
+    //        var boundingElement = element;
+    //        if($ax.dynamicPanelManager.isIdFitToContent(widgetId)) {
+    //            var stateId = $ax.visibility.GetPanelState(widgetId);
+    //            if(stateId != '') boundingElement = document.getElementById(stateId);
+    //        }
+    //        tempBoundingRect = boundingElement.getBoundingClientRect();
+
+    //        var jElement = $(element);
+    //        position = jElement.position();
+    //        if(jElement.css('position') == 'fixed') {
+    //            position.left += Number(jElement.css('margin-left').replace("px", ""));
+    //            position.top += Number(jElement.css('margin-top').replace("px", ""));
+    //        }
+    //    }
+
+    //    var layers = $ax('#' + widgetId).getParents(true, ['layer'])[0];
+    //    var flip = '';
+    //    var mirrorWidth = 0;
+    //    var mirrorHeight = 0;
+    //    for (var i = 0; i < layers.length; i++) {
+
+    //        //should always be 0,0
+    //        var layerPos = $jobj(layers[i]).position();
+    //        position.left += layerPos.left;
+    //        position.top += layerPos.top;
+
+    //        var outer = $ax.visibility.applyWidgetContainer(layers[i], true, true);
+    //        if (outer.length) {
+    //            var outerPos = outer.position();
+    //            position.left += outerPos.left;
+    //            position.top += outerPos.top;
+    //        }
+
+    //        //when a group is flipped we find the unflipped position
+    //        var inner = $jobj(layers[i] + '_container_inner');
+    //        var taggedFlip = inner.data('flip');
+    //        if (inner.length && taggedFlip) {
+    //            //only account for flip if transform is applied
+    //            var matrix = taggedFlip && (inner.css("-webkit-transform") || inner.css("-moz-transform") ||
+    //                        inner.css("-ms-transform") || inner.css("-o-transform") || inner.css("transform"));
+    //            if (matrix !== 'none') {
+    //                flip = taggedFlip;
+    //                mirrorWidth = $ax.getNumFromPx(inner.css('width'));
+    //                mirrorHeight = $ax.getNumFromPx(inner.css('height'));
+    //            }
+    //        }
+    //    }
+    //     //Now account for flip
+    //    if (flip == 'x') position.top = mirrorHeight - position.top - element.getBoundingClientRect().height;
+    //    else if (flip == 'y') position.left = mirrorWidth - position.left - element.getBoundingClientRect().width;
+
+    //    boundingRect = {
+    //        left: position.left,
+    //        right: position.left + tempBoundingRect.width,
+    //        top: position.top,
+    //        bottom: position.top + tempBoundingRect.height
+    //    };
+
+    //    _displayHackEnd(displayChanged);
+    //    if (justSides) return boundingRect;
+
+    //    boundingRect.width = boundingRect.right - boundingRect.left;
+    //    boundingRect.height = boundingRect.bottom - boundingRect.top;
+
+    //    boundingRect.centerPoint = {
+    //        x: boundingRect.width / 2 + boundingRect.left,
+    //        y: boundingRect.height / 2 + boundingRect.top
+    //    };
+
+    //    return boundingRect;
+    //};
+
+    var _getPointAfterRotate = $ax.public.fn.getPointAfterRotate = function (angleInDegrees, pointToRotate, centerPoint) {
+        var displacement = $ax.public.fn.vectorMinus(pointToRotate, centerPoint);
+        var rotationMatrix = $ax.public.fn.rotationMatrix(angleInDegrees);
+        rotationMatrix.tx = centerPoint.x;
+        rotationMatrix.ty = centerPoint.y;
+        return $ax.public.fn.matrixMultiply(rotationMatrix, displacement);
+    };
+
+    $ax.public.fn.getBoundingSizeForRotate = function(width, height, rotation) {
+        // point to rotate around doesn't matter since we just care about size, if location matter we need more args and location matters.
+
+        var origin = { x: 0, y: 0 };
+
+        var corner1 = { x: width, y: 0 };
+        var corner2 = { x: 0, y: height };
+        var corner3 = { x: width, y: height };
+
+        corner1 = _getPointAfterRotate(rotation, corner1, origin);
+        corner2 = _getPointAfterRotate(rotation, corner2, origin);
+        corner3 = _getPointAfterRotate(rotation, corner3, origin);
+
+        var left = Math.min(0, corner1.x, corner2.x, corner3.x);
+        var right = Math.max(0, corner1.x, corner2.x, corner3.x);
+        var top = Math.min(0, corner1.y, corner2.y, corner3.y);
+        var bottom = Math.max(0, corner1.y, corner2.y, corner3.y);
+
+        return { width: right - left, height: bottom - top };
+    }
+
+    $ax.public.fn.getBoundingRectForRotate = function (boundingRect, rotation) {
+        var centerPoint = boundingRect.centerPoint;
+        var corner1 = { x: boundingRect.left, y: boundingRect.top };
+        var corner2 = { x: boundingRect.right, y: boundingRect.top };
+        var corner3 = { x: boundingRect.right, y: boundingRect.bottom };
+        var corner4 = { x: boundingRect.left, y: boundingRect.bottom };
+        corner1 = _getPointAfterRotate(rotation, corner1, centerPoint);
+        corner2 = _getPointAfterRotate(rotation, corner2, centerPoint);
+        corner3 = _getPointAfterRotate(rotation, corner3, centerPoint);
+        corner4 = _getPointAfterRotate(rotation, corner4, centerPoint);
+
+        var left = Math.min(corner1.x, corner2.x, corner3.x, corner4.x);
+        var right = Math.max(corner1.x, corner2.x, corner3.x, corner4.x);
+        var top = Math.min(corner1.y, corner2.y, corner3.y, corner4.y);
+        var bottom = Math.max(corner1.y, corner2.y, corner3.y, corner4.y);
+
+        return { left: left, top: top, width: right - left, height: bottom - top };
+    }
+
+
+    //$ax.public.fn.getPositionRelativeToParent = function (elementId) {
+    //    var element = document.getElementById(elementId);
+    //    var list = _displayHackStart(element);
+    //    var position = $(element).position();
+    //    _displayHackEnd(list);
+    //    return position;
+    //};
+
+    //var _displayHackStart = $ax.public.fn.displayHackStart = function (element) {
+    //    // TODO: Options: 1) stop setting display none. Big change for this late in the game. 2) Implement our own bounding.
+    //    // TODO:  3) Current method is look for any parents that are set to none, and and temporarily unblock. Don't like it, but it works.
+    //    var parent = element;
+    //    var displays = [];
+    //    while (parent) {
+    //        if (parent.style.display == 'none') {
+    //            displays.push(parent);
+    //            //use block to overwrites default hidden objects' display
+    //            parent.style.display = 'block';
+    //        }
+    //        parent = parent.parentElement;
+    //    }
+
+    //    return displays;
+    //};
+
+    //var _displayHackEnd = $ax.public.fn.displayHackEnd = function (displayChangedList) {
+    //    for (var i = 0; i < displayChangedList.length; i++) displayChangedList[i].style.display = 'none';
+    //};
+
+
+    var _isCompoundVectorHtml = $ax.public.fn.isCompoundVectorHtml = function(hElement) {
+        return hElement.hasAttribute('compoundmode') && hElement.getAttribute('compoundmode') == "true";
+    }
+
+    $ax.public.fn.removeCompound = function (jobj) { if(_isCompoundVectorHtml(jobj[0])) jobj.removeClass('compound'); }
+    $ax.public.fn.restoreCompound = function (jobj) { if (_isCompoundVectorHtml(jobj[0])) jobj.addClass('compound'); }
+
+    $ax.public.fn.compoundIdFromComponent = function(id) {
+
+        var pPos = id.indexOf('p');
+        var dashPos = id.indexOf('-');
+        if (pPos < 1) return id;
+        else if (dashPos < 0) return id.substring(0, pPos);
+        else return id.substring(0, pPos) + id.substring(dashPos);
+    }
+
+    $ax.public.fn.l2 = function (x, y) { return Math.sqrt(x * x + y * y); }
+
+    $ax.public.fn.convertToSingleImage = function (jobj) {
+        if(!jobj[0]) return;
+
+        var widgetId = jobj[0].id;
+        var object = $obj(widgetId);
+
+        if ($ax.public.fn.IsLayer(object.type)) {
+            var recursiveChildren = _getLayerChildrenDeep(widgetId, true);
+            for (var j = 0; j < recursiveChildren.length; j++)
+                $ax.public.fn.convertToSingleImage($jobj(recursiveChildren[j]));
+            return;
+        }
+
+        //var layer = 
+
+        if(!_isCompoundVectorHtml(jobj[0])) return;
+
+
+        $('#' + widgetId).removeClass("compound");
+        $('#' + widgetId + '_img').removeClass("singleImg");
+        jobj[0].setAttribute('compoundmode', 'false');
+        
+        var components = object.compoundChildren;
+        delete object.generateCompound;
+        for (var i = 0; i < components.length; i++) {
+            var componentJobj = $jobj($ax.public.fn.getComponentId(widgetId, components[i]));
+            componentJobj.css('display', 'none');
+            componentJobj.css('visibility', 'hidden');
+        }
+    }
+
+
+    $ax.public.fn.getContainerDimensions = function(query) {
+        // returns undefined if no containers found.
+        var containerDimensions;
+        for (var i = 0; i < query[0].children.length; i++) {
+            var node = query[0].children[i];
+            if (node.id.indexOf(query[0].id) >= 0 && node.id.indexOf('container') >= 0) {
+                containerDimensions = node.style;
+            }
+        }
+        return containerDimensions;
+    }
+
+
+    $ax.public.fn.rotationMatrix = function (angleInDegrees) {
+        var angleInRadians = angleInDegrees * (Math.PI / 180);
+        var cosTheta = Math.cos(angleInRadians);
+        var sinTheta = Math.sin(angleInRadians);
+
+        return { m11: cosTheta, m12: -sinTheta, m21: sinTheta, m22: cosTheta, tx: 0.0, ty: 0.0 };
+    }
+
+    $ax.public.fn.GetFieldFromStyle = function (query, field) {
+        var raw = query[0].style[field];
+        if (!raw) raw = query.css(field);
+        return Number(raw.replace('px', ''));
+        }
+
+
+    $ax.public.fn.setTransformHowever = function (transformString) {
+        return {
+            '-webkit-transform': transformString,
+            '-moz-transform': transformString,
+            '-ms-transform': transformString,
+            '-o-transform': transformString,
+            'transform': transformString
+        };
+    }
+
+    $ax.public.fn.getCornersFromComponent = function (id) {
+        var element = document.getElementById(id);
+        var matrix = element ? $ax.public.fn.transformFromElement(element) : [1.0, 0.0, 0.0, 1.0, 0.0, 0.0];
+        var currentMatrix = { m11: matrix[0], m21: matrix[1], m12: matrix[2], m22: matrix[3], tx: matrix[4], ty: matrix[5] };
+        var dimensions = {};
+        var axObj = $ax('#' + id);
+        var viewportLocation = axObj.offsetLocation();
+        dimensions.left = viewportLocation.left;
+        dimensions.top = viewportLocation.top;
+        //dimensions.left = axObj.left(true);
+        //dimensions.top = axObj.top(true);
+        var size = axObj.size();
+        dimensions.width = size.width;
+        dimensions.height = size.height;
+        //var transformMatrix1 = { m11: 1, m12: 0, m21: 0, m22: 1, tx: -invariant.x, ty: -invariant.y };
+        //var transformMatrix2 = { m11: 1, m12: 0, m21: 0, m22: 1, tx: 500, ty: 500 };
+
+        var halfWidth = dimensions.width * 0.5;
+        var halfHeight = dimensions.height * 0.5;
+        //var preTransformTopLeft = { x: -halfWidth, y: -halfHeight };
+        //var preTransformBottomLeft = { x: -halfWidth, y: halfHeight };
+        var preTransformTopRight = { x: halfWidth, y: -halfHeight };
+        var preTransformBottomRight = { x: halfWidth, y: halfHeight };
+
+        return {
+            //relativeTopLeft: $ax.public.fn.matrixMultiply(currentMatrix, preTransformTopLeft),
+            //relativeBottomLeft: $ax.public.fn.matrixMultiply(currentMatrix, preTransformBottomLeft),
+            relativeTopRight: $ax.public.fn.matrixMultiply(currentMatrix, preTransformTopRight),
+            relativeBottomRight: $ax.public.fn.matrixMultiply(currentMatrix, preTransformBottomRight),
+            centerPoint: { x: dimensions.left + halfWidth, y: dimensions.top + halfHeight }
+            //originalDimensions: dimensions,
+            //transformShift: { x: matrix[4], y: matrix[5] }
+        }
+    }
+
+
+
+    $ax.public.fn.inversePathLengthFunction = function (pathFunction) {
+        // these are for computing the inverse functions of path integrals.
+
+        var makeDivisionNode = function(node1, node2) {
+            var param = 0.5 * (node1.Param + node2.Param);
+            var inBetweenNode = {
+                LowerStop: node1,
+                HigherStop: node2,
+                Param: param,
+                Position: pathFunction(param),
+                Cumulative: 0.0
+            };
+            var lowerDisplacement = $ax.public.fn.vectorMinus(node1.Position, inBetweenNode.Position);
+            inBetweenNode.LowerInterval = {
+                Length: $ax.public.fn.l2(lowerDisplacement.x, lowerDisplacement.y),
+                Node: inBetweenNode,
+                IsHigher: false
+            };
+            var higherDisplacement = $ax.public.fn.vectorMinus(node2.Position, inBetweenNode.Position);
+            inBetweenNode.HigherInterval = {
+                Length: $ax.public.fn.l2(higherDisplacement.x, higherDisplacement.y),
+                Node: inBetweenNode,
+                IsHigher: true
+            };
+            return inBetweenNode;
+        };
+
+        var expandLower = function(node) {
+            node.LowerChild = makeDivisionNode(node.LowerStop, node);
+            node.LowerChild.Parent = node;
+        };
+
+        var expandHigher = function(node) {
+            node.HigherChild = makeDivisionNode(node, node.HigherStop);
+            node.HigherChild.Parent = node;
+        };
+
+        // for this function, cumulative is a global variable
+        var cumulative = 0.0;
+        var labelCumulativeLength = function(node) {
+            if(!node.LowerChild) {
+                node.LowerStop.Cumulative = cumulative;
+                cumulative += node.LowerInterval.Length;
+                node.Cumulative = cumulative;
+            } else labelCumulativeLength(node.LowerChild);
+
+            if(!node.HigherChild) {
+                node.Cumulative = cumulative;
+                cumulative += node.HigherInterval.Length;
+                node.HigherStop.Cumulative = cumulative;
+            } else labelCumulativeLength(node.HigherChild);
+        };
+
+        var getIntervalFromPathLength = function(node, length) {
+            if(length < node.Cumulative) {
+                return node.LowerChild ? getIntervalFromPathLength(node.LowerChild, length) : node.LowerInterval;
+            } else return node.HigherChild ? getIntervalFromPathLength(node.HigherChild, length) : node.HigherInterval;
+        };
+
+        var intervalLowerEnd = function(interval) {
+            return interval.IsHigher ? interval.Node : interval.Node.LowerStop;
+        };
+
+        var intervalHigherEnd = function(interval) {
+            return interval.IsHigher ? interval.Node.HigherStop : interval.Node;
+        };
+
+        var getParameterFromPathLength = function (node, length) {
+            var interval = getIntervalFromPathLength(node, length);
+            var lowerNode = intervalLowerEnd(interval);
+            var higherNode = intervalHigherEnd(interval);
+            return lowerNode.Param + (higherNode.Param - lowerNode.Param) * (length - lowerNode.Cumulative) / (higherNode.Cumulative - lowerNode.Cumulative);
+        };
+
+        var insertIntoSortedList = function (longer, shorter, toInsert) {
+            while (true) {
+                if (!longer) {
+                    longer = shorter;
+                    shorter = shorter.NextLongest;
+                    continue;
+                } else if (!shorter) longer.NextLongest = toInsert;
+                else {
+                    if (longer.Length >= toInsert.Length && shorter.Length <= toInsert.Length) {
+                        longer.NextLongest = toInsert;
+                        toInsert.NextLongest = shorter;
+                    } else {
+                        longer = shorter;
+                        shorter = shorter.NextLongest;
+                        continue;
+                    }
+                }
+                break;
+            }
+        }
+        var head = {Param: 0.0, Position: pathFunction(0.0) };
+        var tail = { Param: 1.0, Position: pathFunction(1.0) };
+        var root = makeDivisionNode(head, tail);
+        var currentCurveLength = root.LowerInterval.Length + root.HigherInterval.Length;
+        var longestInterval;
+        if (root.LowerInterval.Length < root.HigherInterval.Length) {
+            longestInterval = root.HigherInterval;
+            longestInterval.NextLongest = root.LowerInterval;
+        } else {
+            longestInterval = root.LowerInterval;
+            longestInterval.NextLongest = root.HigherInterval;
+        }
+        while (longestInterval.Length * 100.0 > currentCurveLength) {
+            var newNode;
+            if (longestInterval.IsHigher) {
+                expandHigher(longestInterval.Node);
+                newNode = longestInterval.Node.HigherChild;
+            } else {
+                expandLower(longestInterval.Node);
+                newNode = longestInterval.Node.LowerChild;
+            }
+            currentCurveLength += (newNode.LowerInterval.Length + newNode.HigherInterval.Length - longestInterval.Length);
+            insertIntoSortedList(null, longestInterval, newNode.LowerInterval);
+            insertIntoSortedList(null, longestInterval, newNode.HigherInterval);
+            longestInterval = longestInterval.NextLongest;
+        }
+        labelCumulativeLength(root);
+
+        return function(lengthParam) {
+            return getParameterFromPathLength(root, lengthParam * cumulative);
+        };
+    }
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/model.js b/src_old/resources/scripts/axure/model.js
new file mode 100644
index 0000000..ffc0a10
--- /dev/null
+++ b/src_old/resources/scripts/axure/model.js
@@ -0,0 +1,53 @@
+// ******* Object Model ******** //
+$axure.internal(function($ax) {
+    var _implementations = {};
+
+    var _initializeObject = function(type, obj) {
+        $.extend(obj, _implementations[type]);
+    };
+    $ax.initializeObject = _initializeObject;
+
+    var _model = $ax.model = {};
+
+    _model.idsInRdoToHideOrLimbo = function(rdoId, scriptIds) {
+        var rdoScriptId = $ax.repeater.getScriptIdFromElementId(rdoId);
+        var path = $ax.getPathFromScriptId(rdoScriptId);
+        
+        if(!scriptIds) scriptIds = [];
+
+        var rdo = $ax.getObjectFromElementId(rdoId);
+        var master = $ax.pageData.masters[rdo.masterId];
+        var masterChildren = master.diagram.objects;
+        for(var i = 0; i < masterChildren.length; i++) {
+            var obj = masterChildren[i];
+            var objScriptIds = obj.scriptIds;
+            for(var j = 0; j < objScriptIds.length; j++) {
+                var scriptId = objScriptIds[j];
+                // Anything in a layer is already handled by the layer
+                if($ax.getLayerParentFromElementId(scriptId)) continue;
+
+                // Make sure in same rdo
+                var elementPath = $ax.getPathFromScriptId(scriptId);
+
+                // This is because last part of path is for the obj itself.
+                elementPath.pop();
+                if(elementPath.length != path.length) continue;
+                var samePath = true;
+                for(var k = 0; k < path.length; k++) {
+                    if(elementPath[k] != path[k]) {
+                        samePath = false;
+                        break;
+                    }
+                }
+                if(!samePath) continue;
+
+                if($ax.public.fn.IsReferenceDiagramObject(obj.type)) _model.idsInRdoToHideOrLimbo(scriptId, scriptIds);
+                else if(scriptIds.indexOf(scriptId) == -1) scriptIds.push(scriptId);
+
+                break;
+            }
+        }
+        return scriptIds;
+    };
+
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/move.js b/src_old/resources/scripts/axure/move.js
new file mode 100644
index 0000000..7ad7f25
--- /dev/null
+++ b/src_old/resources/scripts/axure/move.js
@@ -0,0 +1,467 @@
+$axure.internal(function($ax) {
+    var _move = {};
+    $ax.move = _move;
+
+    var widgetMoveInfo = {};
+    //user and return move info, also create container for rootlayer if needed
+    $ax.move.PrepareForMove = function (id, x, y, to, options, jobj, rootLayer, skipContainerForRootLayer) {
+        var fixedInfo = jobj ? {} : $ax.dynamicPanelManager.getFixedInfo(id);
+
+        var widget = $jobj(id);
+        var query = $ax('#' + id);
+        var isLayer = $ax.getTypeFromElementId(id) == $ax.constants.LAYER_TYPE;
+        if(!rootLayer) {
+            rootLayer = _move.getRootLayer(id);
+            if (rootLayer && !skipContainerForRootLayer) {
+                $ax.visibility.pushContainer(rootLayer, false);
+                if (isLayer) widget = $ax.visibility.applyWidgetContainer(id, true);
+            }
+        }
+        if (!jobj) jobj = widget;
+
+        var horzProp = 'left';
+        var vertProp = 'top';
+        var offsetLocation = to ? query.offsetLocation() : undefined;
+        var horzX = to ? x - offsetLocation.x : x;
+        var vertY = to ? y - offsetLocation.y : y;
+        //var horzX = to ? x - query.locRelativeIgnoreLayer(false) : x;
+        //var vertY = to ? y - query.locRelativeIgnoreLayer(true) : y;
+
+        if (fixedInfo.horizontal == 'right') {
+            horzProp = 'right';
+            horzX = to ? $(window).width() - x - $ax.getNumFromPx(jobj.css('right')) - query.width() : -x;
+            var leftChanges = -horzX;
+        } else if(fixedInfo.horizontal == 'center') {
+            horzProp = 'margin-left';
+            if (to) horzX = x - $(window).width() / 2;
+        }
+
+        if (fixedInfo.vertical == 'bottom') {
+            vertProp = 'bottom';
+            vertY = to ? $(window).height() - y - $ax.getNumFromPx(jobj.css('bottom')) - query.height() : -y;
+            var topChanges = -vertY;
+        } else if (fixedInfo.vertical == 'middle') {
+            vertProp = 'margin-top';
+            if (to) vertY = y - $(window).height() / 2;
+        }
+
+        //todo currently this always save the info, which is not needed for compound vector children and maybe some other cases
+        //let's optimize it later, only user if registerid is valid..
+        widgetMoveInfo[id] = {
+            x: leftChanges === undefined ? horzX : leftChanges,
+            y: topChanges === undefined ? vertY : topChanges,
+            options: options
+        };
+
+        return {
+            horzX: horzX,
+            vertY: vertY,
+            horzProp: horzProp,
+            vertProp: vertProp,
+            rootLayer: rootLayer,
+            jobj: jobj
+        };
+    };
+    $ax.move.GetWidgetMoveInfo = function() {
+        return $.extend({}, widgetMoveInfo);
+    };
+
+    _move.getRootLayer = function (id) {
+        var isLayer = $ax.getTypeFromElementId(id) == $ax.constants.LAYER_TYPE;
+        var rootLayer = isLayer ? id : '';
+
+        var parentIds = $ax('#' + id).getParents(true, '*')[0];
+        for(var i = 0; i < parentIds.length; i++) {
+            var parentId = parentIds[i];
+            // Keep climbing up layers until you hit a non-layer. At that point you have your root layer
+            if($ax.public.fn.IsLayer($ax.getTypeFromElementId(parentId))) rootLayer = parentId;
+            else break;
+        }
+
+        return rootLayer;
+    };
+
+    $ax.move.MoveWidget = function (id, x, y, options, to, animationCompleteCallback, shouldFire, jobj, skipOnMoveEvent) {
+        var moveInfo = $ax.move.PrepareForMove(id, x, y, to, options, jobj);
+        $ax.drag.LogMovedWidgetForDrag(id, options.dragInfo);
+
+        var object = $obj(id);
+        if(object && $ax.public.fn.IsLayer(object.type)) {
+            var childrenIds = $ax.public.fn.getLayerChildrenDeep(id, true);
+            //don't push container when user moveinfo for child
+            if(!skipOnMoveEvent) {
+                for(var i = 0; i < childrenIds.length; i++) $ax.move.PrepareForMove(childrenIds[i], x, y, to, options, null, moveInfo.rootLayer, true);
+            }
+        }
+
+        //if(!moveInfo) moveInfo = _getMoveInfo(id, x, y, to, options, jobj);
+
+        jobj = moveInfo.jobj;
+
+        _moveElement(id, options, animationCompleteCallback, shouldFire, jobj, moveInfo);
+
+        if(skipOnMoveEvent) return;
+        $ax.event.raiseSyntheticEvent(id, "onMove");
+        if(childrenIds) {
+            for(var i = 0; i < childrenIds.length; i++) $ax.event.raiseSyntheticEvent(childrenIds[i], 'onMove');
+        }
+    };
+
+    var _moveElement = function (id, options, animationCompleteCallback, shouldFire,  jobj, moveInfo){
+        var cssStyles = {};
+
+        if(!$ax.dynamicPanelManager.isPercentWidthPanel($obj(id))) cssStyles[moveInfo.horzProp] = '+=' + moveInfo.horzX;
+        cssStyles[moveInfo.vertProp] = '+=' + moveInfo.vertY;
+        
+        $ax.visibility.moveMovedLocation(id, moveInfo.horzX, moveInfo.vertY);
+
+        // I don't think root layer is necessary anymore after changes to layer container structure.
+        //  Wait to try removing it until more stable.
+        var rootLayer = moveInfo.rootLayer;
+
+        var query = $addAll(jobj, id);
+        var completeCount = query.length;
+        var completeAnimation = function() {
+            completeCount--;
+            if(completeCount == 0 && rootLayer) $ax.visibility.popContainer(rootLayer, false);
+            if(animationCompleteCallback) animationCompleteCallback();
+            if(shouldFire) $ax.action.fireAnimationFromQueue(id, $ax.action.queueTypes.move);
+        };
+        if (options.easing === 'none') {
+            //if not having this requestAnimationFrame causes performance issues,
+            //add it back and move the above call to moveMovedLocation into it and the
+            //query.animate calls below
+            //window.requestAnimationFrame(function () {
+                query.css(cssStyles);
+                if (rootLayer) $ax.visibility.popContainer(rootLayer, false);
+                if (animationCompleteCallback) animationCompleteCallback();
+            //});
+            //if this widget is inside a layer, we should just remove the layer from the queue
+            if(shouldFire) $ax.action.fireAnimationFromQueue(id, $ax.action.queueTypes.move);
+        } else if (options.trajectory === 'straight' || moveInfo.horzX === 0 || moveInfo.vertY === 0) {
+                query.animate(cssStyles, {
+                    duration: options.duration, easing: options.easing, queue: false, complete: completeAnimation});
+        } else {
+            var initialHorzProp = $ax.getNumFromPx(query.css(moveInfo.horzProp));
+            var initialVertProp = $ax.getNumFromPx(query.css(moveInfo.vertProp));
+            var state = { parameter: 0 };
+            var ellipseArcFunctionY = function(param) {
+                return {
+                    x: initialHorzProp + (1.0 - Math.cos(param * Math.PI * 0.5)) * moveInfo.horzX,
+                    y: initialVertProp + Math.sin(param * Math.PI * 0.5) * moveInfo.vertY
+                };
+            };
+            var ellipseArcFunctionX = function (param) {
+                return {
+                    x: initialHorzProp + Math.sin(param * Math.PI * 0.5) * moveInfo.horzX,
+                    y: initialVertProp + (1.0 - Math.cos(param * Math.PI * 0.5)) * moveInfo.vertY
+                };
+            };
+            var ellipseArcFunction = (moveInfo.horzX > 0) ^ (moveInfo.vertY > 0) ^ options.trajectory === 'arcClockwise'
+                    ? ellipseArcFunctionX : ellipseArcFunctionY;
+            var inverseFunction = $ax.public.fn.inversePathLengthFunction(ellipseArcFunction);
+            $(state).animate({ parameter: 1.0 }, {
+                duration: options.duration, easing: options.easing, queue: false,
+                step: function (now) {
+                    var newPos = ellipseArcFunction(inverseFunction(now));
+                    var changeFields = {};
+                    changeFields[moveInfo.horzProp] = newPos.x;
+                    changeFields[moveInfo.vertProp] = newPos.y;
+                    query.css(changeFields);
+                },
+                complete: completeAnimation});
+        }
+
+        //        //moveinfo is used for moving 'with this'
+        //        var moveInfo = new Object();
+        //        moveInfo.x = horzX;
+        //        moveInfo.y = vertY;
+        //        moveInfo.options = options;
+        //        widgetMoveInfo[id] = moveInfo;
+
+
+    };
+
+    _move.nopMove = function(id, options) {
+        var moveInfo = new Object();
+        moveInfo.x = 0;
+        moveInfo.y = 0;
+        moveInfo.options = {};
+        moveInfo.options.easing = 'none';
+        moveInfo.options.duration = 0;
+        widgetMoveInfo[id] = moveInfo;
+
+        // Layer move using container now.
+        var obj = $obj(id);
+        if($ax.public.fn.IsLayer(obj.type)) if(options.onComplete) options.onComplete();
+
+        $ax.event.raiseSyntheticEvent(id, "onMove");
+    };
+
+    //rotationDegree: total degree to rotate
+    //centerPoint: the center of the circular path
+
+
+    var _noRotateOnlyMove = function (id, moveDelta, rotatableMove, fireAnimationQueue, easing, duration, completionCallback) {
+        moveDelta.x += rotatableMove.x;
+        moveDelta.y += rotatableMove.y;
+        if (moveDelta.x == 0 && moveDelta.y == 0) {
+            if(fireAnimationQueue) {
+                $ax.action.fireAnimationFromQueue(id, $ax.action.queueTypes.rotate);
+                $ax.action.fireAnimationFromQueue(id, $ax.action.queueTypes.move);
+            }
+            if (completionCallback) completionCallback();
+        } else {
+            $jobj(id).animate({ top: '+=' + moveDelta.y, left: '+=' + moveDelta.x }, {
+                duration: duration,
+                easing: easing,
+                queue: false,
+                complete: function () {
+                    if(fireAnimationQueue) {
+                        $ax.action.fireAnimationFromQueue(id, $ax.action.queueTypes.move);
+                        $ax.action.fireAnimationFromQueue(id, $ax.action.queueTypes.rotate);
+                    }
+                    if (completionCallback) completionCallback();
+                }
+            });
+        }
+    }
+
+
+    _move.circularMove = function (id, degreeDelta, centerPoint, moveDelta, rotatableMove, resizeOffset, options, fireAnimationQueue, completionCallback, willDoRotation) {
+        var elem = $jobj(id);
+        if(!willDoRotation) elem = $addAll(elem, id);
+
+        var moveInfo = $ax.move.PrepareForMove(id, moveDelta.x, moveDelta.y, false, options);
+        // If not rotating, still need to check moveDelta and may need to handle that.
+        if (degreeDelta === 0) {
+            _noRotateOnlyMove(id, moveDelta, rotatableMove, fireAnimationQueue, options.easing, options.duration, completionCallback);
+            return;
+        }
+
+        var stepFunc = function(newDegree) {
+            var deg = newDegree - rotation.degree;
+            var widgetCenter = $ax('#' + id).offsetBoundingRect().centerPoint;
+            //var widgetCenter = $ax.public.fn.getWidgetBoundingRect(id).centerPoint;
+            //console.log("widget center of " + id + " x " + widgetCenter.x + " y " + widgetCenter.y);
+            var widgetNewCenter = $axure.fn.getPointAfterRotate(deg, widgetCenter, centerPoint);
+
+            // Start by getting the move not related to rotation, and make sure to update center point to move with it.
+            var ratio = deg / degreeDelta;
+
+            var xdelta = (moveDelta.x + rotatableMove.x) * ratio;
+            var ydelta = (moveDelta.y + rotatableMove.y) * ratio;
+            if(resizeOffset) {
+                var resizeShift = {};
+                resizeShift.x = resizeOffset.x * ratio;
+                resizeShift.y = resizeOffset.y * ratio;
+                $axure.fn.getPointAfterRotate(rotation.degree, resizeShift, { x: 0, y: 0 });
+                xdelta += resizeShift.x;
+                ydelta += resizeShift.y;
+            }
+            centerPoint.x += xdelta;
+            centerPoint.y += ydelta;
+
+            // Now for the move that is rotatable, it must be rotated
+            rotatableMove = $axure.fn.getPointAfterRotate(deg, rotatableMove, { x: 0, y: 0 });
+
+            // Now add in circular move to the mix.
+            xdelta += widgetNewCenter.x - widgetCenter.x;
+            ydelta += widgetNewCenter.y - widgetCenter.y;
+
+            $ax.visibility.moveMovedLocation(id, xdelta, ydelta);
+
+            if(xdelta < 0) elem.css('left', '-=' + -xdelta);
+            else if(xdelta > 0) elem.css('left', '+=' + xdelta);
+
+            if(ydelta < 0) elem.css('top', '-=' + -ydelta);
+            else if(ydelta > 0) elem.css('top', '+=' + ydelta);
+        };
+
+        var onComplete = function() {
+            if(fireAnimationQueue) $ax.action.fireAnimationFromQueue(id, $ax.action.queueTypes.move);
+            if(completionCallback) completionCallback();
+            if(moveInfo.rootLayer) $ax.visibility.popContainer(moveInfo.rootLayer, false);
+            var isPercentWidthPanel = $ax.dynamicPanelManager.isPercentWidthPanel($obj(id));
+            if(isPercentWidthPanel) {
+                $ax.dynamicPanelManager.updatePanelPercentWidth(id);
+                $ax.dynamicPanelManager.updatePanelContentPercentWidth(id);
+            }
+            if(elem.css('position') == 'fixed') {
+                if(!isPercentWidthPanel) elem.css('left', '');
+                elem.css('top', '');
+            }
+        };
+
+        var rotation = { degree: 0 };
+
+        if(!options.easing || options.easing === 'none' || options.duration <= 0) {
+            stepFunc(degreeDelta);
+            onComplete();
+        } else {
+            $(rotation).animate({ degree: degreeDelta }, {
+                duration: options.duration,
+                easing: options.easing,
+                queue: false,
+                step: stepFunc,
+                complete: onComplete
+            });
+        }
+    };
+
+    //rotate a widget by degree, center is 50% 50%
+    _move.rotate = function (id, degree, easing, duration, to, shouldFire, completionCallback) {
+        var currentDegree = _move.getRotationDegree(id);
+        if(to) degree = degree - currentDegree;
+
+        if(degree === 0) {
+            if (shouldFire) $ax.action.fireAnimationFromQueue(id, $ax.action.queueTypes.rotate);
+            return;
+        }
+
+        var query = $jobj(id);
+        var stepFunc = function(now) {
+            var degreeDelta = now - rotation.degree;
+            var newDegree = currentDegree + degreeDelta;
+            query.css($ax.public.fn.setTransformHowever("rotate(" + newDegree + "deg)"));
+            currentDegree = newDegree;
+        };
+
+        var onComplete = function() {
+            if(shouldFire) {
+                $ax.action.fireAnimationFromQueue($ax.public.fn.compoundIdFromComponent(id), $ax.action.queueTypes.rotate);
+            }
+            if(completionCallback) completionCallback();
+
+            $ax.annotation.adjustIconLocation(id);
+        };
+
+        var rotation = { degree: 0 };
+
+        $ax.visibility.setRotatedAngle(id, currentDegree + degree);
+        
+        //if no animation, setting duration to 1, to prevent RangeError in rotation loops without animation
+        if(!easing || easing === 'none' || duration <= 0) {
+            stepFunc(degree);
+            onComplete();
+        } else {
+            $(rotation).animate({ degree: degree }, {
+                duration: duration,
+                easing: easing,
+                queue: false,
+                step: stepFunc,
+                complete: onComplete
+            });
+        }
+    };
+
+    _move.compoundRotateAround = function (id, degreeDelta, centerPoint, moveDelta, rotatableMove, resizeOffset, easing, duration, fireAnimationQueue, completionCallback) {
+        if (degreeDelta === 0) {
+            _noRotateOnlyMove($ax.public.fn.compoundIdFromComponent(id), moveDelta, rotatableMove, fireAnimationQueue, easing, duration, completionCallback, $ax.action.queueTypes.rotate);
+            return;
+        }
+        var elem = $jobj(id);
+        var rotation = { degree: 0 };
+
+        if (!easing || easing === 'none' || duration <= 0) {
+            duration = 1;
+            easing = 'linear'; //it doesn't matter anymore here...
+        }
+
+        var originalWidth = $ax.getNumFromPx(elem.css('width'));
+        var originalHeight = $ax.getNumFromPx(elem.css('height'));
+        var originalLeft = $ax.getNumFromPx(elem.css('left'));
+        var originalTop = $ax.getNumFromPx(elem.css('top'));
+
+        $(rotation).animate({ degree: degreeDelta }, {
+            duration: duration,
+            easing: easing,
+            queue: false,
+            step: function (newDegree) {
+                var transform = $ax.public.fn.transformFromElement(elem[0]);
+                var originalCenter = { x: originalLeft + 0.5 * originalWidth, y: originalTop + 0.5 * originalHeight};
+                var componentCenter = { x: originalCenter.x + transform[4], y: originalCenter.y + transform[5] };
+                var deg = newDegree - rotation.degree;
+                var ratio = deg / degreeDelta;
+                var xdelta = (moveDelta.x + rotatableMove.x) * ratio;
+                var ydelta = (moveDelta.y + rotatableMove.y) * ratio;
+                if (resizeOffset) {
+                    var resizeShift = {};
+                    resizeShift.x = resizeOffset.x * ratio;
+                    resizeShift.y = resizeOffset.y * ratio;
+                    $axure.fn.getPointAfterRotate(rotation.degree, resizeShift, { x: 0, y: 0 });
+                    xdelta += resizeShift.x;
+                    ydelta += resizeShift.y;
+                }
+
+                var rotationMatrix = $ax.public.fn.rotationMatrix(deg);
+                var compositionTransform = $ax.public.fn.matrixMultiplyMatrix(rotationMatrix,
+                    { m11: transform[0], m21: transform[1], m12: transform[2], m22: transform[3] });
+
+                //console.log("widget center of " + id + " x " + widgetCenter.x + " y " + widgetCenter.y);
+                var widgetNewCenter = $axure.fn.getPointAfterRotate(deg, componentCenter, centerPoint);
+                var newMatrix = $ax.public.fn.matrixString(compositionTransform.m11, compositionTransform.m21, compositionTransform.m12, compositionTransform.m22,
+                    widgetNewCenter.x - originalCenter.x + xdelta, widgetNewCenter.y - originalCenter.y + ydelta);
+                elem.css($ax.public.fn.setTransformHowever(newMatrix));
+            },
+            complete: function () {
+                if (fireAnimationQueue) {
+                    $ax.action.fireAnimationFromQueue(elem.parent()[0].id, $ax.action.queueTypes.rotate);
+                }
+
+                if(completionCallback) completionCallback();
+            }
+        });
+    };
+
+    _move.getRotationDegreeFromElement = function(element) {
+        if(element == null) return NaN;
+
+        var transformString = element.style['transform'] ||
+            element.style['-o-transform'] ||
+            element.style['-ms-transform'] ||
+            element.style['-moz-transform'] ||
+            element.style['-webkit-transform'];
+
+        if(transformString) {
+            var rotateRegex = /rotate\(([-?0-9]+)deg\)/;
+            var degreeMatch = rotateRegex.exec(transformString);
+            if(degreeMatch && degreeMatch[1]) return parseFloat(degreeMatch[1]);
+        }
+
+        if(window.getComputedStyle) {
+            var st = window.getComputedStyle(element, null);
+        } else {
+            console.log('rotation is not supported for ie 8 and below in this version of axure rp');
+            return 0;
+        }
+
+        var tr = st.getPropertyValue("transform") ||
+            st.getPropertyValue("-o-transform") ||
+            st.getPropertyValue("-ms-transform") ||
+            st.getPropertyValue("-moz-transform") ||
+            st.getPropertyValue("-webkit-transform");
+
+        if(!tr || tr === 'none') return 0;
+        var values = tr.split('(')[1];
+        values = values.split(')')[0],
+        values = values.split(',');
+
+        var a = values[0];
+        var b = values[1];
+
+        var radians = Math.atan2(b, a);
+        if(radians < 0) {
+            radians += (2 * Math.PI);
+        }
+
+        return radians * (180 / Math.PI);
+    };
+
+    _move.getRotationDegree = function(elementId) {
+        if($ax.public.fn.IsLayer($obj(elementId).type)) {
+            return $jobj(elementId).data('layerDegree');
+        }
+        return _move.getRotationDegreeFromElement(document.getElementById(elementId));
+    }
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/recording.js b/src_old/resources/scripts/axure/recording.js
new file mode 100644
index 0000000..f5fb140
--- /dev/null
+++ b/src_old/resources/scripts/axure/recording.js
@@ -0,0 +1,94 @@
+// ******* Recording MANAGER ******** //
+
+$axure.internal(function($ax) {
+    var _recording = $ax.recording = {};
+
+    $ax.recording.recordEvent = function(element, eventInfo, axEventObject, timeStamp) {
+
+        var elementHtml = $jobj(element);
+        var className = elementHtml.attr('class');
+        var inputValue;
+
+        if(className === 'ax_checkbox') {
+            inputValue = elementHtml.find('#' + element + '_input')[0].checked;
+            eventInfo.inputType = className;
+            eventInfo.inputValue = inputValue;
+        }
+
+        if(className === 'ax_text_field') {
+            inputValue = elementHtml.find('#' + element + '_input').val();
+            eventInfo.inputType = className;
+            eventInfo.inputValue = inputValue;
+        }
+
+
+        var scriptId = $ax.repeater.getScriptIdFromElementId(element);
+        var diagramObjectPath = $ax.getPathFromScriptId(scriptId);
+        var form = {
+            recordingId: $ax.recording.recordingId,
+            elementID: element,
+            eventType: axEventObject.description,
+            'eventInfo': eventInfo,
+            //            eventObject: axEventObject,
+            'timeStamp': timeStamp,
+            'path': diagramObjectPath
+//            ,
+//            'trigger': function() {
+//                $ax.event.handleEvent(element, eventInfo, axEventObject);
+//                return false;
+//            }
+        };
+
+        $ax.messageCenter.postMessage('logEvent', form);
+    };
+
+
+    $ax.recording.maybeRecordEvent = function(element, eventInfo, axEventObject, timeStamp) {
+    };
+
+
+    $ax.recording.recordingId = "";
+    $ax.recording.recordingName = "";
+
+    $ax.messageCenter.addMessageListener(function(message, data) {
+        if(message === 'startRecording') {
+            $ax.recording.maybeRecordEvent = $ax.recording.recordEvent;
+            $ax.recording.recordingId = data.recordingId;
+            $ax.recording.recordingName = data.recordingName;
+        } else if(message === 'stopRecording') {
+            $ax.recording.maybeRecordEvent = function(element, eventInfo, axEventObject, timeStamp) {
+            };
+
+        }
+        else if(message === 'playEvent') {
+
+            var eventType = makeFirstLetterLower(data.eventType);
+            var inputElement;
+
+            var dObj = data.element === '' ? $ax.pageData.page : $ax.getObjectFromElementId(data.element);
+            if(!data.axEventObject) {
+                data.axEventObject = dObj && dObj.interactionMap && dObj.interactionMap[eventType];
+            }
+
+            data.eventInfo.thiswidget = $ax.getWidgetInfo(data.element);
+            data.eventInfo.item = $ax.getItemInfo(data.element);
+
+            if(data.eventInfo.inputType && data.eventInfo.inputType === 'ax_checkbox') {
+                inputElement = $jobj(data.element + '_input');
+                inputElement[0].checked = data.eventInfo.inputValue;
+            }
+
+            if(data.eventInfo.inputType && data.eventInfo.inputType === 'ax_text_field') {
+                inputElement = $jobj(data.element + '_input');
+                inputElement.val(data.eventInfo.inputValue);
+            }
+
+            $ax.event.handleEvent(data.element, data.eventInfo, data.axEventObject, false, true);
+        }
+    });
+
+    var makeFirstLetterLower = function(eventName) {
+        return eventName.substr(0, 1).toLowerCase() + eventName.substr(1);
+    };
+
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/repeater.js b/src_old/resources/scripts/axure/repeater.js
new file mode 100644
index 0000000..013fad9
--- /dev/null
+++ b/src_old/resources/scripts/axure/repeater.js
@@ -0,0 +1,2355 @@
+
+// ******* Repeater MANAGER ******** //
+$axure.internal(function($ax) {
+    var _repeaterManager = {};
+    $ax.repeater = _repeaterManager;
+
+    var _refreshType = _repeaterManager.refreshType = {
+        reset: 1,
+        persist: 2,
+        preEval: 3
+    };
+
+    //This is a mapping of current editItems
+    var repeaterToEditItems = {};
+    //This is a mapping of current filters
+    var repeaterToFilters = {};
+    // This is a mapping of current sorts
+    var repeaterToSorts = {};
+    // This is a mapping of repeater page info
+    var repeaterToPageInfo = {};
+
+    //Hopefully this can be simplified, but for now I think 3 are needed.
+    //This is the data set that is owned by this repeater. The repeater may or may not reference this data set, and others can reference it.
+    var repeaterToLocalDataSet = {};
+    //This is the data set referenced by the repeater. It is not a copy of the local data set, but a reference to a local data set (or eventually a global data set could be referenced).
+    var repeaterToCurrentDataSet = {};
+    //This is a copy of the current data set, that is replaced whenever a set or refresh is done.
+    var repeaterToActiveDataSet = {};
+    var _loadRepeaters = function() {
+        $ax(function(obj) { 
+            return $ax.public.fn.IsRepeater(obj.type);
+        }).each(function(obj, repeaterId) {
+            repeaterToLocalDataSet[repeaterId] = $ax.deepCopy(obj.data);
+            repeaterToLocalDataSet[repeaterId].props = obj.dataProps;
+            repeaterToEditItems[repeaterId] = [];
+
+            _initPageInfo(obj, repeaterId);
+
+            _setRepeaterDataSet(repeaterId, repeaterId);
+            var initialItemIds = obj.repeaterPropMap.itemIds;
+            for (var i = 0; i < initialItemIds.length; i++) $ax.addItemIdToRepeater(initialItemIds[i], repeaterId);
+            $ax.visibility.initRepeater(repeaterId);
+        });
+    };
+    _repeaterManager.loadRepeaters = _loadRepeaters;
+
+    var fullRefresh = {};
+    var repeatersReady = false;
+    var _initRepeaters = function () {
+        repeatersReady = true;
+        $ax(function(obj, repeaterId) {
+            return $ax.public.fn.IsRepeater(obj.type);
+        }).each(function(obj, repeaterId) {
+            _refreshRepeater(repeaterId, undefined, _refreshType.reset, !fullRefresh[repeaterId]);
+            //// Fix selected and default if necessary
+            //var states = obj.evaluatedStates[repeaterId];
+            //if(!states) return; // If there are no evaluated states the repeater id key could not be mapped to an array of states.
+
+            //for(var i = 0; i < states.length; i++) {
+            //    var state = states[i];
+
+            //    $ax.style.SetWidgetEnabled(state.id, true); // So selected will take place. If disabled, selected wouldn't happen.
+            //    $ax.style.SetWidgetSelected(state.id, state.selected);
+            //    $ax.style.SetWidgetEnabled(state.id, !state.disabled);
+            //}
+        });
+    };
+    _repeaterManager.initRefresh = _initRepeaters;
+
+    var repeatersHaveNewDataSet = [];
+    var _setRepeaterDataSet = function(repeaterId, dataSetId) {
+        //TODO: No idea about how global data sets will be handled...
+        repeaterToCurrentDataSet[repeaterId] = repeaterToLocalDataSet[dataSetId];
+        repeaterToActiveDataSet[repeaterId] = getActiveDataSet(repeaterId);
+        repeaterToFilters[repeaterId] = [];
+        repeaterToSorts[repeaterId] = [];
+
+
+        // Not using this currently
+        //        if(repeatersHaveNewDataSet.indexOf(repeaterId) == -1) repeatersHaveNewDataSet[repeatersHaveNewDataSet.length] = repeaterId;
+    };
+    _repeaterManager.setDataSet = _setRepeaterDataSet;
+
+    var _refreshRepeater = function(repeaterId, eventInfo, refreshType, itemsPregen) {
+        if(!refreshType) refreshType = _refreshType.reset; // Set default
+        if(!repeatersReady) {
+            fullRefresh[repeaterId] = true;
+            return;
+        }
+
+        // Reset selected/disabled dictionaries upon reset, if necessary (reset must, persist can't, and preeval doesn't care because it hasn't been set up yet.
+        if(refreshType == _refreshType.reset) $ax.style.clearStateForRepeater(repeaterId);
+
+        // Don't show if you have a parent rdos thats limboed.
+        var rdoPath = $ax.getPathFromScriptId(repeaterId);
+        // Check each parent rdo through appropriate views to see if you are limboed
+        while (rdoPath.length > 0) {
+            if(!$ax.getScriptIdFromPath(rdoPath)) {
+                removeItems(repeaterId);
+                return;
+            }
+
+            $ax.splice(rdoPath, rdoPath.length - 1, 1);
+        }
+        
+        $ax.action.refreshStart(repeaterId);
+        $ax.style.ClearCacheForRepeater(repeaterId);
+
+        if($ax.visibility.limboIds[repeaterId]) {
+            removeItems(repeaterId);
+            $ax.dynamicPanelManager.fitParentPanel(repeaterId);
+            return;
+        }
+
+        // Remove delete map if there is one at this point
+        if(eventInfo && eventInfo.repeaterDeleteMap) delete eventInfo.repeaterDeleteMap[repeaterId];
+        var path = $ax.getPathFromScriptId(repeaterId);
+        path.pop();
+
+        if(eventInfo) {
+            eventInfo = $ax.eventCopy(eventInfo);
+        }
+
+        var obj = $ax.getObjectFromScriptId(repeaterId);
+        var propMap = obj.repeaterPropMap;
+
+        //If there is no wrap, then set it to be above the number of rows
+        var viewId = $ax.adaptive.currentViewId || '';
+        var wrap = _getAdaptiveProp(propMap, 'wrap', viewId, repeaterId, obj);
+        var vertical = _getAdaptiveProp(propMap, 'vertical', viewId, repeaterId, obj);
+        //var offset = propMap[viewId];
+        var offset = propMap[_getViewIdFromPageViewId(viewId, repeaterId, obj)];
+
+        // Right now pregen only works for default adaptive view
+        if(viewId) itemsPregen = false;
+        var orderedIds = [];
+        if(itemsPregen) {
+            var repeaterChildren = $jobj(repeaterId).children();
+            // Start at 1 to skip script div child
+            for(var i = 1; i < repeaterChildren.length; i++) {
+                orderedIds.push(_getItemIdFromElementId($(repeaterChildren[i]).attr('id')));
+            }
+        } else orderedIds = getOrderedIds(repeaterId, eventInfo);
+        var ids = [];
+        var background = _getAdaptiveProp(propMap, 'backColor', viewId, repeaterId, obj);
+        var hasAltColor = _getAdaptiveProp(propMap, 'hasAltColor', viewId, repeaterId, obj);
+        var altColor = hasAltColor ? _getAdaptiveProp(propMap, 'altColor', viewId, repeaterId, obj) : undefined;
+        var useAlt = false;
+
+        if(itemsPregen) {
+            var start = 0;
+            var end = orderedIds.length;
+        } else {
+            var bounds = _getVisibleDataBounds(repeaterToPageInfo[repeaterId], itemsPregen ? obj.data.length : orderedIds.length);
+            start = bounds[0];
+            end = bounds[1];
+        }
+
+        var repeaterObj = $jobj(repeaterId);
+        var preevalMap = {};
+
+        var shownCount = end - start;
+        var primaryCount = wrap == -1 ? shownCount : Math.min(shownCount, wrap);
+        var secondaryCount = wrap == -1 ? 1 : Math.ceil(shownCount / wrap);
+        var widthCount = vertical ? secondaryCount : primaryCount;
+        var heightCount = vertical ? primaryCount : secondaryCount;
+        var paddingTop = _getAdaptiveProp(propMap, 'paddingTop', viewId, repeaterId, obj);
+        var paddingLeft = _getAdaptiveProp(propMap, 'paddingLeft', viewId, repeaterId, obj);
+        var paddingY = paddingTop + _getAdaptiveProp(propMap, 'paddingBottom', viewId, repeaterId, obj);
+        var paddingX = paddingLeft + _getAdaptiveProp(propMap, 'paddingRight', viewId, repeaterId, obj);
+
+        var spacingX = _getAdaptiveProp(propMap, 'horizontalSpacing', viewId, repeaterId, obj);
+        var xOffset = offset.width + spacingX;
+        var spacingY = _getAdaptiveProp(propMap, 'verticalSpacing', viewId, repeaterId, obj);
+        var yOffset = offset.height + spacingY;
+        var repeaterSize = { width: paddingX, height: paddingY };
+        repeaterSize.width += offset.width + (widthCount - 1) * xOffset;
+        repeaterSize.height += offset.height + (heightCount - 1) * yOffset;
+        $ax.visibility.setResizedSize(repeaterId, repeaterSize.width, repeaterSize.height);
+
+        if(itemsPregen) {
+            var templateIds = [repeaterId];
+            var processScriptIds = function (full, prop, id) {
+                if(id.indexOf('_') <= 0 && id.indexOf('p') == -1) templateIds.push('u' + id);
+            };
+            $('#' + repeaterId + '_script').html().replace(/(id|for)="?u([0-9]+(p([0-9]){3})?(_[_a-z0-9]*)?)"?/g, processScriptIds);
+            for(var i = 0; i < templateIds.length; i++) {
+                for(var j = 0; j < orderedIds.length; j++) {
+                    ids.push(_createElementId(templateIds[i], orderedIds[j]));
+                }
+            }
+
+            for(var pos = start; pos < end; pos++) {
+                var itemId = orderedIds[pos];
+                itemElementId = _createElementId(repeaterId, itemId);
+                var jobj = $jobj(itemElementId);
+                if(jobj.hasClass('preeval')) refreshType = _refreshType.preEval;
+                for(var i = 0; i < templateIds.length; i++) $ax.initializeObjectEvents($ax('#' + _createElementId(templateIds[i], itemId)), refreshType);
+                if(refreshType == _refreshType.preEval) {
+                    preevalMap[itemId] = true;
+                    jobj.removeClass('preeval');
+                }
+
+                $ax.visibility.setResizedSize(itemElementId, $ax.getNumFromPx(jobj.css('width')), $ax.getNumFromPx(jobj.css('height')));
+                $ax.visibility.setMovedLocation(itemElementId, $ax.getNumFromPx(jobj.css('left')), $ax.getNumFromPx(jobj.css('top')));
+            }
+        } else {
+            var html = $('#' + repeaterId + '_script').html();
+
+            var div = $('<div></div>');
+            div.html(html);
+            div.find('.' + $ax.visibility.HIDDEN_CLASS).removeClass($ax.visibility.HIDDEN_CLASS);
+            div.find('.' + $ax.visibility.UNPLACED_CLASS).removeClass($ax.visibility.UNPLACED_CLASS);
+            div.css({
+                width: offset.width,
+                height: offset.height
+            });
+
+            _applyColorCss(background, div);
+            var altDiv = div;
+            if(hasAltColor) altDiv = _applyColorCss(altColor, div.clone());
+
+            // Hide repeater, if shown, while updating.
+            var shown = $ax.visibility.IsIdVisible(repeaterId);
+            if(shown) document.getElementById(repeaterId).style.visibility = 'hidden';
+
+            //clean up old items as late as possible
+            removeItems(repeaterId);
+            resetItemSizes(repeaterId, offset, bounds, orderedIds, vertical, wrap);
+
+            var i = 0;
+            var startTop = paddingTop;
+            var startLeft = paddingLeft;
+            if(repeaterObj.css('box-sizing') == 'border-box') {
+                startTop -= $ax.getNumFromPx(repeaterObj.css('border-top-width')) || 0;
+                startLeft -= $ax.getNumFromPx(repeaterObj.css('border-left-width')) || 0;
+            }
+            var top = startTop;
+            var left = startLeft;
+            for(pos = start; pos < end; pos++) {
+                itemId = orderedIds[pos];
+
+                var itemElementId = _createElementId(repeaterId, itemId);
+                $ax.addItemIdToRepeater(itemId, repeaterId);
+
+                ids.push(itemElementId);
+                var processId = function(full, prop, id) {
+                    var elementId = _createElementId('u' + id, itemId);
+                    //If there is a suffix (ex. _img), then don't push the id.
+                    if (id.indexOf('_') <= 0 && id.indexOf('p') == -1) ids.push(elementId);
+                    return prop + '="' + elementId + '"';
+                };
+
+                var copy = (useAlt ? altDiv : div).clone();
+                useAlt = !useAlt;
+                copy.attr('id', itemElementId);
+                copy.html(div.html().replace(/(id|for)="?u([0-9]+(p([0-9]){3})?(_[_a-z0-9]*)?)"?/g, processId));
+                if(obj.repeaterPropMap.isolateRadio) {
+                    var radioButtons = copy.find(':radio');
+                    for(var radioIndex = 0; radioIndex < radioButtons.length; radioIndex++) {
+                        var radio = $(radioButtons[radioIndex]);
+                        var oldName = radio.attr('name') || '';
+                        // Can't use create element id because there could be an underscore in name
+                        if(oldName) radio.attr('name', oldName + '-' + itemId);
+                    }
+                }
+                
+
+                copy.css({
+                    'position': 'absolute',
+                    'top': top + 'px',
+                    'left': left + 'px',
+                    'width': obj.width + 'px',
+                    'height': obj.height + 'px'
+                });
+                $('#' + repeaterId).append(copy);
+                $ax.visibility.setResizedSize(itemElementId, offset.width, offset.height);
+                $ax.visibility.setMovedLocation(itemElementId, left, top);
+
+                i++;
+                if(wrap != -1 && i % wrap == 0) {
+                    if(vertical) {
+                        top = startTop;
+                        left += xOffset;
+                    } else {
+                        left = startLeft;
+                        top += yOffset;
+                    }
+                } else if (vertical) top += yOffset;
+                else left += xOffset;
+            }
+
+            repeaterObj.css(repeaterSize);
+
+            // Had to move this here because it sets up cursor: pointer on inline links,
+            // but must be done before style cached when adaptive view is set.
+            // TODO: Should be able to combine this with initialization done in pregen items. Just need to have ids and template ids be the same.
+            for (var i = 0; i < ids.length; i++) {
+                var id = ids[i];
+                var childJobj = $jobj(id);
+                if (obj.repeaterPropMap.isolateSelection && childJobj.attr('selectiongroup')) {
+                    childJobj.attr('selectiongroup', _createElementId(childJobj.attr('selectiongroup'), _getItemIdFromElementId(id)));
+                }
+                $ax.initializeObjectEvents($ax('#' + id), refreshType);
+            }
+        }
+
+        var query = _getItemQuery(repeaterId);
+        if(viewId) $ax.adaptive.applyView(viewId, query);
+        else $ax.visibility.resetLimboAndHiddenToDefaults(_getItemQuery(repeaterId, preevalMap));
+
+        $ax.annotation.createFootnotes(query, true);
+
+        for(var index = 0; index < ids.length; index++) {
+            id = ids[index];
+            
+            if ($ax.ieColorManager) $ax.ieColorManager.applyBackground($ax('#' + id));
+            //$ax.style.initializeObjectTextAlignment($ax('#' + id));
+            $ax.applyHighlight($ax('#' + id), true);
+        }
+
+        $ax.messageCenter.startCombineEventMessages();
+        $ax.cacheRepeaterInfo(repeaterId, $ax.getWidgetInfo(repeaterId));
+
+        //$ax.style.startSuspendTextAlignment();
+        // Now load
+        for(pos = start; pos < end; pos++) {
+            itemId = orderedIds[pos];
+            itemElementId = _createElementId(repeaterId, itemId);
+            if(!preevalMap[orderedIds[pos]]) $ax.event.raiseSyntheticEvent(itemElementId, 'onItemLoad', true);
+            $ax.loadDynamicPanelsAndMasters(obj.objects, path, itemId);
+        }
+        //$ax.style.resumeSuspendTextAlignment();
+
+        $ax.removeCachedRepeaterInfo(repeaterId);
+        $ax.messageCenter.endCombineEventMessages();
+
+        // Reshow repeater if it was originally shown (load is complete by now)
+        if(shown && !itemsPregen) document.getElementById(repeaterId).style.visibility = 'inherit';
+
+        $ax.dynamicPanelManager.fitParentPanel(repeaterId);
+
+        // Need to reapply the state style after refresh for text styles, and for applying a non-default style that wasn't reset for certain refreshes (adaptive changed for example). This could be way more selective but doing a safe change for the moment
+        if(refreshType != _refreshType.preEval) $ax.style.updateStateClass(repeaterId);
+
+        // Right now we assume only one refresh at a time. If we can manually trigger refreshes, that may possibly change.
+        $ax.action.refreshEnd();
+    };
+    _repeaterManager.refreshRepeater = _refreshRepeater;
+
+    var _getItemQuery = function(repeaterId, preevalMap) {
+        var query = $ax(function (diagramObject, elementId) {
+            // Also need to check that this in not preeval
+            if(preevalMap) {
+                var itemId = _getItemIdFromElementId(elementId);
+                if(preevalMap[itemId]) return false;
+            }
+
+            // All objects with the repeater as their parent, except the repeater itself.
+            var scriptId = _getScriptIdFromElementId(elementId);
+            return $ax.getParentRepeaterFromScriptId(scriptId) == repeaterId && scriptId != repeaterId;
+        });
+
+        return query;
+    }
+
+    _repeaterManager.refreshAllRepeaters = function() {
+        $ax('*').each(function(diagramObject, elementId) {
+            if(!$ax.public.fn.IsRepeater(diagramObject.type)) return;
+            if($ax.visibility.isElementIdLimboOrInLimboContainer(elementId)) return;
+            _initPageInfo(diagramObject, elementId);
+            _refreshRepeater(elementId, $ax.getEventInfoFromEvent($ax.getjBrowserEvent()), _refreshType.persist);
+        });
+    };
+
+    _repeaterManager.refreshRepeaters = function(ids, eventInfo) {
+        for(var i = 0; i < ids.length; i++) _refreshRepeater(ids[i], eventInfo);
+    };
+
+    var _initPageInfo = function(obj, elementId) {
+        var pageInfo = {};
+        var map = obj.repeaterPropMap;
+
+        var currentViewId = $ax.adaptive.currentViewId || '';
+        var itemsPerPage = _getAdaptiveProp(map, 'itemsPerPage', currentViewId, elementId, obj);
+        if(itemsPerPage == -1) pageInfo.noLimit = true;
+        else {
+            pageInfo.itemsPerPage = itemsPerPage;
+            pageInfo.currPage = _getAdaptiveProp(map, 'currPage', currentViewId, elementId, obj);
+        }
+        repeaterToPageInfo[elementId] = pageInfo;
+    };
+
+    _repeaterManager.initialize = function() {
+        $ax(function (obj) {
+            return $ax.public.fn.IsRepeater(obj.type);
+        }).each(function (obj, repeaterId) {
+            _initPregen(repeaterId);
+        });
+    }
+
+    var _initPregen = function(repeaterId) {
+        var obj = $ax.getObjectFromScriptId(repeaterId);
+        var propMap = obj.repeaterPropMap;
+
+        //If there is no wrap, then set it to be above the number of rows
+        var viewId = $ax.adaptive.currentViewId || '';
+        var wrap = _getAdaptiveProp(propMap, 'wrap', viewId, repeaterId, obj);
+        var vertical = _getAdaptiveProp(propMap, 'vertical', viewId, repeaterId, obj);
+
+        var orderedIds = [];
+        var ids = [];
+        var background = _getAdaptiveProp(propMap, 'backColor', viewId, repeaterId, obj);
+        var hasAltColor = _getAdaptiveProp(propMap, 'hasAltColor', viewId, repeaterId, obj);
+        var altColor = hasAltColor ? _getAdaptiveProp(propMap, 'altColor', viewId, repeaterId, obj) : undefined;
+        var useAlt = false;
+
+        var bounds = _getVisibleDataBounds(repeaterToPageInfo[repeaterId], obj.data.length);
+        var start = bounds[0];
+        var end = bounds[1];
+
+        // Starts empty
+        if(start == end) {
+            $ax.action.refreshEnd(repeaterId);
+            return;
+        }
+        var unprocessedBaseIds = $jobj($ax.repeater.createElementId(repeaterId, start + 1)).html().match(/(id|for)="?u([0-9]+)/g);
+        var baseIds = [];
+        if(unprocessedBaseIds) {
+            for(var i = 0; i < unprocessedBaseIds.length; i++) {
+                var val = unprocessedBaseIds[i].split('=')[1].substr(1);
+                if(baseIds.indexOf(val) == -1) baseIds.push(val);
+            }
+        }
+
+        for(var itemNum = start; itemNum < end; itemNum++) {
+            ids.push($ax.repeater.createElementId(repeaterId, itemNum + 1));
+            for(i = 0; i < baseIds.length; i++) ids.push($ax.repeater.createElementId(baseIds[i], itemNum + 1));
+            var itemId = itemNum + 1;
+            orderedIds[itemNum] = itemId;
+
+            var itemDiv = $jobj($ax.repeater.createElementId(repeaterId, itemNum + 1));
+            _applyColorCss(useAlt ? altColor : background, itemDiv);
+            if(hasAltColor) useAlt = !useAlt;
+        }
+
+        resetItemSizes(repeaterId, undefined, bounds, orderedIds, vertical, wrap);
+    };
+
+    var _applyColorCss = function(json, div) {
+        var args = json.r + ', ' + json.g + ', ' + json.b;
+        var background = json.a == 0 ? '' : json.a == 1 ? 'rgb(' + args + ')' : 'rgba(' + args + ', ' + json.a + ')';
+        if($ax.ieColorManager && json.a != 0 && json.a != 1) {
+            var ieColor = $ax.ieColorManager.getColorFromArgb(json.a * 255, json.r, json.g, json.b, true);
+            if(ieColor) background = ieColor;
+        }
+        div.css('background-color', background);
+        return div;
+    };
+
+    var _getViewIdFromPageViewId = function (pageViewId, id, diagramObject) {
+        if (diagramObject.owner.type != 'Axure:Master') {
+            return pageViewId;
+        } else {
+            var parentRdoId = $ax('#' + id).getParents(true, ['rdo'])[0][0];
+            var rdoState = $ax.style.generateState(parentRdoId);
+            var rdoStyle = $ax.style.computeFullStyle(parentRdoId, rdoState, pageViewId);
+            var viewOverride = rdoStyle.viewOverride;
+            return viewOverride;
+        }
+    }
+
+    var _getAdaptiveProp = _repeaterManager.getAdaptiveProp = function (map, prop, viewId, repeaterId, repeaterObj) {
+        var viewChain = $ax.style.getViewIdChain(viewId, repeaterId, repeaterObj);
+
+        for(var i = viewChain.length - 1; i >= 0; i--) {
+            viewId = viewChain[i];
+            var viewProps = map[viewId];
+            if(viewProps.hasOwnProperty(prop)) return viewProps[prop];
+        }
+
+        var base = repeaterObj.owner.type != 'Axure:Master' ? map[''] : map['19e82109f102476f933582835c373474'];
+        if(base.hasOwnProperty(prop)) return base[prop];
+        return map['default'][prop];
+    };
+
+    _repeaterManager.getItemCount = function(repeaterId) {
+        var data = repeaterToActiveDataSet[repeaterId].length;
+        var info = repeaterToPageInfo[repeaterId];
+        if(!info.noLimit) {
+            var start = Math.min(data, info.itemsPerPage * info.currPage);
+            var end = Math.min(data, start + info.itemsPerPage);
+            data = end - start;
+        }
+        return data;
+    };
+
+    _repeaterManager.setDisplayProps = function(obj, repeaterId, itemIndex) {
+        var data = repeaterToActiveDataSet[repeaterId];
+        var info = repeaterToPageInfo[repeaterId];
+        var start = 0;
+        var end = data.length;
+        if(!info.noLimit) {
+            start = Math.min(end, info.itemsPerPage * (info.currPage - 1));
+            end = Math.min(end, start + info.itemsPerPage);
+        }
+        var count = end - start;
+        var index = -1;
+        for(var i = 0; i < count; i++) {
+            if(data[start + i].index == itemIndex) index = i + 1;
+        }
+        if(index == -1) return;
+        obj.index = index;
+        obj.isfirst = index == 1;
+        obj.islast = index == end - start;
+        obj.iseven = index % 2 == 0;
+        obj.isodd = index % 2 == 1;
+    };
+
+    var _getVisibleDataBounds = function(pageInfo, count) {
+        var retval = [0, count];
+        if(!pageInfo.noLimit) {
+            var end = pageInfo.itemsPerPage * pageInfo.currPage;
+            var start = end - pageInfo.itemsPerPage;
+
+            // If past the end, move to last page
+            if(start >= count) {
+                pageInfo.currPage = Math.floor((count - 1) / pageInfo.itemsPerPage) + 1;
+                if(pageInfo.currPage <= 0) pageInfo.currPage = 1;
+
+                end = pageInfo.itemsPerPage * pageInfo.currPage;
+                start = end - pageInfo.itemsPerPage;
+            }
+            end = Math.min(end, count);
+            retval[0] = start;
+            retval[1] = end;
+        }
+        return retval;
+    };
+
+    _repeaterManager.getVisibleDataCount = function(repeaterId) {
+        var bounds = _getVisibleDataBounds(repeaterToPageInfo[repeaterId], repeaterToActiveDataSet[repeaterId].length);
+        return bounds[1] - bounds[0];
+    };
+
+    _repeaterManager.getDataCount = function(repeaterId) {
+        return repeaterToCurrentDataSet[repeaterId].length;
+    };
+
+    var _getFilteredDataCount = _repeaterManager.getFilteredDataCount = function(repeaterId) {
+        return repeaterToActiveDataSet[repeaterId].length;
+    };
+
+    _repeaterManager.getPageCount = function(repeaterId) {
+        var info = repeaterToPageInfo[repeaterId];
+        return info.noLimit ? 1 : Math.ceil(_getFilteredDataCount(repeaterId) / info.itemsPerPage);
+    };
+
+    _repeaterManager.getPageIndex = function(repeaterId) {
+        var info = repeaterToPageInfo[repeaterId];
+        return info.noLimit ? 1 : info.currPage;
+    };
+
+    var getActiveDataSet = function(repeaterId) {
+        var active = $ax.deepCopy(repeaterToCurrentDataSet[repeaterId]);
+        // Set up 1 indexing each item.
+        for(var i = 0; i < active.length; i++) active[i].index = i + 1;
+        return active;
+    };
+
+    var getOrderedIds = function(repeaterId, eventInfo) {
+        var data = repeaterToActiveDataSet[repeaterId] = getActiveDataSet(repeaterId);
+
+        // Filter first so less to sort
+        applyFilter(repeaterId, data, eventInfo);
+
+        // Sort next
+        var sorts = repeaterToSorts[repeaterId] || [];
+        if(sorts.length != 0 && data.length > 1) {
+            // TODO: Make this generic and factor out if we want to use it elsewhere...
+            // Compare is a function that takes 2 arguments, and returns a number. A high number means the second should go first
+            // Otherwise the first stays first.
+            var mergesort = function(list, start, end, compare) {
+                var middle = Math.floor((start + end) / 2);
+                if(middle - start > 1) mergesort(list, start, middle, compare);
+                if(end - middle > 1) mergesort(list, middle, end, compare);
+                var index1 = start;
+                var index2 = middle;
+                var tempList = [];
+                while(index1 < middle && index2 < end) {
+                    tempList[tempList.length] = list[compare(list[index1], list[index2]) > 0 ? index2++ : index1++];
+                }
+                while(index1 < middle) tempList[tempList.length] = list[index1++];
+                while(index2 < end) tempList[tempList.length] = list[index2++];
+
+                // transfer from temp list to the real list.
+                for(var i = 0; i < tempList.length; i++) list[start + i] = tempList[i];
+            };
+            // Compare is the tie breaking function to us if necessary.
+            var getComparator = function(columnName, ascending, type, compare) {
+                // If this needs to be sped up, break up into several smaller functions conditioned off of type
+                return function(row1, row2) {
+                    // If column undefined have it be empty string, NaN, or invalid date
+                    //// If column undefined, no way to measure this, so call it a tie.
+                    //if(row1[columnName] === undefined || row2[columnName] === undefined) return 0;
+
+                    var text1 = (row1[columnName] && row1[columnName].text) || '';
+                    var text2 = (row2[columnName] && row2[columnName].text) || '';
+
+                    // This means we are case insensitive, so lowercase everything to kill casing
+                    if(type == 'Text') {
+                        text1 = text1.toLowerCase();
+                        text2 = text2.toLowerCase();
+                    }
+
+                    //If tied, go to tie breaker
+                    if(text1 == text2) {
+                        if(compare) return compare(row1, row2);
+                        // Actually a tie.
+                        return 0;
+                    }
+                    if(type == 'Text' || type == 'Text (Case Sensitive)') {
+                        if(text1 < text2 ^ ascending) return 1;
+                        else return -1;
+                    } else if(type == 'Number') {
+                        var num1 = text1 == '' ? NaN : Number(text1);
+                        var num2 = text2 == '' ? NaN : Number(text2);
+
+                        if(isNaN(num1) && isNaN(num2)) return 0;
+                        if(isNaN(num1) || isNaN(num2)) return isNaN(num1) ? 1 : -1;
+                        if(num1 < num2 ^ ascending) return 1;
+                        else return -1;
+                    } else if(type == 'Date - YYYY-MM-DD' || type == 'Date - MM/DD/YYYY') {
+                        var func = type == 'Date - YYYY-MM-DD' ? getDate1 : getDate2;
+                        var date1 = func(text1);
+                        var date2 = func(text2);
+                        if(!date1.valid && !date2.valid) return 0;
+                        if(!date1.valid || !date2.valid) return date1.valid ? -1 : 1;
+                        var diff = date2.year - date1.year;
+                        if(diff == 0) diff = date2.month - date1.month;
+                        if(diff == 0) diff = date2.day - date1.day;
+                        if(diff == 0) return 0;
+                        return diff > 0 ^ ascending ? 1 : -1;
+                    }
+                    console.log('unhandled sort type');
+                    return 0;
+                };
+            };
+            var compareFunc = null;
+            for(var i = 0; i < sorts.length; i++) compareFunc = getComparator(sorts[i].columnName, sorts[i].ascending, sorts[i].sortType, compareFunc);
+
+            mergesort(data, 0, data.length, compareFunc);
+        }
+
+        var ids = [];
+        for(i = 0; i < data.length; i++) ids[i] = data[i].index;
+
+        return ids;
+    };
+
+    var getDate1 = function(text) {
+        var date = { valid: false };
+        var sections = text.split('-');
+        if(sections.length == 1) sections = text.split('/');
+        if(sections.length != 3) return date;
+        date.year = Number(sections[0]);
+        date.month = Number(sections[1]);
+        date.day = Number(sections[2]);
+        date.valid = !isNaN(date.year);
+        date.valid &= !isNaN(date.month) && date.month > 0 && date.month <= 12;
+        date.valid &= !isNaN(date.day) && date.day > 0 && date.day <= daysPerMonth(date.month, date.year);
+        return date;
+    };
+
+    var getDate2 = function(text) {
+        var date = { valid: false };
+        var sections = text.split('-');
+        if(sections.length == 1) sections = text.split('/');
+        if(sections.length != 3) return date;
+        date.month = Number(sections[0]);
+        date.day = Number(sections[1]);
+        date.year = Number(sections[2]);
+        date.valid = !isNaN(date.year);
+        date.valid &= !isNaN(date.month) && date.month > 0 && date.month <= 12;
+        date.valid &= !isNaN(date.day) && date.day > 0 && date.day <= daysPerMonth(date.month, date.year);
+        return date;
+    };
+
+    var daysPerMonth = function(month, year) {
+        if(month == 9 || month == 4 || month == 6 || month == 11) return 30;
+        if(month != 2) return 31;
+
+        if(year % 4 != 0) return 28;
+        if(year % 100 != 0) return 29;
+        return year % 400 == 0 ? 29 : 28;
+    };
+
+    var applyFilter = function(repeaterId, data, eventInfo) {
+        var dataFiltered = [];
+        var filters = repeaterToFilters[repeaterId] || [];
+        if (filters.length != 0) {
+            if(!eventInfo) eventInfo = $ax.getBasicEventInfo();
+            var oldTarget = eventInfo.targetElement;
+            var oldSrc = eventInfo.srcElement;
+            var oldThis = eventInfo.thiswidget;
+            var oldItem = eventInfo.item;
+
+            var idToWidgetInfo = {};
+
+            outer:
+            for(var i = 1; i <= data.length; i++) {
+                for(var j = 0; j < filters.length; j++) {
+                    eventInfo.targetElement = _createElementId(repeaterId, i);
+                    eventInfo.srcElement = filters[j].thisId;
+                    if(!idToWidgetInfo[eventInfo.srcElement]) idToWidgetInfo[eventInfo.srcElement] = $ax.getWidgetInfo(eventInfo.srcElement);
+                    eventInfo.thiswidget = idToWidgetInfo[eventInfo.srcElement];
+                    eventInfo.item = $ax.getItemInfo(eventInfo.srcElement);
+
+                    if($ax.expr.evaluateExpr(filters[j].filter, eventInfo) != 'true') continue outer;
+                }
+                dataFiltered[dataFiltered.length] = data[i - 1];
+            }
+
+            for(i = 0; i < dataFiltered.length; i++) data[i] = dataFiltered[i];
+            while(data.length > dataFiltered.length) data.pop();
+
+            eventInfo.targetElement = oldTarget;
+            eventInfo.srcElement = oldSrc;
+            eventInfo.thiswidget = oldThis;
+            eventInfo.item = oldItem;
+        }
+    };
+
+    var _addFilter = function(repeaterId, removeOtherFilters, label, filter, thisId) {
+        if(removeOtherFilters) _removeFilter(repeaterId);
+        
+        var filterList = repeaterToFilters[repeaterId];
+        if(!filterList) repeaterToFilters[repeaterId] = filterList = [];
+
+        var filterObj = { filter: filter, thisId: thisId };
+        if(label) filterObj.label = label;
+        filterList[filterList.length] = filterObj;
+    };
+    _repeaterManager.addFilter = _addFilter;
+
+    var _removeFilter = function(repeaterId, label) {
+        var filterList = repeaterToFilters[repeaterId];
+        // If no list, nothing to remove
+        if(!filterList) return;
+
+        // If no label, remove everything
+        if(!label) {
+            repeaterToFilters[repeaterId] = [];
+            return;
+        }
+
+        for(var i = filterList.length - 1; i >= 0; i--) {
+            var filterObj = filterList[i];
+            if(filterObj.label && filterObj.label == label) $ax.splice(filterList, i, 1);
+        }
+    };
+    _repeaterManager.removeFilter = _removeFilter;
+
+    var _addSort = function(repeaterId, label, columnName, ascending, toggle, sortType) {
+        var sortList = repeaterToSorts[repeaterId];
+        if(!sortList) repeaterToSorts[repeaterId] = sortList = [];
+
+        for(var i = 0; i < sortList.length; i++) {
+            if(columnName == sortList[i].columnName) {
+                var lastSortObj = $ax.splice(sortList, i, 1)[0];
+                if(toggle) ascending = !lastSortObj.ascending;
+                break;
+            }
+        }
+
+        var sortObj = { columnName: columnName, ascending: ascending, sortType: sortType };
+
+        if(label) sortObj.label = label;
+        sortList[sortList.length] = sortObj;
+    };
+    _repeaterManager.addSort = _addSort;
+
+    var _removeSort = function(repeaterId, label) {
+        var sortList = repeaterToSorts[repeaterId];
+        // If no list, nothing to remove
+        if(!sortList) return;
+
+        // If no label, remove everything
+        if(!label) {
+            repeaterToSorts[repeaterId] = [];
+            return;
+        }
+
+        for(var i = sortList.length - 1; i >= 0; i--) {
+            var sortObj = sortList[i];
+            if(sortObj.label && sortObj.label == label) $ax.splice(sortList, i, 1);
+        }
+    };
+    _repeaterManager.removeSort = _removeSort;
+
+    var _setRepeaterToPage = function(repeaterId, type, value, eventInfo) {
+        var pageInfo = repeaterToPageInfo[repeaterId];
+        // page doesn't matter if there is no limit.
+        if(pageInfo.noLimit) return;
+
+        var dataSet = repeaterToActiveDataSet[repeaterId];
+        if(!dataSet) dataSet = repeaterToCurrentDataSet[repeaterId];
+        var lastPage = Math.max(1, Math.ceil(dataSet.length / pageInfo.itemsPerPage));
+
+        if(type == 'Value') {
+            var val = Number($ax.expr.evaluateExpr(value, eventInfo));
+            // if invalid, default to 1, otherwise, clamp the value
+            if(isNaN(val)) val = 1;
+            else if(val < 1) val = 1;
+            else if(val > lastPage) val = lastPage;
+
+            pageInfo.currPage = val;
+        } else if(type == 'Previous') {
+            if(pageInfo.currPage > 1) pageInfo.currPage--;
+        } else if(type == 'Next') {
+            if(pageInfo.currPage < lastPage) pageInfo.currPage++;
+        } else if(type == 'Last') {
+            pageInfo.currPage = lastPage;
+        } else {
+            console.log('Unknown type');
+        }
+    };
+    _repeaterManager.setRepeaterToPage = _setRepeaterToPage;
+
+    var _setNoItemLimit = function(repeaterId) {
+        var pageInfo = repeaterToPageInfo[repeaterId];
+        delete pageInfo.currPage;
+        delete pageInfo.itemsPerPage;
+        pageInfo.noLimit = true;
+    };
+    _repeaterManager.setNoItemLimit = _setNoItemLimit;
+
+    var _setItemLimit = function(repeaterId, value, eventInfo) {
+        var pageInfo = repeaterToPageInfo[repeaterId];
+
+        if(pageInfo.noLimit) {
+            pageInfo.noLimit = false;
+            pageInfo.currPage = 1;
+        }
+
+        var oldTarget = eventInfo.targetElement;
+        eventInfo.targetElement = repeaterId;
+        var itemLimit = Number($ax.expr.evaluateExpr(value, eventInfo));
+        eventInfo.targetElement = oldTarget;
+        if(isNaN(itemLimit)) itemLimit = 20;
+        else if(itemLimit < 1) itemLimit = 1;
+        pageInfo.itemsPerPage = itemLimit;
+    };
+    _repeaterManager.setItemLimit = _setItemLimit;
+
+    var removeItems = function(repeaterId) {
+        var elementIds = $ax.getChildElementIdsForRepeater(repeaterId);
+        var itemId = $ax.getItemIdsForRepeater(repeaterId);
+        for(var i = 0; i < itemId.length; i++) $jobj(_createElementId(repeaterId, itemId[i])).remove();
+        $ax.visibility.clearLimboAndHiddenIds(elementIds);
+        $ax.visibility.clearMovedAndResizedIds(elementIds);
+        $ax.clearItemsForRepeater(repeaterId);
+    };
+
+    var repeaterSizes = {};
+    var resetItemSizes = function (repeaterId, itemSize, bounds, ids, vertical, wrap) {
+        var calcItem = !itemSize;
+        if(calcItem) itemSize = {};
+
+        var repeaterMap = {};
+        repeaterMap.vert = vertical;
+        var sizesMap = {};
+        var sizes = [];
+        var currSizes = wrap == -1 ? sizes : [];
+        for(var i = 0; i + bounds[0] < bounds[1]; i++) {
+            var itemId = ids[i + bounds[0]];
+            if(calcItem) {
+                var itemJobj = $jobj(_createElementId(repeaterId, itemId));
+                itemSize.width = $ax.getNumFromPx(itemJobj.css('width'));
+                itemSize.height = $ax.getNumFromPx(itemJobj.css('height'));
+            }
+
+            var size = { itemId: itemId, width: itemSize.width, height: itemSize.height };
+            currSizes.push(size);
+            sizesMap[size.itemId] = size;
+            if(currSizes.length == wrap) {
+                sizes.push(currSizes);
+                currSizes = [];
+            }
+        }
+        if (wrap != -1 && currSizes.length > 0) sizes.push(currSizes);
+        repeaterMap.sizes = sizes;
+        repeaterMap.sizesMap = sizesMap;
+        repeaterSizes[repeaterId] = repeaterMap;
+    };
+
+    _repeaterManager.getItemSize = function(repeaterId, itemId) {
+        var repeaterSize = repeaterSizes[repeaterId];
+        if (!repeaterSize) return false;
+        return repeaterSize.sizesMap[itemId];
+    }
+
+    _repeaterManager.setItemSize = function (repeaterId, itemId, width, height) {
+        var repeaterSize = repeaterSizes[repeaterId];
+        if(!repeaterSize) return false;
+        var size = repeaterSize.sizesMap[itemId];
+        var deltaX = width - size.width;
+        var deltaY = height - size.height;
+        if(!deltaX && !deltaY) return false;
+
+        repeaterSize.resized = true;
+
+        if(deltaX) _pushItems(repeaterId, itemId, deltaX, false, true);
+        if(deltaY) _pushItems(repeaterId, itemId, deltaY, true, true);
+
+        if(deltaX || deltaY) $ax.event.raiseSyntheticEvent(_createElementId(repeaterId, itemId), 'onItemResize');
+
+        return true;
+    }
+
+    var _pushItems = _repeaterManager.pushItems = function (repeaterId, itemId, delta, vertical, suppressFire) {
+        if(delta == 0) return;
+
+        // Update repeater item size
+        var prop = vertical ? 'height' : 'width';
+        var itemElementId = _createElementId(repeaterId, itemId);
+        var itemObj = $jobj(itemElementId);
+        itemObj.css(prop, $ax.getNumFromPx(itemObj.css(prop)) + delta);
+        $ax.visibility.setResizedSize(itemElementId, $ax.getNumFromPx(itemObj.css('width')), $ax.getNumFromPx(itemObj.css('height')));
+
+        var repeaterObj = $jobj(repeaterId);
+        var repeaterMap = repeaterSizes[repeaterId];
+        var sizes = repeaterMap.sizes;
+        var wrap = sizes[0].length != undefined;
+        var vert = repeaterMap.vert;
+
+        // Not wrapping, has to push in primary direction
+        if (!wrap && vert != vertical) {
+            var before = 0;
+            var after = 0;
+            var limit = 0;
+            for(var i = 0; i < sizes.length; i++) {
+                var size = sizes[i];
+                if(size.itemId == itemId) {
+                    before = size[prop];
+                    size[prop] += delta;
+                    after = size[prop];
+                } else {
+                    limit = limit ? Math.max(limit, size[prop]) : size[prop];
+                }
+            }
+
+            // Repeater delta is because an item can increase secondary direction, but if another item is already larger, then repeater size isn't effected.
+            var repeaterDelta = delta;
+            if(sizes.length != 1) {
+                if(after >= limit) repeaterDelta = after - Math.max(limit, before);
+                else if(before > limit) repeaterDelta = limit - before;
+                else repeaterDelta = 0;
+            }
+
+            _updateRepeaterSize(prop, repeaterObj, repeaterDelta, vert);
+
+            if(!suppressFire) $ax.event.raiseSyntheticEvent(_createElementId(repeaterId, itemId), 'onItemResize');
+            return;
+        }
+
+        var index = 0;
+        var index2 = 0;
+        // Get the indices first
+        if(wrap) {
+            outer:
+                for(; index < sizes.length; index++) {
+                    var innerSizes = sizes[index];
+                    for(index2 = 0; index2 < innerSizes.length; index2++) if(innerSizes[index2].itemId == itemId) break outer;
+                }
+        } else {
+            for(; index < sizes.length; index++) if(sizes[index].itemId == itemId) break;
+        }
+        // Find out who is being pushed
+        var itemIdsEffected = [];
+        if (vert == vertical) {
+            // To check for repeater resize, non-wrap is easy, for wrap you have to see if your new size is enough to effect the size given other col/row sizes.
+            repeaterDelta = delta;
+            if(wrap && sizes.length > 1) {
+                var viewId = $ax.adaptive.currentViewId || '';
+                var obj = $obj(repeaterId);
+                var spacing = _getAdaptiveProp(obj.repeaterPropMap, (vert ? 'vertical' : 'horizontal') + 'Spacing', viewId, repeaterId, obj);
+                for(i = 0; i < sizes.length; i++) {
+                    var rowColSize = 0;
+                    var rowCol = sizes[i];
+                    for(var j = 0; j < rowCol.length; j++) {
+                        if(j != 0) rowColSize += spacing;
+                        rowColSize += rowCol[j][prop];
+                    }
+
+                    if(i == index) {
+                        before = rowColSize;
+                        after = before + delta;
+                    } else {
+                        limit = limit ? Math.max(limit, rowColSize) : rowColSize;
+                    }
+                }
+
+                if(after >= limit) repeaterDelta = after - Math.max(limit, before);
+                else if (before > limit) repeaterDelta = limit - before;
+                else repeaterDelta = 0;
+            }
+
+            if (repeaterDelta) {
+                _updateRepeaterSize(prop, repeaterObj, repeaterDelta, vert);
+            }
+
+            // Done the hard part, calculating/updating new repeater size. Now just resize items and find what to push.
+            var array = wrap ? sizes[index] : sizes;
+            i = wrap ? index2 : index;
+            array[i][prop] += delta;
+
+            for(i++; i < array.length; i++) itemIdsEffected.push(array[i].itemId);
+        } else {
+            // Secondary push is more interesting. See how much your primary row/column is already pushing, if that changes
+            //  then effect all rows/columns after it
+
+            // Get the biggest one in the current row/column, ignoring the one we're changing
+            var biggest = 0;
+            var currSizes = sizes[index];
+            for(i = 0; i < currSizes.length; i++) {
+                if (i == index2) continue;
+
+                biggest = Math.max(biggest, currSizes[i][prop]);
+            }
+
+            var beforeSize = Math.max(biggest, currSizes[index2][prop]);
+            currSizes[index2][prop] += delta;
+            var afterSize = Math.max(biggest, currSizes[index2][prop]);
+
+            // Nothing pushed/pulled
+            if (afterSize == beforeSize) return;
+
+            for(i = index + 1; i < sizes.length; i++) {
+                currSizes = sizes[i];
+                for(j = 0; j < currSizes.length; j++) itemIdsEffected.push(currSizes[j].itemId);
+            }
+
+            // Delta is only how much the whole row/column changed
+            delta = afterSize - beforeSize;
+
+            // Repeater resize secondary is determined by the effective delta.
+            _updateRepeaterSize(prop, repeaterObj, delta, vert);
+        }
+
+        for(i = 0; i < itemIdsEffected.length; i++) {
+            var currItemId = itemIdsEffected[i];
+            var elementId = _createElementId(repeaterId, currItemId);
+            var loc = vertical ? 'top' : 'left';
+            var jobj = $jobj(elementId);
+            var currVal = $ax.getNumFromPx(jobj.css(loc));
+            jobj.css(loc, currVal + delta);
+            $ax.visibility.setMovedLocation(elementId, $ax.getNumFromPx(jobj.css('left')), $ax.getNumFromPx(jobj.css('top')));
+        }
+
+        if(!suppressFire) $ax.event.raiseSyntheticEvent(_createElementId(repeaterId, itemId), 'onItemResize');
+    }
+
+    var _updateRepeaterSize = function(prop, jobj, delta, vert) {
+        if (delta == 0) return;
+        var val = $ax.getNumFromPx(jobj.css(prop)) + delta;
+        var border = 0;
+        if(vert) border += $ax.getNumFromPx(jobj.css('border-top-width')) + $ax.getNumFromPx(jobj.css('border-bottom-width'));
+        else border += $ax.getNumFromPx(jobj.css('border-left-width')) + $ax.getNumFromPx(jobj.css('border-right-width'));
+        val += border;
+        jobj.css(prop, val);
+        $ax.visibility.setResizedSize(jobj.attr('id'), $ax.getNumFromPx(jobj.css('width')), $ax.getNumFromPx(jobj.css('height')));
+        $ax.dynamicPanelManager.fitParentPanel(jobj.attr('id'));
+    }
+
+    var _getDataFromDataSet = function (eventInfo, repeaterId, itemId, propName, type) {
+        var row = undefined;
+        var deleteMap = eventInfo && eventInfo.repeaterDeleteMap && eventInfo.repeaterDeleteMap[repeaterId];
+        if(deleteMap) row = deleteMap.idToRow[itemId];
+
+        if(!row) {
+            var itemNum = _getRealItemId(eventInfo, repeaterId, Number(itemId));
+            row = repeaterToCurrentDataSet[repeaterId][itemNum];
+        }
+        // Default to obj with text as empty string, as we don't generate the data for empty props
+        var data = row[propName] || { text: '' };
+        //For now text is always the default. May change this to depend on context.
+        switch(type) {
+            case 'data': return data.type == 'text' ? data.text : data
+            case 'img': return (data.img && data.img[$ax.adaptive.getSketchKey()]) || data.text;
+            default: return (type && data[type]) || data.text;
+        }
+        //return type == 'data' && data.type != 'text' ? data : (type && data[type]) || data['text'];
+    };
+    _repeaterManager.getData = _getDataFromDataSet;
+
+    _repeaterManager.hasData = function(id, propName) {
+        if(!_getItemIdFromElementId(id)) return false;
+        var repeaterId = $ax.getParentRepeaterFromScriptId(_getScriptIdFromElementId(id));
+        return Boolean(repeaterToCurrentDataSet[repeaterId] && repeaterToCurrentDataSet[repeaterId].props.indexOf(propName) != -1);
+    };
+
+    var _getEventDeleteData = function(eventInfo, repeaterId) {
+        var repeaterDeleteMap = eventInfo.repeaterDeleteMap;
+        if(!repeaterDeleteMap) repeaterDeleteMap = eventInfo.repeaterDeleteMap = {};
+
+        var myDeleteMap = repeaterDeleteMap[repeaterId];
+        if(!myDeleteMap) {
+            myDeleteMap = repeaterDeleteMap[repeaterId] = {};
+            myDeleteMap.deletedIds = [];
+            myDeleteMap.idToRow = {};
+        }
+
+        return myDeleteMap;
+    };
+
+    var _getRealItemId = function(eventInfo, repeaterId, itemId) {
+        var deletedBefore = 0;
+        var map = eventInfo.repeaterDeleteMap && eventInfo.repeaterDeleteMap[repeaterId];
+        var deletedIds = map && map.deletedIds;
+        if(!deletedIds) return itemId - 1;
+
+        for(var i = 0; i < deletedIds.length; i++) if (deletedIds[i] < itemId) deletedBefore++;
+        return itemId - deletedBefore - 1;
+    }
+
+    var _addItemToDataSet = function(repeaterId, row, itemEventInfo) {
+        itemEventInfo.data = true;
+        var oldTarget = itemEventInfo.targetElement;
+        itemEventInfo.targetElement = repeaterId;
+        var dataSet = repeaterToLocalDataSet[repeaterId];
+
+        for(var propName in row) {
+            if(!row.hasOwnProperty(propName)) continue;
+            var prop = row[propName];
+            if(prop.type == 'literal') {
+                var retval = $ax.expr.evaluateExpr(prop.literal, itemEventInfo);
+                if(typeof (retval) == 'string' || retval instanceof Date) retval = { type: 'text', text: retval };
+                row[propName] = retval;
+            }
+        }
+
+        itemEventInfo.targetElement = oldTarget;
+        dataSet[dataSet.length] = row;
+        itemEventInfo.data = false;
+    };
+    _repeaterManager.addItem = _addItemToDataSet;
+
+    var _deleteItemsFromDataSet = function(repeaterId, eventInfo, type, rule) {
+        var dataSet = repeaterToCurrentDataSet[repeaterId];
+        var deleteDataMap = _getEventDeleteData(eventInfo, repeaterId);
+        var items;
+
+        // Should always be this, marked, or rule.
+        if(type == 'this') items = [_getItemIdFromElementId(eventInfo.srcElement)];
+        else if(type == 'marked') items = $ax.deepCopy(repeaterToEditItems[repeaterId]);
+        else {
+            // This should be rule
+            var visibleData = repeaterToCurrentDataSet[repeaterId];
+            items = [];
+            var oldTarget = eventInfo.targetElement;
+            for(var i = 0; i < visibleData.length + deleteDataMap.deletedIds.length; i++) {
+                var index = i + 1;
+                if(deleteDataMap.deletedIds.indexOf(index) != -1) continue;
+
+                eventInfo.targetElement = _createElementId(repeaterId, index);
+                if($ax.expr.evaluateExpr(rule, eventInfo).toLowerCase() != 'true') continue;
+                items.push(index);
+            }
+            eventInfo.targetElement = oldTarget;
+        }
+        // Want them decending
+        items.sort(function(a, b) { return b - a; });
+        var editItems = repeaterToEditItems[repeaterId];
+
+        for(i = 0; i < items.length; i++) {
+            var itemId = items[i];
+
+            // Don't delete already deletedItem
+            if(deleteDataMap.deletedIds.indexOf(itemId) != -1) continue;
+            
+            var deletedRow = $ax.splice(dataSet, _getRealItemId(eventInfo, repeaterId, itemId), 1)[0];
+            deleteDataMap.deletedIds.push(itemId);
+            deleteDataMap.idToRow[itemId] = deletedRow;
+            for(var j = editItems.length - 1; j >= 0; j--) {
+                var editItem = editItems[j];
+                if(editItem == itemId) $ax.splice(editItems, j, 1);
+                else if(editItem > itemId) editItems[j] = editItem - 1;
+            }
+        }
+    };
+    _repeaterManager.deleteItems = _deleteItemsFromDataSet;
+
+    var _updateEditItemsInDataSet = function(repeaterId, propMap, eventInfo, type, rule) {
+        var oldTarget = eventInfo.targetElement;
+        var dataSet = repeaterToCurrentDataSet[repeaterId];
+        var items;
+
+        // Should always be this, marked, or rule.
+        if(type == 'this') items = [_getItemIdFromElementId(eventInfo.srcElement)];
+        else if(type == 'marked') items = repeaterToEditItems[repeaterId];
+        else {
+            // This should be rule
+            var currData = repeaterToCurrentDataSet[repeaterId];
+            items = [];
+            oldTarget = eventInfo.targetElement;
+            for(var i = 0; i < currData.length; i++) {
+                var index = i + 1;
+                eventInfo.targetElement = _createElementId(repeaterId, index);
+                if($ax.expr.evaluateExpr(rule, eventInfo).toLowerCase() != 'true') continue;
+                items.push(index);
+            }
+            eventInfo.targetElement = oldTarget;
+        }
+
+        eventInfo.data = true;
+        for(var prop in propMap) {
+            if(!propMap.hasOwnProperty(prop)) continue;
+            for(i = 0; i < items.length; i++) {
+                var data = propMap[prop];
+                var item = items[i];
+                if(data.type == 'literal') {
+                    eventInfo.targetElement = _createElementId(repeaterId, item);
+                    data = $ax.expr.evaluateExpr(data.literal, eventInfo);
+                    if(typeof (data) == 'object' && data.isWidget) data = data.text;
+                    if(typeof (data) == 'string') data = { type: 'text', text: data };
+                }
+                dataSet[_getRealItemId(eventInfo, repeaterId, item)][prop] = data;
+            }
+        }
+        eventInfo.targetElement = oldTarget;
+        eventInfo.data = false;
+    };
+    _repeaterManager.updateEditItems = _updateEditItemsInDataSet;
+
+    var _getAllItemIds = function(repeaterId) {
+        var retval = [];
+        var currDataSet = repeaterToCurrentDataSet[repeaterId];
+        for(var i = 0; i < currDataSet.length; i++) retval.push(i + 1);
+        return retval;
+    };
+    _repeaterManager.getAllItemIds = _getAllItemIds;
+
+    var _addEditItemToRepeater = function(repeaterId, itemIds) {
+        for(var i = 0; i < itemIds.length; i++) {
+            var itemId = Number(itemIds[i]);
+            var items = repeaterToEditItems[repeaterId];
+            if(items.indexOf(itemId) == -1) items[items.length] = itemId;
+        }
+    };
+    _repeaterManager.addEditItems = _addEditItemToRepeater;
+
+    var _removeEditItemFromRepeater = function(repeaterId, itemIds) {
+        for(var i = 0; i < itemIds.length; i++) {
+            var itemId = itemIds[i];
+            var items = repeaterToEditItems[repeaterId];
+            var index = items.indexOf(Number(itemId));
+            if(index != -1) $ax.splice(items, index, 1);
+        }
+    };
+    _repeaterManager.removeEditItems = _removeEditItemFromRepeater;
+
+    _repeaterManager.isEditItem = function(repeaterId, itemId) {
+        var items = repeaterToEditItems[repeaterId];
+        return items.indexOf(Number(itemId)) != -1;
+    };
+
+    var _createElementId = function(scriptId, itemId) {
+        if(!itemId) return scriptId;
+        var i = scriptId.indexOf('_');
+        var sections = i > -1 ? [scriptId.substring(0, i), scriptId.substring(i + 1)] : [scriptId];
+        var retval = sections[0] + '-' + itemId;
+        return sections.length > 1 ? retval + '_' + sections[1] : retval;
+    };
+    _repeaterManager.createElementId = _createElementId;
+
+    var _getElementId = function(scriptId, childId) {
+        var elementId = scriptId;
+        if($ax.getParentRepeaterFromScriptId(scriptId)) {
+            // Must be in the same item as the child
+            var itemId = $ax.repeater.getItemIdFromElementId(childId);
+            elementId = $ax.repeater.createElementId(scriptId, itemId);
+        }
+        return elementId;
+    };
+    _repeaterManager.getElementId = _getElementId;
+
+    var _getScriptIdFromElementId = function(elementId) {
+        if(!elementId) return elementId;
+        var sections = elementId.split('-');
+        var retval = sections[0];
+        if(sections.length <= 1) return retval;
+        sections = sections[1].split('_');
+        return sections.length > 1 ? retval + '_' + sections[1] : retval;
+    };
+    _repeaterManager.getScriptIdFromElementId = _getScriptIdFromElementId;
+
+    var _getItemIdFromElementId = function(elementId) {
+        var sections = elementId.split('-');
+        if(sections.length < 2) return '';
+        sections = sections[1].split('_');
+        return sections[0];
+    };
+    _repeaterManager.getItemIdFromElementId = _getItemIdFromElementId;
+
+    // TODO: Just inline this if we keep it this way.
+    var _applySuffixToElementId = function(id, suffix) {
+        return id + suffix;
+        //        return _createElementId(_getScriptIdFromElementId(id) + suffix, _getItemIdFromElementId(id));
+    };
+    _repeaterManager.applySuffixToElementId = _applySuffixToElementId;
+
+    var _removeSuffixFromElementId = function (id) {
+        var suffixId = id.indexOf('_');
+        if(suffixId != -1) return id.substr(0, suffixId);
+
+        var partId = id.indexOf('p');
+        if(partId != -1) return _createElementId(id.substr(0, partId), _getItemIdFromElementId(id)); // item id is after part, but before suffix
+
+        return id;
+    }
+    _repeaterManager.removeSuffixFromElementId = _removeSuffixFromElementId;
+
+    //    var _getRepeaterSize = function(repeaterId) {
+    //        var itemCount = ($ax.getItemIdsForRepeater(repeaterId) || []).length;
+    //        if(itemCount == 0) return { width: 0, height: 0 };
+
+    //        var repeater = $obj(repeaterId);
+    //        // Width and height per item;
+    //        var width = repeater.width;
+    //        var height = repeater.height;
+
+    //        var viewId = $ax.adaptive.currentViewId || '';
+    //        var widthIncrement = width + _getAdaptiveProp(repeater.repeaterPropMap, 'horizontalSpacing', viewId);
+    //        var heightIncrement = height + _getAdaptiveProp(repeater.repeaterPropMap, 'verticalSpacing', viewId);
+
+    //        var wrap = _getAdaptiveProp(repeater.repeaterPropMap, 'wrap', viewId);
+    //        var vertical = _getAdaptiveProp(repeater.repeaterPropMap, 'vertical', viewId);
+
+    //        if(wrap == -1 || itemCount <= wrap) {
+    //            if(vertical) height += heightIncrement * (itemCount - 1);
+    //            else width += widthIncrement * (itemCount - 1);
+    //        } else {
+    //            var primaryDim = wrap;
+    //            var secondaryDim = Math.ceil(itemCount / primaryDim);
+
+    //            if(vertical) {
+    //                height += heightIncrement * (primaryDim - 1);
+    //                width += widthIncrement * (secondaryDim - 1);
+    //            } else {
+    //                width += widthIncrement * (primaryDim - 1);
+    //                height += heightIncrement * (secondaryDim - 1);
+    //            }
+    //        }
+    //        return { width: width, height: height };
+    //    };
+    //    _repeaterManager.getRepeaterSize = _getRepeaterSize;
+
+});
+
+// ******* Dynamic Panel Manager ******** //
+$axure.internal(function($ax) {
+    // TODO: Probably a lot of the dynamic panel functions from pagescript should be moved here at some point...
+    var _dynamicPanelManager = $ax.dynamicPanelManager = {};
+
+    var _isIdFitToContent = _dynamicPanelManager.isIdFitToContent = function(id) {
+        var obj = $obj(id);
+        if (!obj || !$ax.public.fn.IsDynamicPanel(obj.type) || !obj.fitToContent) return false;
+
+        var jpanel = $jobj(id);
+        return !jpanel.attr('data-notfit');
+    };
+
+    //this function fit parent panel, also check for parent layer or repeaters
+    var _fitParentPanel = function (widgetId) {
+
+        var parentLayer = getParentLayer(widgetId);
+        if(parentLayer) {
+            if(_updateLayerRectCache(parentLayer)) _fitParentPanel(parentLayer);
+            return;
+        }
+
+        // Find parent panel if there is one.
+        var parentPanelInfo = getParentPanel(widgetId);
+        if(parentPanelInfo) {
+            var parentId = parentPanelInfo.parent;
+            _updateMobileScroll(parentId, parentPanelInfo.stateId, true);
+            if(_updateFitPanel(parentId, parentPanelInfo.state)) _fitParentPanel(parentId);
+            return;
+        }
+
+        // Otherwise, try to get parent repeater
+        var parentRepeaterId = $ax.getParentRepeaterFromElementId(widgetId);
+        var repeaterObj = $obj(parentRepeaterId);
+        if (repeaterObj && widgetId != parentRepeaterId && repeaterObj.repeaterPropMap.fitToContent) {
+            var itemId = $ax.repeater.getItemIdFromElementId(widgetId);
+            var containerId = $ax.repeater.createElementId(parentRepeaterId, itemId);
+            var childrenRect = $ax('#' + containerId).childrenBoundingRect();
+            $ax.repeater.setItemSize(parentRepeaterId, itemId, childrenRect.right, childrenRect.bottom);
+            return;
+        }
+
+        $ax.adaptive.updateMobileScrollOnBody();
+    };
+    _dynamicPanelManager.fitParentPanel = _fitParentPanel;
+
+    var _updateMobileScroll = _dynamicPanelManager.updateMobileScroll = function (panelId, stateId, blockResetScroll) {
+        if (!panelId) return false;
+
+        // Only update scroll if panel is scrollable
+        if ($ax.dynamicPanelManager.isIdFitToContent(panelId)) return false;
+        var obj = $obj(panelId);
+        if (!obj || obj.scrollbars.toLowerCase() == 'none') return false;
+        
+        var stateQuery = $jobj(stateId);
+        $ax.adaptive.removeNiceScroll(stateQuery, blockResetScroll);
+        
+        //check if the page is in mobile mode
+        if(!$ax.adaptive.isDeviceMode() || MOBILE_DEVICE) {
+            stateQuery.css('cursor', '');
+            return false;
+        }
+
+        var stateContentId = stateId + '_content';
+        var childrenRect = $ax('#' + stateContentId).childrenBoundingRect();
+        var size = { width: childrenRect.right, height: childrenRect.bottom };
+
+        var $stateContent = $('#' + stateContentId);
+        $stateContent.css({ 'height': size.height + 'px', 'width': size.width + 'px' });
+
+        // Apply niceScroll and update cursor
+        if (obj.isExpo) {
+            var headerHeight = obj.headerHeight ? obj.headerHeight : 0;
+            var footerHeight = obj.footerHeight ? obj.footerHeight : 0;
+
+            $ax.adaptive.addNiceScroll(stateQuery, { emulatetouch: true, bouncescroll: false, grabcursorenabled: false, railmargin: { top: headerHeight, bottom: footerHeight }, scrollbarid: stateId + "-sb" });
+            stateQuery.find('.nicescroll-rails').css('margin-top', headerHeight + 'px');
+        } else {
+            $ax.adaptive.addNiceScroll(stateQuery, { emulatetouch: true, horizrailenabled: obj.scrollbars != 'verticalAsNeeded' }, blockResetScroll);
+        }
+        
+        stateQuery.css('cursor', 'url(resources/css/images/touch.cur), auto');
+        stateQuery.css('cursor', 'url(resources/css/images/touch.svg) 32 32, auto');
+    }
+
+    _dynamicPanelManager.initMobileScroll = function () {
+        var scrollable = [];
+        $ax('*').each(function (obj, elementId) {
+            var scriptId = $ax.repeater.getScriptIdFromElementId(elementId);
+            if ($ax.public.fn.IsDynamicPanel(obj.type) && obj.scrollbars != 'None' && obj.scrollbars != 'none' && !$ax.visibility.isElementIdLimboOrInLimboContainer(scriptId)) {
+                scrollable[scrollable.length] = elementId;
+            }
+        });
+        for (var i = scrollable.length - 1; i >= 0; i--) {
+            var panelId = scrollable[i];
+            var stateId = $ax.repeater.applySuffixToElementId(panelId, '_state0');
+            _updateMobileScroll(panelId, stateId, true);
+        }
+    };
+    
+
+    _dynamicPanelManager.initialize = function() {
+        $axure.resize(_handleResize);
+        $(window).scroll(_handleScroll);
+    };
+
+    var percentPanelToLeftCache = [];
+    var percentPanelsInitialized = false;
+    var _handleResize = function() {
+        if(percentPanelsInitialized) {
+            for(var key in percentPanelToLeftCache) {
+                //could optimize to only update non-contained panels
+                _updatePanelPercentWidth(key);
+            }
+        } else {
+            $ax('*').each(function(obj, elementId) {
+                if(_isPercentWidthPanel(obj)) _updatePanelPercentWidth(elementId);
+            });
+            percentPanelsInitialized = true;
+        }
+        _adjustFixedCenter();
+    };
+
+    var _isPercentWidthPanel = _dynamicPanelManager.isPercentWidthPanel = function(obj) {
+        return obj && $ax.public.fn.IsDynamicPanel(obj.type) && obj.percentWidth;
+    };
+
+    _dynamicPanelManager.updatePanelContentPercentWidth = function(elementId) {
+        //        if(_isPercentWidthPanel($obj(elementId))) return;
+        var stateChildrenQuery = $jobj(elementId).children('.panel_state');
+        stateChildrenQuery.children('.panel_state_content').each(
+            function() {
+                $(this).children('.ax_dynamic_panel').each(
+                    function() { _updatePanelPercentWidth(this.id); }
+                );
+            }
+        );
+    };
+
+    _dynamicPanelManager.updatePercentPanelCache = function(query) {
+        query.each(function(obj, elementId) {
+            if(_isPercentWidthPanel(obj)) {
+                if(_updatePercentPanelToLeftCache(obj, elementId, true)) {
+                    _updatePanelPercentWidth(elementId);
+                }
+            }
+        });
+    };
+
+    var _handleScroll = function () {
+        _adjustFixedCenter();
+    };
+
+    var fixedCenterPanels = [];
+    var fixedCenterPanelsInitialized = false;
+
+    var _adjustFixedCenter = function () {
+
+        if (!fixedCenterPanelsInitialized) {
+            $axure(function(diagramObject) {
+                     return diagramObject.fixedHorizontal && diagramObject.fixedHorizontal == 'center' && !diagramObject.percentWidth;
+                })
+                .each(function (diagramObject, elementId) {
+                    fixedCenterPanels.push(elementId);
+                });
+            fixedCenterPanelsInitialized = true;
+        }
+
+        for (var i = 0; i < fixedCenterPanels.length; i++) {
+            var elementId = fixedCenterPanels[i];
+            var boundingRect = $ax('#' + elementId).offsetBoundingRect();
+            var left = boundingRect.left;
+
+            var win = $(window);
+            var winWidth = win.width();
+            var elementQuery = $('#' + elementId);
+
+            if (left >= 0 && winWidth >= boundingRect.width) {
+                elementQuery.css('left', '50%');
+                continue;
+            }
+
+            var leftMargin = $ax.getNumFromPx(elementQuery.css('margin-left'));
+            var newLeft = -leftMargin;
+            elementQuery.css('left', newLeft + 'px');
+        }
+    };
+
+    _dynamicPanelManager.resetFixedPanel = function(obj, domElement) {
+        if(obj.fixedHorizontal == 'center') domElement.style.marginLeft = "";
+        if(obj.fixedVertical == 'middle') domElement.style.marginTop = "";
+    };
+
+    _dynamicPanelManager.resetAdaptivePercentPanel = function(obj, domElement) {
+        if(!_isPercentWidthPanel(obj)) return;
+
+        if(obj.fixedHorizontal == 'center') domElement.style.marginLeft = "";
+        else if(obj.fixedHorizontal == 'right') domElement.style.width = "";
+    };
+
+    var _updatePercentPanelToLeftCache = function(obj, elementId, overwrite) {
+        var wasUpdated = false;
+        var jObj = $jobj(elementId);
+        var axObj = $ax('#' + elementId);
+        if(percentPanelToLeftCache[elementId] == undefined || overwrite) {
+            if (obj.fixedHorizontal == 'center') percentPanelToLeftCache[elementId] = $ax.getNumFromPx(jObj.css('margin-left'));
+            else if (obj.fixedHorizontal == 'right') percentPanelToLeftCache[elementId] = axObj.width() + $ax.getNumFromPx(jObj.css('right'));
+            else percentPanelToLeftCache[elementId] = $ax.getNumFromPx(jObj.css('left'));
+            wasUpdated = true;
+        }
+
+        if(obj.fixedHorizontal == 'right' && _isIdFitToContent(elementId)) {
+            //var fitWidth = getContainerSize($ax.visibility.GetPanelState(elementId) + '_content').width;
+            var containerId = $ax.visibility.GetPanelState(elementId) + '_content';
+            var childrenRect = $ax('#' + containerId).childrenBoundingRect();
+            var fitWidth = childrenRect.right;
+            percentPanelToLeftCache[elementId] = fitWidth + $ax.getNumFromPx(jObj.css('right'));
+            wasUpdated = true;
+        }
+        return wasUpdated;
+    };
+
+    var _updatePanelPercentWidth = _dynamicPanelManager.updatePanelPercentWidth = function(elementId) {
+        var obj = $obj(elementId);
+        if(!_isPercentWidthPanel(obj)) return;
+
+        _updatePercentPanelToLeftCache(obj, elementId, false);
+
+        var width;
+        var x;
+
+        if(obj.fixedHorizontal) {
+            x = 0;
+            width = $(window).width();
+        } else {
+            var parentPanelInfo = getParentPanel(elementId);
+            if(parentPanelInfo) {
+                var parentId = parentPanelInfo.parent;
+                width = $ax('#' + parentId).width();
+                var parentObj = $obj(parentId);
+                if(parentObj.percentWidth) {
+                    var stateId = $ax.repeater.applySuffixToElementId(parentId, '_state' + parentPanelInfo.state);
+                    var stateContentId = stateId + '_content';
+                    x = -$ax.getNumFromPx($jobj(stateContentId).css('margin-left'));
+                } else x = 0;
+            } else {
+                var parentRepeater = $ax.getParentRepeaterFromScriptId($ax.repeater.getScriptIdFromElementId(elementId));
+                if(parentRepeater) {
+                    var itemId = $ax.repeater.getItemIdFromElementId(elementId);
+                    var itemContainerId = $ax.repeater.createElementId(parentRepeater, itemId);
+                    x = 0;
+                    width = $ax('#' + itemContainerId).width();
+                } else {
+                    var $window = $(window);
+                    width = $window.width();
+                    var bodyLeft = $ax.getNumFromPx($('body').css('left'));
+                    var bodyWidth = $ax.getNumFromPx($('body').css('width'));
+                    var isCenter = $ax.adaptive.getPageStyle().pageAlignment == 'center';
+                    width = Math.max(width, bodyWidth);
+                    x = isCenter ? -(width - bodyWidth) / 2 - bodyLeft : 0;
+                }
+            }
+        }
+
+        var jObj = $jobj(elementId);
+        if(obj.fixedHorizontal == 'left') jObj.css('left', x + 'px');
+        else if(obj.fixedHorizontal == 'center') {
+            jObj.css('left', x + 'px');
+            jObj.css('margin-left', 0 + 'px');
+        } else jObj.css('left', x + 'px');
+
+        jObj.css('width', width + 'px');
+
+        $ax.visibility.setResizedSize(elementId, width, $ax('#' + elementId).height());
+        
+        var panelLeft = percentPanelToLeftCache[elementId];
+        var stateParent = jObj;
+        while(stateParent.children()[0].id.indexOf($ax.visibility.CONTAINER_SUFFIX) != -1) stateParent = stateParent.children();
+        var stateChildrenQuery = stateParent.children('.panel_state');
+        stateChildrenQuery.css('width', width + 'px');
+
+        if(obj.fixedHorizontal == 'center')
+            stateChildrenQuery.children('.panel_state_content').css('left', '50%').css('margin-left', panelLeft + 'px');
+        else if(obj.fixedHorizontal == 'right')
+            stateChildrenQuery.children('.panel_state_content').css('left', width - panelLeft + 'px');
+        else stateChildrenQuery.children('.panel_state_content').css('margin-left', panelLeft - x + 'px');
+    };
+
+
+    _dynamicPanelManager.updateParentsOfNonDefaultFitPanels = function () {
+        $ax('*').each(function (diagramObject, elementId) {
+            if(!$ax.public.fn.IsDynamicPanel(diagramObject.type) || !diagramObject.fitToContent) return;
+            if($ax.visibility.isElementIdLimboOrInLimboContainer(elementId)) return;
+
+            var stateId = $ax.visibility.GetPanelState(elementId);
+            if(stateId != $ax.repeater.applySuffixToElementId(elementId, '_state0')) _fitParentPanel(elementId);
+        });
+    };
+
+    _dynamicPanelManager.updateAllLayerSizeCaches = function() {
+        var fitToContent = [];
+        var layers = [];
+        $ax('*').each(function (obj, elementId) {
+            var isLayer = $ax.public.fn.IsLayer(obj.type);
+            if(!isLayer) return;
+            if($ax.visibility.isElementIdLimboOrInLimboContainer(elementId)) return;
+            layers[layers.length] = elementId;
+        });
+        for(var i = layers.length - 1; i >= 0; i--) {
+            var layerId = layers[i];
+            _updateLayerRectCache(layerId);
+        }
+    };
+
+    //_dynamicPanelManager.updateAllFitPanelsAndLayerSizeCaches = function() {
+    //    var fitToContent = [];
+    //    var layers = [];
+    //    $ax('*').each(function (obj, elementId) {
+    //        var isFitPanel = $ax.public.fn.IsDynamicPanel(obj.type) && obj.fitToContent;
+    //        var isLayer = $ax.public.fn.IsLayer(obj.type);
+    //        if(!isFitPanel && !isLayer) return;
+    //        if($ax.visibility.isElementIdLimboOrInLimboContainer(elementId)) return;
+
+    //        if(isFitPanel) {
+    //            fitToContent[fitToContent.length] = elementId;
+    //        } else if(isLayer) {
+    //            layers[layers.length] = elementId;
+    //        }
+    //    });
+    //    for(var i = fitToContent.length - 1; i >= 0; i--) {
+    //        var panelId = fitToContent[i];
+    //        var stateCount = $obj(panelId).diagrams.length;
+    //        for(var j = 0; j < stateCount; j++) {
+    //            $ax.dynamicPanelManager.setFitToContentCss(panelId, true);
+    //            _updateFitPanel(panelId, j, true);
+    //        }
+    //    }
+    //    for(var i = layers.length - 1; i >= 0; i--) {
+    //        var layerId = layers[i];
+    //        _updateLayerSizeCache(layerId);
+    //    }
+    //};
+
+    //var _getCachedLayerRect = function (elementId) {
+    //    var element = document.getElementById(elementId);
+    //    var rect = {};
+    //    rect.width = Number(element.getAttribute('data-width'));
+    //    rect.height = Number(element.getAttribute('data-height'));
+    //    rect.x = Number(element.getAttribute('data-left'));
+    //    rect.y = Number(element.getAttribute('data-top'));
+    //    return rect;
+    //}
+
+    var _updateLayerRectCache = function (elementId) {
+        //var oldRect = _getCachedLayerRect(elementId);
+
+        var axObj = $ax('#' + elementId);
+        var oldRect = axObj.offsetBoundingRect();
+
+        var childrenRect = axObj.childrenBoundingRect();
+        var size = childrenRect.size;
+        var loc = childrenRect.location;
+        //var size = axObj.size();
+        //var loc = {};
+        //loc.x = axObj.locRelativeIgnoreLayer(false);
+        //loc.y = axObj.locRelativeIgnoreLayer(true);
+        
+        var sizeChange = oldRect.width != size.width || oldRect.height != size.height;
+        var locChange = oldRect.x != loc.x || oldRect.y != loc.y;
+        if(sizeChange || locChange) {
+            //var element = document.getElementById(elementId);
+            if(sizeChange) {
+                //element.setAttribute('data-width', size.width);
+                //element.setAttribute('data-height', size.height);
+                $ax.visibility.setResizedSize(elementId, size.width, size.height);
+                $ax.event.raiseSyntheticEvent(elementId, 'onResize');
+            }
+            if(locChange) {
+                //element.setAttribute('data-left', loc.x);
+                //element.setAttribute('data-top', loc.y);
+                $ax.visibility.setMovedLocation(elementId, loc.x, loc.y);
+                $ax.event.raiseSyntheticEvent(elementId, 'onMove');
+            }
+            return true;
+        }
+        return false;
+    }
+
+    _dynamicPanelManager.setFitToContentCss = function(elementId, fitToContent, oldWidth, oldHeight) {
+
+        if($ax.dynamicPanelManager.isIdFitToContent(elementId) == fitToContent) return;
+
+        var panel = $jobj(elementId);
+        var stateCss;
+        var scrollbars = $obj(elementId).scrollbars;
+
+        if(fitToContent) {
+            panel.attr('style', '');
+            panel.removeAttr('data-notfit');
+            stateCss = {};
+            stateCss.position = 'relative';
+            if(scrollbars != 'none') {
+                stateCss.overflow = 'visible';
+                stateCss['-webkit-overflow-scrolling'] = 'visible';
+            }
+            if(scrollbars == 'verticalAsNeeded') {
+                stateCss['overflow-x'] = 'visible';
+                stateCss['-ms-overflow-x'] = 'visible';
+            } else if(scrollbars == 'horizontalAsNeeded') {
+                stateCss['overflow-y'] = 'visible';
+                stateCss['-ms-overflow-y'] = 'visible';
+            }
+            panel.children().css(stateCss);
+        } else {
+            panel.attr('data-notfit', 'true');
+            var panelCss = { width: oldWidth, height: oldHeight };
+            stateCss = { width: oldWidth, height: oldHeight };
+            panelCss.overflow = 'hidden';
+            stateCss.position = 'absolute';
+            if(scrollbars != 'none') {
+                stateCss.overflow = 'auto';
+                stateCss['-webkit-overflow-scrolling'] = 'touch';
+            }
+            if(scrollbars == 'verticalAsNeeded') {
+                stateCss['overflow-x'] = 'hidden';
+                stateCss['-ms-overflow-x'] = 'hidden';
+            } else if(scrollbars == 'horizontalAsNeeded') {
+                stateCss['overflow-y'] = 'hidden';
+                stateCss['-ms-overflow-y'] = 'hidden';
+            }
+            panel.css(panelCss);
+            panel.children().css(stateCss);
+        }
+    };
+
+    var _getShownStateId = function (id) {
+        var obj = $obj(id);
+        if (!obj || !$ax.public.fn.IsDynamicPanel(obj.type)) return id;
+
+        var children = $ax.visibility.applyWidgetContainer(id, true, false, true).children();
+        for (var i = 0; i < children.length; i++) {
+            var child = children[i];
+            while ($ax.visibility.isContainer(child.id)) child = $(child).children()[0];
+            if (child && child.style && child.style.display != 'none') return child.id;
+        }
+        return id;
+    };
+
+    var _getShownStateObj = function(id) { return $ax('#' + _getShownStateId(id));}
+
+    _dynamicPanelManager.getShownState = function (id) { return $jobj(_getShownStateId(id)); };
+
+    var _getClamp = function(id) {
+        var obj = $obj(id);
+        if(!obj) return $ax('#' + id);
+        if ($ax.public.fn.IsDynamicPanel(obj.type)) return _getShownStateObj(id);
+        return $ax('#' + id);
+    };
+
+    var _updateFitPanel = function(panelId, stateIndex) {
+        if(!panelId) return false;
+
+        // Only fit if fitToContent is true
+        if(!$ax.dynamicPanelManager.isIdFitToContent(panelId)) return false;
+
+        // Traverse through children to find what size it should be.
+        var stateId = $ax.repeater.applySuffixToElementId(panelId, '_state' + stateIndex);
+
+        var stateContentId = stateId + '_content';
+        var stateQuery = $jobj(stateId);
+
+        //var size = getContainerSize(stateContentId);
+        var childrenRect = $ax('#' + stateContentId).childrenBoundingRect();
+        var size = {width: childrenRect.right, height: childrenRect.bottom};
+        
+        // Skip if size hasn't changed
+        var oldWidth = stateQuery.width();
+        var oldHeight = stateQuery.height();
+        if(oldWidth == size.width && oldHeight == size.height) return false;
+
+        var isPercentWidth = $obj(panelId).percentWidth;
+        if(!isPercentWidth) stateQuery.width(size.width);
+        stateQuery.height(size.height);
+
+        //updatePercentWidth on all child panels
+        $jobj(stateContentId).children('.ax_dynamic_panel').each(
+            function() { _updatePanelPercentWidth(this.id); }
+        );
+
+        //do the following only if it is the current state
+        if(stateId != $ax.visibility.GetPanelState(panelId)) return false;
+
+        //var panelQuery = $jobj(panelId);
+        //if (!isPercentWidth) panelQuery.attr('data-width', size.width);
+        //panelQuery.attr('data-height', size.height);
+        $ax.visibility.setResizedSize(panelId, isPercentWidth ? $ax('#' + panelId).width() : size.width, size.height);
+
+        _adjustFixed(panelId, oldWidth, oldHeight, size.width, size.height);
+        
+        $ax.event.raiseSyntheticEvent(panelId, 'onResize');
+        $ax.flyoutManager.updateFlyout(panelId);
+
+        return true;
+    };
+
+    // widgetId is the one that crawls up masters until it finds a parent panel, targetId is the original widgetId (not the crawling master)
+    // finds the immediate parent panel and crawls up through masters but not repeaters 
+    var getParentPanel = function(widgetId, path, targetId) {
+        path = path || $ax.getPathFromScriptId($ax.repeater.getScriptIdFromElementId(widgetId));
+
+        var obj = $obj(widgetId);
+        if(obj.parentDynamicPanel) {
+            path[path.length - 1] = obj.parentDynamicPanel;
+            var parentId = $ax.getScriptIdFromPath(path);
+            if(!parentId) return undefined;
+            parentId = $ax.repeater.getElementId(parentId, widgetId);
+            var parentObj = $obj(parentId);
+            var retVal = { parent: parentId };
+            for(var i = 0; i < parentObj.diagrams.length; i++) {
+                var stateId = $ax.repeater.applySuffixToElementId(parentId, '_state' + i);
+                var stateQuery = $jobj(stateId);
+                if(stateQuery.find('#' + (targetId || widgetId)).length != 0) {
+                    retVal.state = i;
+                    retVal.stateId = stateId;
+                    break;
+                }
+            }
+            return retVal;
+        }
+
+        if(path.length == 1) return undefined;
+
+        path.pop();
+        var parentMaster = $ax.getScriptIdFromPath(path);
+        if(!parentMaster) return undefined;
+        parentMaster = $ax.repeater.getElementId(parentMaster, widgetId);
+
+        //check if the master is in the same repeater as the widgetId widget
+        var parentMasterItemId = $ax.repeater.getItemIdFromElementId(parentMaster);
+        var widgetItemId = $ax.repeater.getItemIdFromElementId(widgetId);
+        if(parentMasterItemId != widgetItemId) return undefined;
+
+        return getParentPanel(parentMaster, path, targetId || widgetId);
+    };
+
+    // finds the immediate parent layer and crawls up through masters but not repeaters or panels
+    var getParentLayer = function (widgetId, path) {
+        path = path || $ax.getPathFromScriptId($ax.repeater.getScriptIdFromElementId(widgetId));
+
+        //gets immediate parent layer only
+        var layerId = $ax.getLayerParentFromElementId(widgetId);
+        if(layerId) return layerId;
+
+        if(path.length == 1) return undefined;
+
+        path.pop();
+        var parentMaster = $ax.getScriptIdFromPath(path);
+        if(!parentMaster) return undefined;
+        parentMaster = $ax.repeater.getElementId(parentMaster, widgetId);
+
+        //check if the master is in the same panel as the widgetId widget
+        var widgetParentPanel = getParentPanel(widgetId);
+        if(widgetParentPanel) {
+            var parentMasterParentPanel = getParentPanel(parentMaster);
+            if(!parentMasterParentPanel || widgetParentPanel.parent != parentMasterParentPanel.parent) return undefined;
+        }
+
+        //check if the master is in the same repeater as the widgetId widget
+        var parentMasterItemId = $ax.repeater.getItemIdFromElementId(parentMaster);
+        var widgetItemId = $ax.repeater.getItemIdFromElementId(widgetId);
+        if(parentMasterItemId != widgetItemId) return undefined;
+
+        return getParentLayer(parentMaster, path);
+    };
+
+    //// TODO: May be a better location for this. Used currently for rdo and panel state containers
+    //var getContainerSize = function(containerId) {
+    //    var containerQuery = containerId ? $jobj(containerId) : $('#base');
+    //    var children = containerQuery.children();
+    //    // Default size
+    //    var size = { width: 0, height: 0 };
+    //    for(var i = 0; i < children.length; i++) {
+    //        var child = $(children[i]);
+    //        var childId = child.attr('id');
+    //        //var axChild = $ax('#' + childId).width();
+
+    //        var childObj = $obj(childId);
+    //        if(!childObj) {
+    //            // On the body there are some children that should be ignored, as they are not objects.
+    //            if(!child.hasClass('basiclink') || child.get(0).tagName.toLowerCase() != 'a') continue;
+
+    //            // Otherwise it should be a basic link
+    //            var linkChildren = child.children();
+    //            if(!linkChildren.length) continue;
+    //            child = $(linkChildren[0]);
+    //            childId = child.attr('id');
+    //            childObj = $obj(childId);
+    //        }
+
+    //        // Ignore fixed
+    //        if(!childId || $ax.visibility.limboIds[childId] || !$ax.visibility.IsIdVisible(childId)
+    //            || $ax.public.fn.IsDynamicPanel(childObj.type) && childObj.fixedHorizontal) continue;
+
+    //        var boundingRect = $ax.public.fn.getWidgetBoundingRect(childId);
+    //        var position = { left: boundingRect.left, top: boundingRect.top };
+    //        var width = boundingRect.width;
+    //        var height = boundingRect.height;
+
+    //        if($ax.public.fn.IsMaster(childObj.type)) {
+    //            var masterSize = getContainerSize(childId);
+    //            width = masterSize.width;
+    //            height = masterSize.height;
+    //            //            } else if($ax.public.fn.IsRepeater(childObj.type)) {
+    //            //                var repeaterSize = $ax.repeater.getRepeaterSize(childId);
+    //            //                width = repeaterSize.width;
+    //            //                height = repeaterSize.height;
+
+    //            //                if(width == 0 && height == 0) continue;
+
+    //            //                position.left += childObj.x;
+    //            //                position.top += childObj.y;
+    //        } else if ($ax.public.fn.IsDynamicPanel(childObj.type)) {
+    //            if($ax.dynamicPanelManager.isIdFitToContent(childId)) {
+    //                var stateQuery = $jobj($ax.visibility.GetPanelState(childId));
+    //                width = stateQuery.width();
+    //                height = stateQuery.height();
+    //            }
+    //        }
+
+    //        size.width = Math.max(size.width, position.left + width);
+    //        size.height = Math.max(size.height, position.top + height);
+    //    }
+
+    //    return size;
+    //};
+    //_dynamicPanelManager.getContainerSize = getContainerSize;
+
+    var _adjustFixed = _dynamicPanelManager.adjustFixed = function(panelId, oldWidth, oldHeight, width, height) {
+        var loc = _getFixedPosition(panelId, oldWidth, oldHeight, width, height);
+        if(loc) {
+            $ax.action.addAnimation(panelId, $ax.action.queueTypes.move, function() {
+                $ax.move.MoveWidget(panelId, loc[0], loc[1], { easing: 'none', duration: 0 }, false, null, true);
+            });
+        }
+    };
+
+    var _getFixedPosition = _dynamicPanelManager.getFixedPosition = function(panelId, oldWidth, oldHeight, width, height) {
+        var panelObj = $obj(panelId);
+        var x = 0;
+        var y = 0;
+        if(panelObj.fixedHorizontal == 'center') {
+            x = (oldWidth - width) / 2;
+        }
+        if(panelObj.fixedVertical == 'middle') {
+            y = (oldHeight - height) / 2;
+        }
+        return x == 0 && y == 0 ? undefined : [x, y];
+    };
+
+    _dynamicPanelManager.getFixedInfo = function(panelId) {
+        var panelObj = $obj(panelId);
+        if (!panelObj || !$ax.public.fn.IsDynamicPanel(panelObj.type)) return {};
+        var jobj = $jobj(panelId);
+        if(jobj.css('position') == 'absolute') return {};
+
+        var info = {};
+        var horizontal = panelObj.fixedHorizontal;
+        if(!horizontal) return info;
+
+        info.fixed = true;
+        info.horizontal = horizontal;
+        info.vertical = panelObj.fixedVertical;
+
+        if (info.horizontal == 'left') info.x = $ax.getNumFromPx(jobj.css('left'));
+        else if (info.horizontal == 'center') info.x = $ax.getNumFromPx(jobj.css('margin-left'));
+        else if (info.horizontal == 'right') info.x = $ax.getNumFromPx(jobj.css('right'));
+
+        if (info.vertical == 'top') info.y = $ax.getNumFromPx(jobj.css('top'));
+        else if (info.vertical == 'middle') info.y = $ax.getNumFromPx(jobj.css('margin-top'));
+        else if (info.vertical == 'bottom') info.y = $ax.getNumFromPx(jobj.css('bottom'));
+
+        return info;
+    };
+
+    // Show isn't necessary if this is always done before toggling (which is currently true), but I don't want that
+    //  change (if it happened) to break this.
+    var _compressToggle = function (id, vert, show, easing, duration) {
+        var layer = $ax.getTypeFromElementId(id) == $ax.constants.LAYER_TYPE;
+        var locProp = vert ? 'top' : 'left';
+        var dimProp = vert ? 'height' : 'width';
+
+        var threshold;
+        var delta;
+
+        threshold = $ax('#' + id)[locProp](true);
+        delta = layer ? $ax('#' + id)[dimProp]() : _getShownStateObj(id)[dimProp]();
+
+        if(!show) {
+            // Need to make threshold bottom/right
+            threshold += delta;
+            // Delta is in the opposite direction
+            delta *= -1;
+        }
+
+        _compress(id, vert, threshold, delta, easing, duration);
+    };
+    _dynamicPanelManager.compressToggle = _compressToggle;
+
+    // Used when setting state of dynamic panel
+    var _compressDelta = function(id, oldState, newState, vert, easing, duration) {
+        var oldQuery = $jobj(oldState);
+        var newQuery = $jobj(newState);
+
+        var thresholdProp = vert ? 'top' : 'left';
+        var thresholdOffset = vert ? 'height' : 'width';
+        var threshold = $ax('#' + id)[thresholdProp](true);
+        threshold += oldQuery[thresholdOffset]();
+
+        var delta = newQuery[thresholdOffset]() - oldQuery[thresholdOffset]();
+
+        var clampOffset = vert ? 'width' : 'height';
+        var clampWidth = Math.max(oldQuery[clampOffset](), newQuery[clampOffset]());
+         
+        _compress(id, vert, threshold, delta, easing, duration, clampWidth);
+    };
+    _dynamicPanelManager.compressDelta = _compressDelta;
+
+    var _compress = function (id, vert, threshold, delta, easing, duration, clampWidth) {
+        // If below, a horizantal clamp, otherwise a vertical clamp
+        var clamp = {
+            prop: vert ? 'left' : 'top',
+            offset: vert ? 'width' : 'height'
+        };
+
+        // Get clamp in coords relative to parent. Account for layers farther down
+        if($ax.getTypeFromElementId(id) == $ax.constants.LAYER_TYPE) {
+            clamp.start = $ax('#' + id)[clamp.prop](true);
+            clamp.end = clamp.start + $ax('#' + id)[clamp.offset]();
+        } else {
+            var clampLoc = $jobj(id);
+            if(typeof clampWidth == 'undefined') clampWidth = _getClamp(id)[clamp.offset]();
+
+            clamp.start = $ax.getNumFromPx(clampLoc.css(clamp.prop));
+            clamp.end = clamp.start + clampWidth;
+        }
+
+        // If clamps, threshold, or delta is not a number, can't compress.
+        if (isNaN(clamp.start) || isNaN(clamp.end) || isNaN(threshold) || isNaN(delta)) return;
+
+        // Update clamp if fixed, to account for body position (only necessary when page centered)
+        if($jobj(id).css('position') == 'fixed') {
+            var clampDelta = $('#base').position().left;
+            clamp.start -= clampDelta;
+            clamp.end -= clampDelta;
+        }
+
+        if(!easing) {
+            easing = 'none';
+            duration = 0;
+        }
+        var parent = $ax('#' + id).getParents(false, ['item', 'state', 'layer'])[0];
+        var obj = parent && $ax.getObjectFromElementId($ax.repeater.removeSuffixFromElementId(parent));
+        // Go until you hit a parent item or state, or a layer that is hidden to use as parent.
+        // Account for layer container positions as you go.
+        while(obj && $ax.public.fn.IsLayer(obj.type) && $ax.visibility.IsIdVisible(parent)) {
+            var container = $ax.visibility.applyWidgetContainer(parent, true, true);
+            // If layer is using container, offset is going to be necessary
+            if(container.length) {
+                var offsetX = $ax.getNumFromPx(container.css('left'));
+                var offsetY = $ax.getNumFromPx(container.css('top'));
+                var clampProp = clamp.prop == 'left' ? offsetX : offsetY;
+                var threshProp = clamp.prop == 'left' ? offsetY : offsetX;
+                threshold += threshProp;
+                clamp.start += clampProp;
+                clamp.end += clampProp;
+            }
+
+            parent = $ax('#' + parent).getParents(false, ['item', 'state', 'layer'])[0];
+            obj = parent && $ax.getObjectFromElementId($ax.repeater.removeSuffixFromElementId(parent));
+        }
+
+        // Add container mid push causes strange behavior because we take container into account as we go down, but if after we accounted for it,
+        //  a container is added, that container is not accounted for with threshold and clamp values.
+        var layer = obj && $ax.public.fn.IsLayer(obj.type) && parent;
+        if(layer) {
+            // If your parent layer is invisible, you want to be relative to it's container. That is true already if it has a container,
+            //  but if you are just adding one now, then you need to offset your values
+            var needsOffset = !$jobj(layer + '_container').length && !$ax.visibility.IsIdVisible(layer);
+            $ax.visibility.pushContainer(layer, false);
+            if(needsOffset) {
+                container = $jobj(layer + '_container');
+                offsetX = $ax.getNumFromPx(container.css('left'));
+                offsetY = $ax.getNumFromPx(container.css('top'));
+                clampProp = clamp.prop == 'left' ? offsetX : offsetY;
+                threshProp = clamp.prop == 'left' ? offsetY : offsetX;
+                threshold -= threshProp;
+                clamp.start -= clampProp;
+                clamp.end -= clampProp;
+            }
+        }
+
+        var scrollParentObj = parent ? $('#' + parent) : undefined;
+        var parentScrollLeft = parent ? scrollParentObj.scrollLeft() : 0;
+        var parentScrollTop = parent ? scrollParentObj.scrollTop() : 0;
+
+        // Note: If parent is body, some of these aren't widgets
+        if(parent && $jobj(parent + '_content').length > 0) parent = parent + '_content';
+        if(parent && $jobj(parent + '_container').length > 0) parent = parent + '_container';
+
+        var windowObj = $(window);
+        var scrollLeft = windowObj.scrollLeft();
+        var scrollTop = windowObj.scrollTop();
+        var parentObj = $(parent ? '#' + parent : '#base');
+        // hide parent to prevent layout thrashing 
+        parentObj.hide();
+
+        _compressChildrenHelper(id, parentObj.children(), vert, threshold, delta, clamp, easing, duration);
+
+        parentObj.show();
+        // restore scroll if hide/show parent caused it to change
+        if(0 != parentScrollLeft) scrollParentObj.scrollLeft(parentScrollLeft);
+        if(0 != parentScrollTop) scrollParentObj.scrollTop(parentScrollTop);
+        if(windowObj.scrollLeft() != scrollLeft) windowObj.scrollLeft(scrollLeft);
+        if(windowObj.scrollTop() != scrollTop) windowObj.scrollTop(scrollTop);
+
+        if(layer) $ax.visibility.popContainer(layer, false);
+
+        // Do item push
+        var itemId = $ax.repeater.getItemIdFromElementId(id);
+        if(!itemId) return;
+
+        var repeaterId = $ax.getParentRepeaterFromElementId(id);
+        // Only need to push when parent is an item directly.
+        if(parent != $ax.repeater.createElementId(repeaterId, itemId)) return;
+        
+        // If repeater is fit to content, then don't worry about it, it'll be handled elsewhere
+        if(!obj.repeaterPropMap.fitToContent) $ax.repeater.pushItems(repeaterId, itemId, delta, vert);
+    };
+
+    var _layerMayNeedCompress = function (layerId, vert, threshold, clamp, parentLayer) {
+        var boundingRect = $ax('#' + layerId).offsetBoundingRect();
+        var marker, layerClamp;
+
+        marker = (vert ? boundingRect.top : boundingRect.left) + (vert ? boundingRect.height : boundingRect.width);
+        layerClamp = clamp.prop == 'left' ? [boundingRect.left] : [boundingRect.top];
+        layerClamp[1] = layerClamp[0] + (clamp.offset == 'width' ? boundingRect.width : boundingRect.height);
+
+        if (parentLayer) {
+            var axParent = $ax('#' + parentLayer);
+            marker -= Number(axParent[vert ? 'top' : 'left'](true));
+            layerClamp[0] -= Number(axParent[clamp.prop](true));
+        }
+
+        if (isNaN(marker) || isNaN(layerClamp[0]) || isNaN(layerClamp[1]) ||
+            marker < threshold || layerClamp[1] <= clamp.start || layerClamp[0] >= clamp.end) {
+            return false;
+        }
+        return true;
+    }
+
+    var _compressChildrenHelper = function (id, children, vert, threshold, delta, clamp, easing, duration, parentLayer) {
+        var toMove = [];
+        var allMove = true;
+        for (var i = 0; i < children.length; i++) {
+            var child = $(children[i]);
+
+            // Check for basic links
+            if(child[0] && child[0].tagName == 'A' && child.hasClass('basiclink')) child = child.children();
+            var childId = child.attr('id');
+
+            // TODO: Played with this a lot, went with a safer fix, but I don't like the catch all with !$obj(childId), should handle these cases explicitally.
+            //       ann/ref suffixes should skip without turning off allMove, lightbox should be skipped, and is unclear if allMove should be turned off, I think others including container, inner_container, div, img, and text should not be hit ever.
+            // Don't move self, and check id to make sure it a widget and not a fixed panel
+            if(childId == id || !childId || childId[0] != 'u' || !$obj(childId) || $obj(childId).fixedVertical) {
+                // ann/ref widgets should not stop allMove, they move if their widget does, and that widget will be checked and turn this off if it doesn't move
+                var suffix = childId && childId.split('_')[1];
+                allMove = allMove && (suffix == 'ann' || suffix == 'ref');
+                continue;
+            }
+
+            if ($ax.getTypeFromElementId(childId) == $ax.constants.LAYER_TYPE) {
+                // containerizing children can cause layout thrashing, if no children will possibly need to be moved based on layer position/size then don't do it
+                if (!_layerMayNeedCompress(childId, vert, threshold, clamp, parentLayer)) {
+                    allMove = false;
+                    continue;
+                }
+
+                $ax.visibility.pushContainer(childId, false);
+                var addSelf;
+                var container = $ax.visibility.applyWidgetContainer(childId, true, true);
+                var layerChildren = (container.length ? container : child).children();
+                //if(container.length) {
+                var offsetX = -$ax.getNumFromPx(container.css('left'));
+                var offsetY = -$ax.getNumFromPx(container.css('top'));
+                var clampProp = clamp.prop == 'left' ? offsetX : offsetY;
+                var threshProp = clamp.prop == 'left' ? offsetY : offsetX;
+                var layerClamp = { prop: clamp.prop, offset: clamp.offset, start: clamp.start + clampProp, end: clamp.end + clampProp };
+                addSelf = _compressChildrenHelper(id, layerChildren, vert, threshold + threshProp, delta, layerClamp, easing, duration, childId);
+                //} else addSelf = _compressChildrenHelper(id, layerChildren, vert, threshold, delta, clamp, easing, duration, childId);
+
+                if(addSelf) toMove.push(childId);
+                else allMove = false;
+                $ax.visibility.popContainer(childId, false);
+                continue;
+            }
+
+            var numbers = childId.substring(1).split('-');
+            if(numbers.length < 1 || isNaN(Number(numbers[0])) || (numbers.length == 2 && isNaN(Number(numbers[1]))) || numbers.length > 2) continue;
+
+            var marker, childClamp;
+
+            var axChild = $ax('#' + childId);
+            var markerProp = vert ? 'top' : 'left';
+            marker = Number(axChild[markerProp](true));
+            childClamp = [Number(axChild[clamp.prop](true))];
+
+            if(parentLayer) {
+                var axParent = $ax('#' + parentLayer);
+                marker -= Number(axParent[markerProp](true));
+                childClamp[0] -= Number(axParent[clamp.prop](true));
+            }
+
+            // Dynamic panels are not reporting correct size sometimes, so pull it from the state. Get shown state just returns the widget if it is not a dynamic panel.
+            var sizeChild = _getShownStateObj(childId);
+            childClamp[1] = childClamp[0] + sizeChild[clamp.offset]();
+
+            if(isNaN(marker) || isNaN(childClamp[0]) || isNaN(childClamp[1]) ||
+                marker < threshold || childClamp[1] <= clamp.start || childClamp[0] >= clamp.end) {
+                allMove = false;
+                continue;
+            }
+
+            toMove.push(childId);
+        }
+
+        if (allMove && parentLayer) {
+            return true;
+        } else {
+            for(var i = 0; i < toMove.length; i++) {
+                $ax('#' + toMove[i]).moveBy(vert ? 0 : delta, vert ? delta : 0, easing == 'none' ? {} : { duration: duration, easing: easing });
+            }
+        }
+        return false;
+    };
+
+    var _parentHandlesStyles = function(id) {
+        var parents = $ax('#' + id).getParents(true, ['dynamicPanel', 'layer'])[0];
+        if(!parents) return false;
+        var directParent = true;
+        for(var i = 0; i < parents.length; i++) {
+            var parentId = parents[i];
+            var parentObj = $obj(parentId);
+            if(!parentObj.propagate) {
+                directParent = false;
+                continue;
+            }
+            return { id: parentId, direct: directParent };
+        }
+        return false;
+    };
+    _dynamicPanelManager.parentHandlesStyles = _parentHandlesStyles;
+
+    var _propagateMouseOver = function(id, value) {
+        propagate(id, true, value);
+    };
+    _dynamicPanelManager.propagateMouseOver = _propagateMouseOver;
+
+    var _propagateMouseDown = function(id, value) {
+        propagate(id, false, value);
+    };
+    _dynamicPanelManager.propagateMouseDown = _propagateMouseDown;
+
+    var propagate = function(id, hover, value) {
+        var hoverChildren = function(children) {
+            if(!children) return;
+            for(var i = 0; i < children.length; i++) {
+                var elementId = children[i].id;
+                var obj = $obj(elementId);
+                if(obj == null) {
+                    elementId = elementId.split('_')[0];
+                    obj = $obj(elementId);
+                }
+                if(obj == null) continue;
+                if (($ax.public.fn.IsDynamicPanel(obj.type) || $ax.public.fn.IsLayer(obj.type)) && !obj.propagate) continue;
+
+                if(hover) $ax.style.SetWidgetHover(elementId, value);
+                else $ax.style.SetWidgetMouseDown(elementId, value);
+                $ax.annotation.updateLinkLocations(elementId);
+
+                hoverChildren(children[i].children);
+            }
+        };
+        hoverChildren($ax('#' + id).getChildren(true)[0].children);
+    };
+});
diff --git a/src_old/resources/scripts/axure/sto.js b/src_old/resources/scripts/axure/sto.js
new file mode 100644
index 0000000..e9b0f86
--- /dev/null
+++ b/src_old/resources/scripts/axure/sto.js
@@ -0,0 +1,231 @@
+
+$axure.internal(function($ax) {
+    var funcs = {};
+
+    var weekday = new Array(7);
+    weekday[0] = "Sunday";
+    weekday[1] = "Monday";
+    weekday[2] = "Tuesday";
+    weekday[3] = "Wednesday";
+    weekday[4] = "Thursday";
+    weekday[5] = "Friday";
+    weekday[6] = "Saturday";
+
+    funcs.getDayOfWeek = function() {
+        return _getDayOfWeek(this.getDay());
+    };
+
+    var _getDayOfWeek = $ax.getDayOfWeek = function(day) {
+        return weekday[day];
+    };
+
+    var month = new Array(12);
+    month[0] = "January";
+    month[1] = "February";
+    month[2] = "March";
+    month[3] = "April";
+    month[4] = "May";
+    month[5] = "June";
+    month[6] = "July";
+    month[7] = "August";
+    month[8] = "September";
+    month[9] = "October";
+    month[10] = "November";
+    month[11] = "December";
+
+    funcs.getMonthName = function() {
+        return _getMonthName(this.getMonth());
+    };
+
+    var _getMonthName = $ax.getMonthName = function(monthNum) {
+        return month[monthNum];
+    };
+
+    funcs.getMonth = function() {
+        return this.getMonth() + 1;
+    };
+
+    funcs.addYears = function(years) {
+        var retVal = new Date(this.valueOf());
+        retVal.setFullYear(this.getFullYear() + Number(years));
+        return retVal;
+    };
+
+    funcs.addMonths = function(months) {
+        var retVal = new Date(this.valueOf());
+        retVal.setMonth(this.getMonth() + Number(months));
+        return retVal;
+    };
+
+    funcs.addDays = function(days) {
+        var retVal = new Date(this.valueOf());
+        retVal.setDate(this.getDate() + Number(days));
+        return retVal;
+    };
+
+    funcs.addHours = function(hours) {
+        var retVal = new Date(this.valueOf());
+        retVal.setHours(this.getHours() + Number(hours));
+        return retVal;
+    };
+
+    funcs.addMinutes = function(minutes) {
+        var retVal = new Date(this.valueOf());
+        retVal.setMinutes(this.getMinutes() + Number(minutes));
+        return retVal;
+    };
+
+    funcs.addSeconds = function(seconds) {
+        var retVal = new Date(this.valueOf());
+        retVal.setSeconds(this.getSeconds() + Number(seconds));
+        return retVal;
+    };
+
+    funcs.addMilliseconds = function(milliseconds) {
+        var retVal = new Date(this.valueOf());
+        retVal.setMilliseconds(this.getMilliseconds() + Number(milliseconds));
+        return retVal;
+    };
+
+    var _stoHandlers = {};
+
+    _stoHandlers.literal = function(sto, scope, eventInfo) {
+        return sto.value;
+    };
+
+    //need angle bracket syntax because var is a reserved word
+    _stoHandlers['var'] = function(sto, scope, eventInfo) {
+        // Can't us 'A || B' here, because the first value can be false, true, or empty string and still be valid.
+        var retVal = scope.hasOwnProperty(sto.name) ? scope[sto.name]  : $ax.globalVariableProvider.getVariableValue(sto.name, eventInfo);
+        // Handle desired type here?
+        
+        if(retVal && retVal.exprType) {
+            retVal = $ax.expr.evaluateExpr(retVal, eventInfo);
+        }
+        
+        if((sto.desiredType == 'int' || sto.desiredType == 'float')) {
+            var num = new Number(retVal);
+            retVal = isNaN(num.valueOf()) ? retVal : num;
+        }
+
+
+        return retVal;
+    };
+
+    //TODO: Perhaps repeaterId can be detirmined at generation, and stored in the sto info.
+    _stoHandlers.item = function(sto, scope, eventInfo, prop) {
+        prop = prop || (eventInfo.data ? 'data' : eventInfo.link ? 'url' : eventInfo.image ? 'img' : 'text');
+        var id = sto.isTarget || !$ax.repeater.hasData(eventInfo.srcElement, sto.name) ? eventInfo.targetElement : eventInfo.srcElement;
+        return getData(eventInfo, id, sto.name, prop);
+    };
+
+    var getData = function(eventInfo, id, name, prop) {
+        var repeaterId = $ax.getParentRepeaterFromScriptId($ax.repeater.getScriptIdFromElementId(id));
+        var itemId = $ax.repeater.getItemIdFromElementId(id);
+        return $ax.repeater.getData(eventInfo, repeaterId, itemId, name, prop);
+    };
+
+    _stoHandlers.paren = function(sto, scope, eventInfo) {
+        return _evaluateSTO(sto.innerSTO, scope, eventInfo);
+    };
+
+    _stoHandlers.fCall = function(sto, scope, eventInfo) {
+        //TODO: [mas] handle required type
+        var thisObj = _evaluateSTO(sto.thisSTO, scope, eventInfo);
+        if(sto.thisSTO.desiredType == 'string' && sto.thisSTO.computedType != 'string') thisObj = thisObj.toString();
+        
+        var args = [];
+        for(var i = 0; i < sto.arguments.length; i++) {
+            args[i] = _evaluateSTO(sto.arguments[i], scope, eventInfo);
+        }
+        var fn = (funcs.hasOwnProperty(sto.func) && funcs[sto.func]) || thisObj[sto.func];
+        return fn.apply(thisObj, args);
+    };
+
+    _stoHandlers.propCall = function(sto, scope, eventInfo) {
+        //TODO: [mas] handle required type
+        if((sto.prop == 'url' || sto.prop == 'img') && sto.thisSTO.sto == 'item') return _stoHandlers.item(sto.thisSTO, scope, eventInfo, sto.prop);
+        var thisObj = _evaluateSTO(sto.thisSTO, scope, eventInfo);
+        var prop = thisObj[sto.prop] instanceof Function ? thisObj[sto.prop]() : thisObj[sto.prop];
+        return prop;
+    };
+
+    var _binOps = {};
+    _binOps['+'] = function(left, right) {
+        if(left instanceof Date) return addDayToDate(left, right);
+        if(right instanceof Date) return addDayToDate(right, left);
+
+        var num = Number(left) + Number(right);
+        return isNaN(num) ? (String(left) + String(right)) : num;
+    };
+    _binOps['-'] = function(left, right) {
+        if(left instanceof Date) return addDayToDate(left, -right);
+        return left - right;
+    };
+    _binOps['*'] = function(left, right) { return Number(left) * Number(right); };
+    _binOps['/'] = function(left, right) { return Number(left) / Number(right); };
+    _binOps['%'] = function(left, right) { return Number(left) % Number(right); };
+    _binOps['=='] = function(left, right) { return _getBool(left) == _getBool(right); };
+    _binOps['!='] = function(left, right) { return _getBool(left) != _getBool(right); };
+    _binOps['<'] = function(left, right) { return Number(left) < Number(right); };
+    _binOps['<='] = function(left, right) { return Number(left) <= Number(right); };
+    _binOps['>'] = function(left, right) { return Number(left) > Number(right); };
+    _binOps['>='] = function(left, right) { return Number(left) >= Number(right); };
+    _binOps['&&'] = function(left, right) { return _getBool(left) && _getBool(right); };
+    _binOps['||'] = function(left, right) { return _getBool(left) || _getBool(right); };
+
+    // TODO: Move this to generic place to be used.
+    var addDayToDate = function(date, days) {
+        var retVal = new Date(date.valueOf());
+        retVal.setDate(date.getDate() + days);
+        return retVal;
+    };
+
+    var _unOps = {};
+    _unOps['+'] = function(arg) { return +arg; };
+    _unOps['-'] = function(arg) { return -arg; };
+    _unOps['!'] = function(arg) { return !_getBool(arg); };
+
+    _stoHandlers.binOp = function(sto, scope, eventInfo) {
+        var left = _evaluateSTO(sto.leftSTO, scope, eventInfo);
+        var right = _evaluateSTO(sto.rightSTO, scope, eventInfo);
+        return _binOps[sto.op](left, right);
+    };
+
+    _stoHandlers.unOp = function(sto, scope, eventInfo) {
+        var input = _evaluateSTO(sto.inputSTO, scope, eventInfo);
+        return _unOps[sto.op](input);
+    };
+
+    var _getBool = function(val) {
+        var lowerVal = val.toLowerCase ? val.toLowerCase() : val;
+        return lowerVal == "false" ? false : lowerVal == "true" ? true : val;
+    };
+    $ax.getBool = _getBool;
+
+    var _evaluateSTO = function(sto, scope, eventInfo) {
+        if(sto.sto == 'error') return undefined;
+        return _tryEscapeRichText(castSto(_stoHandlers[sto.sto](sto, scope, eventInfo), sto), eventInfo);
+    };
+    $ax.evaluateSTO = _evaluateSTO;
+
+    var castSto = function(val, sto) {
+        var type = sto.computedType || sto.desiredType;
+        if(type == 'string') val = String(val);
+        else if(type == 'date' && !(val instanceof Date)) val = new Date(val);
+        else if(type == 'int' || type == 'float') val = Number(val);
+        else if(type == 'bool') val = Boolean(val);
+
+        return val;
+    };
+
+    var _tryEscapeRichText = function(text, eventInfo) {
+        return eventInfo.htmlLiteral ? _escapeRichText(text) : text;
+    };
+
+    var _escapeRichText = function(text) {
+        if(typeof (text) != 'string') return text;
+
+        return text.replace('<', '&lt;');
+    };
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/style.js b/src_old/resources/scripts/axure/style.js
new file mode 100644
index 0000000..0d7399a
--- /dev/null
+++ b/src_old/resources/scripts/axure/style.js
@@ -0,0 +1,1389 @@
+$axure.internal(function($ax) {
+    var _style = {};
+    $ax.style = _style;
+
+    var _disabledWidgets = {};
+    var _selectedWidgets = {};
+
+    // A table to cache the outerHTML of the _rtf elements before the rollover state is applied.
+    var _originalTextCache = {};
+    // A table to exclude the normal style from adaptive overrides
+    var _shapesWithSetRichText = {};
+
+    // just a listing of shape ids
+    var _adaptiveStyledWidgets = {};
+
+    var _setLinkStyle = function(id, styleName) {
+        var parentId = $ax.GetParentIdFromLink(id);
+        var style = _computeAllOverrides(id, parentId, styleName, $ax.adaptive.currentViewId);
+
+        var textId = $ax.GetTextPanelId(parentId);
+        if(!_originalTextCache[textId]) {
+            $ax.style.CacheOriginalText(textId);
+        }
+        if($.isEmptyObject(style)) return;
+
+        var textCache = _originalTextCache[textId].styleCache;
+
+        _transformTextWithVerticalAlignment(textId, function() {
+            var cssProps = _getCssStyleProperties(style);
+            $('#' + id).find('*').addBack().each(function(index, element) {
+                element.setAttribute('style', textCache[element.id]);
+                _applyCssProps(element, cssProps);
+            });
+        });
+    };
+
+    var _resetLinkStyle = function(id) {
+        var textId = $ax.GetTextPanelId($ax.GetParentIdFromLink(id));
+        var textCache = _originalTextCache[textId].styleCache;
+
+        _transformTextWithVerticalAlignment(textId, function() {
+            $('#' + id).find('*').addBack().each(function(index, element) {
+                element.style.cssText = textCache[element.id];
+            });
+        });
+        if($ax.event.mouseDownObjectId) {
+            $ax.style.SetWidgetMouseDown($ax.event.mouseDownObjectId, true);
+        } else if($ax.event.mouseOverObjectId) {
+            $ax.style.SetWidgetHover($ax.event.mouseOverObjectId, true);
+        }
+    };
+
+    $ax.style.SetLinkHover = function(id) {
+        _setLinkStyle(id, MOUSE_OVER);
+    };
+
+    $ax.style.SetLinkNotHover = function(id) {
+        _resetLinkStyle(id);
+    };
+
+    $ax.style.SetLinkMouseDown = function(id) {
+        _setLinkStyle(id, MOUSE_DOWN);
+    };
+
+    $ax.style.SetLinkNotMouseDown = function(id) {
+        _resetLinkStyle(id);
+        var style = _computeAllOverrides(id, $ax.event.mouseOverObjectId, MOUSE_OVER, $ax.adaptive.currentViewId);
+
+        if(!$.isEmptyObject(style)) $ax.style.SetLinkHover(id);
+        //we dont do anything here because the widget not mouse down has taken over here
+    };
+
+    var _widgetHasState = function(id, state) {
+        if($ax.style.getElementImageOverride(id, state)) return true;
+        var diagramObject = $ax.getObjectFromElementId(id);
+
+        //var adaptiveIdChain = $ax.adaptive.getAdaptiveIdChain($ax.adaptive.currentViewId);
+        var adaptiveIdChain = $ax.style.getViewIdChain($ax.adaptive.currentViewId, id, diagramObject);
+
+        for(var i = 0; i < adaptiveIdChain.length; i++) {
+            var viewId = adaptiveIdChain[i];
+            var adaptiveStyle = diagramObject.adaptiveStyles[viewId];
+            if(adaptiveStyle && adaptiveStyle.stateStyles && adaptiveStyle.stateStyles[state]) return true;
+        }
+
+        if(diagramObject.style.stateStyles) {
+            var stateStyle = diagramObject.style.stateStyles[state];
+            if(!stateStyle) return false;
+            return !$.isEmptyObject(stateStyle);
+        }
+
+        return false;
+    };
+
+    // Returns what overrides the hover, or false if nothing.
+    var _hoverOverride = function(id) {
+        if($ax.style.IsWidgetDisabled(id)) return DISABLED;
+        if($ax.style.IsWidgetSelected(id)) return SELECTED;
+        var obj = $ax.getObjectFromElementId(id);
+        if(!obj.isContained) return false;
+        var path = $ax.getPathFromScriptId($ax.repeater.getScriptIdFromElementId(id));
+        path[path.length - 1] = obj.parent.id;
+        var itemId = $ax.repeater.getItemIdFromElementId(id);
+        return _hoverOverride($ax.getElementIdFromPath(path, { itemNum: itemId }));
+    };
+
+    $ax.style.SetWidgetHover = function(id, value) {
+        var override = _hoverOverride(id);
+        if(override == DISABLED) return;
+        if(!_widgetHasState(id, MOUSE_OVER)) return;
+
+        var valToSet = value || _isRolloverOverride(id);
+        var state = _generateMouseState(id, valToSet ? MOUSE_OVER : NORMAL, override == SELECTED);
+        _applyImageAndTextJson(id, state);
+        _updateElementIdImageStyle(id, state);
+    };
+
+    var _rolloverOverrides = [];
+    var _isRolloverOverride = function(id) {
+        return _rolloverOverrides.indexOf(id) != -1;
+    };
+
+    $ax.style.AddRolloverOverride = function(id) {
+        if(_isRolloverOverride(id)) return;
+        _rolloverOverrides[_rolloverOverrides.length] = id;
+        if($ax.event.mouseOverIds.indexOf(id) == -1) $ax.style.SetWidgetHover(id, true);
+    };
+
+    $ax.style.RemoveRolloverOverride = function(id) {
+        var index = _rolloverOverrides.indexOf(id);
+        if(index == -1) return;
+        $ax.splice(_rolloverOverrides, index, 1);
+        if($ax.event.mouseOverIds.indexOf(id) == -1) $ax.style.SetWidgetHover(id, false);
+    };
+
+    //    function GetWidgetCurrentState(id) {
+    //        if($ax.style.IsWidgetDisabled(id)) return "disabled";
+    //        if($ax.style.IsWidgetSelected(id)) return "selected";
+    //        if($ax.event.mouseOverObjectId == id) return "mouseOver";
+    //        if($ax.event.mouseDownObjectId == id) return "mouseDown";
+
+    //        return "normal";
+    //    }
+
+    $ax.style.ObjHasMouseDown = function(id) {
+        var obj = $obj(id);
+        if($ax.style.getElementImageOverride(id, 'mouseDown') || obj.style && obj.style.stateStyles && obj.style.stateStyles.mouseDown) return true;
+
+        //var chain = $ax.adaptive.getAdaptiveIdChain($ax.adaptive.currentViewId);
+        var chain = $ax.style.getViewIdChain($ax.adaptive.currentViewId, id, obj);
+        for(var i = 0; i < chain.length; i++) {
+            var style = obj.adaptiveStyles[chain[i]];
+            if(style && style.stateStyles && style.stateStyles.mouseDown) return true;
+        }
+        return false;
+    };
+
+    $ax.style.SetWidgetMouseDown = function(id, value, checkMouseOver) {
+        if($ax.style.IsWidgetDisabled(id)) return;
+        if(!_widgetHasState(id, MOUSE_DOWN)) return;
+
+        //if set to value is true, it's mousedown, if check mouseover is true,
+        //check if element is currently mouseover and has mouseover state before setting mouseover
+        if(value) var state = MOUSE_DOWN;
+        else if(!checkMouseOver || $ax.event.mouseOverIds.indexOf(id) !== -1 && _widgetHasState(id, MOUSE_OVER)) state = MOUSE_OVER;
+        else state = NORMAL;
+
+        var mouseState = _generateMouseState(id, state, $ax.style.IsWidgetSelected(id));
+        _applyImageAndTextJson(id, mouseState);
+        _updateElementIdImageStyle(id, mouseState);
+    };
+
+    var _generateMouseState = function(id, mouseState, selected) {
+
+        var isSelectedFocused = function (state) {
+            if(!_widgetHasState(id, FOCUSED)) return state;
+
+            var jObj = $('#' + id);
+            if(state == SELECTED) return (jObj.hasClass(FOCUSED)) ? SELECTED_FOCUSED : state;
+            else return (jObj.hasClass(FOCUSED) || jObj.hasClass(SELECTED_FOCUSED)) ? FOCUSED : state;
+        }
+
+        if (selected) {
+            if (_style.getElementImageOverride(id, SELECTED)) return isSelectedFocused(SELECTED);
+
+            var obj = $obj(id);
+            //var viewChain = $ax.adaptive.getAdaptiveIdChain($ax.adaptive.currentViewId);
+            var viewChain = $ax.style.getViewIdChain($ax.adaptive.currentViewId, id, obj);
+            viewChain[viewChain.length] = '';
+            if($ax.IsDynamicPanel(obj.type) || $ax.IsLayer(obj.type)) return isSelectedFocused(SELECTED);
+
+            var any = function(dict) {
+                for(var key in dict) return true;
+                return false;
+            };
+
+            for(var i = 0; i < viewChain.length; i++) {
+                var viewId = viewChain[i];
+                // Need to check seperately for images.
+                var scriptId = $ax.repeater.getScriptIdFromElementId(id);
+                if(obj.adaptiveStyles && obj.adaptiveStyles[viewId] && any(obj.adaptiveStyles[viewId])
+                    || obj.images && (obj.images[scriptId + '~selected~' + viewId] || obj.images['selected~' + viewId])) return isSelectedFocused(SELECTED);
+            }
+            var selectedStyle = obj.style && obj.style.stateStyles && obj.style.stateStyles.selected;
+            if(selectedStyle && any(selectedStyle)) return isSelectedFocused(SELECTED);
+        }
+
+        // Not using selected
+        return isSelectedFocused(mouseState);
+    };
+
+    $ax.style.SetWidgetFocused = function (id, value) {
+        if (_isWidgetDisabled(id)) return;
+        if (!_widgetHasState(id, FOCUSED)) return;
+
+        if (value) var state = $ax.style.IsWidgetSelected(id) ? SELECTED_FOCUSED : FOCUSED;
+        else state = $ax.style.IsWidgetSelected(id) ? SELECTED : NORMAL;
+
+        _applyImageAndTextJson(id, state);
+        _updateElementIdImageStyle(id, state);
+    }
+
+    $ax.style.SetWidgetSelected = function(id, value, alwaysApply) {
+        if(_isWidgetDisabled(id)) return;
+        //NOTE: not firing select events if state didn't change
+        var raiseSelectedEvents = $ax.style.IsWidgetSelected(id) != value;
+
+        if(value) {
+            var group = $('#' + id).attr('selectiongroup');
+            if(group) {
+                $("[selectiongroup='" + group + "']").each(function() {
+                    var otherId = this.id;
+                    if(otherId == id) return;
+                    if ($ax.visibility.isScriptIdLimbo($ax.repeater.getScriptIdFromElementId(otherId))) return;
+                    $ax.style.SetWidgetSelected(otherId, false, alwaysApply);
+                });
+            }
+        }
+        var obj = $obj(id);
+        if(obj) {
+            var actionId = id;
+            if ($ax.public.fn.IsDynamicPanel(obj.type) || $ax.public.fn.IsLayer(obj.type)) {
+                if(!value) $jobj(id).removeClass('selected');
+                var children = $axure('#' + id).getChildren()[0].children;
+                var skipIds = new Set();
+                for(var i = 0; i < children.length; i++) {
+                    var childId = children[i];
+                    // only set one member of selection group in children selected since subsequent calls
+                    // will unselect the previous one anyway
+                    if(value) {
+                        if(skipIds.has(childId)) continue;
+                        var group = $('#' + childId).attr('selectiongroup');
+                        if(group) for (var item of $("[selectiongroup='" + group + "']")) skipIds.add(item.id);
+                    }
+                    // Special case for trees
+                    var childObj = $jobj(childId);
+                    if(childObj.hasClass('treeroot')) {
+                        var treenodes = childObj.find('.treenode');
+                        for(var j = 0; j < treenodes.length; j++) {
+                            $axure('#' + treenodes[j].id).selected(value);
+                        }
+                    } else $axure('#' + childId).selected(value);
+                }
+            } else {
+                var widgetHasSelectedState = _widgetHasState(id, SELECTED);
+                while(obj.isContained && !widgetHasSelectedState) obj = obj.parent;
+                var itemId = $ax.repeater.getItemIdFromElementId(id);
+                var path = $ax.getPathFromScriptId($ax.repeater.getScriptIdFromElementId(id));
+                path[path.length - 1] = obj.id;
+                actionId = $ax.getElementIdFromPath(path, { itemNum: itemId });
+                if(alwaysApply || widgetHasSelectedState) {
+                    var state = _generateSelectedState(actionId, value);
+                    _applyImageAndTextJson(actionId, state);
+                    _updateElementIdImageStyle(actionId, state);
+                }
+                //added actionId and this hacky logic because we set style state on child, but interaction on parent
+                //then the id saved in _selectedWidgets would be depended on widgetHasSelectedState... more see case 1818143
+                while(obj.isContained && !$ax.getObjectFromElementId(id).interactionMap) obj = obj.parent;
+                path = $ax.getPathFromScriptId($ax.repeater.getScriptIdFromElementId(id));
+                path[path.length - 1] = obj.id;
+                actionId = $ax.getElementIdFromPath(path, { itemNum: itemId });
+            }
+        }
+
+        //    ApplyImageAndTextJson(id, value ? 'selected' : 'normal');
+        _selectedWidgets[id] = value;
+        if(raiseSelectedEvents) $ax.event.raiseSelectedEvents(actionId, value);
+    };
+
+    var _generateSelectedState = function(id, selected) {
+        var mouseState = $ax.event.mouseDownObjectId == id ? MOUSE_DOWN : $.inArray(id, $ax.event.mouseOverIds) != -1 ? MOUSE_OVER : NORMAL;
+        //var mouseState = $ax.event.mouseDownObjectId == id ? MOUSE_DOWN : $ax.event.mouseOverIds.indexOf(id) != -1 ? MOUSE_OVER : NORMAL;
+        return _generateMouseState(id, mouseState, selected);
+    };
+
+    $ax.style.IsWidgetSelected = function(id) {
+        return Boolean(_selectedWidgets[id]) || $('#'+id).hasClass('selected');
+    };
+
+    $ax.style.SetWidgetEnabled = function(id, value) {
+        _disabledWidgets[id] = !value;
+        $('#' + id).find('a').css('cursor', value ? 'pointer' : 'default');
+
+        if(!_widgetHasState(id, DISABLED)) return;
+        if(!value) {
+            _applyImageAndTextJson(id, DISABLED);
+            _updateElementIdImageStyle(id, DISABLED);
+        } else $ax.style.SetWidgetSelected(id, $ax.style.IsWidgetSelected(id), true);
+    };
+
+    $ax.style.SetWidgetPlaceholder = function(id, active, text, password) {
+        var inputId = $ax.repeater.applySuffixToElementId(id, '_input');
+
+        // Right now this is the only style on the widget. If other styles (ex. Rollover), are allowed
+        //  on TextBox/TextArea, or Placeholder is applied to more widgets, this may need to do more.
+        var obj = $jobj(inputId);
+
+        var height = document.getElementById(inputId).style['height'];
+        var width = document.getElementById(inputId).style['width'];
+        obj.attr('style', '');
+        //removing all styles, but now we can change the size, so we should add them back
+        //this is more like a quick hack
+        if (height) obj.css('height', height);
+        if (width) obj.css('width', width);
+
+        if(!active) {
+            try { //ie8 and below error
+                if(password) document.getElementById(inputId).type = 'password';
+            } catch(e) { } 
+        } else {
+            var element = $('#' + inputId)[0];
+            var style = _computeAllOverrides(id, undefined, HINT, $ax.adaptive.currentViewId);
+            var styleProperties = _getCssStyleProperties(style);
+
+            //moved this out of GetCssStyleProperties for now because it was breaking un/rollovers with gradient fills
+            //if(style.fill) styleProperties.allProps.backgroundColor = _getColorFromFill(style.fill);
+
+            _applyCssProps(element, styleProperties, true);
+            try { //ie8 and below error
+                if(password && text) document.getElementById(inputId).type = 'text';
+            } catch(e) { }
+        }
+        obj.val(text);
+    };
+
+    var _isWidgetDisabled = $ax.style.IsWidgetDisabled = function(id) {
+        return Boolean(_disabledWidgets[id]);
+    };
+
+    var _elementIdsToImageOverrides = {};
+    $ax.style.mapElementIdToImageOverrides = function (elementId, override) {
+        for(var key in override) _addImageOverride(elementId, key, override[key]);
+    };
+
+    var _addImageOverride = function (elementId, state, val) {
+        if (!_elementIdsToImageOverrides[elementId]) _elementIdsToImageOverrides[elementId] = {};
+        _elementIdsToImageOverrides[elementId][state] = val;
+    }
+
+    $ax.style.deleteElementIdToImageOverride = function(elementId) {
+        delete _elementIdsToImageOverrides[elementId];
+    };
+
+    $ax.style.getElementImageOverride = function(elementId, state) {
+        var url = _elementIdsToImageOverrides[elementId] && _elementIdsToImageOverrides[elementId][state];
+        return url;
+    };
+
+    $ax.style.elementHasAnyImageOverride = function(elementId) {
+        return Boolean(_elementIdsToImageOverrides[elementId]);
+    };
+
+    var NORMAL = 'normal';
+    var MOUSE_OVER = 'mouseOver';
+    var MOUSE_DOWN = 'mouseDown';
+    var SELECTED = 'selected';
+    var DISABLED = 'disabled';
+    var HINT = 'hint';
+    var FOCUSED = 'focused';
+    var SELECTED_FOCUSED = 'selectedFocused';
+    const SELECTED_DISABLED = 'selectedDisabled';
+    $ax.constants.SELECTED_DISABLED = SELECTED_DISABLED;
+    var ALL_STATES = [MOUSE_OVER, MOUSE_DOWN, SELECTED, FOCUSED, SELECTED_FOCUSED, DISABLED];
+
+    var _generateState = _style.generateState = function(id) {
+        return $ax.placeholderManager.isActive(id) ? HINT : _style.IsWidgetDisabled(id) ? DISABLED : _generateSelectedState(id, _style.IsWidgetSelected(id));
+    };
+
+    var _progressState = _style.progessState = function(state) {
+        if(state == NORMAL) return false;
+        if(state == MOUSE_DOWN) return MOUSE_OVER;
+        return NORMAL;
+    };
+
+    var _unprogressState = function(state, goal) {
+        state = state || NORMAL;
+        if(state == goal || state == SELECTED_FOCUSED) return undefined;
+        if(state == NORMAL && goal == MOUSE_DOWN) return MOUSE_OVER;
+        if(state == NORMAL && goal == SELECTED_FOCUSED) return SELECTED;
+        if(state == SELECTED && goal == SELECTED_FOCUSED) return FOCUSED;
+        return goal;
+    };
+
+    var _updateElementIdImageStyle = _style.updateElementIdImageStyle = function(elementId, state) {
+        if(!_style.elementHasAnyImageOverride(elementId)) return;
+
+        if(!state) state = _generateState(elementId);
+
+        var style = _computeFullStyle(elementId, state, $ax.adaptive.currentViewId);
+
+        var query = $jobj($ax.repeater.applySuffixToElementId(elementId, '_img'));
+        style.size.width = query.width();
+        style.size.height = query.height();
+        var borderId = $ax.repeater.applySuffixToElementId(elementId, '_border');
+        var borderQuery = $jobj(borderId);
+        if(!borderQuery.length) {
+            borderQuery = $('<div></div>');
+            borderQuery.attr('id', borderId);
+            query.after(borderQuery);
+        }
+
+        borderQuery.attr('style', '');
+        //borderQuery.css('position', 'absolute');
+        query.attr('style', '');
+
+        var borderQueryCss = { 'position': 'absolute' };
+        var queryCss = {}
+
+        var borderWidth = Number(style.borderWidth);
+        var hasBorderWidth = borderWidth > 0;
+        if(hasBorderWidth) {
+            //borderQuery.css('border-style', 'solid');
+            //borderQuery.css('border-width', borderWidth + 'px'); // If images start being able to turn off borders on specific sides, need to update this.
+            //borderQuery.css('width', style.size.width - borderWidth * 2);
+            //borderQuery.css('height', style.size.height - borderWidth * 2);
+            //borderQuery.css({
+            //    'border-style': 'solid',
+            //    'border-width': borderWidth + 'px',
+            //    'width': style.size.width - borderWidth * 2,
+            //    'height': style.size.height - borderWidth * 2
+            //});
+            borderQueryCss['border-style'] = 'solid';
+            borderQueryCss['border-width'] = borderWidth + 'px'; // If images start being able to turn off borders on specific sides, need to update this.
+            borderQueryCss['width'] = style.size.width - borderWidth * 2;
+            borderQueryCss['height'] = style.size.height - borderWidth * 2;
+        }
+
+        var linePattern = style.linePattern;
+        if(hasBorderWidth && linePattern) borderQueryCss['border-style'] = linePattern;
+
+        var borderFill = style.borderFill;
+        if(hasBorderWidth && borderFill) {
+            var color = borderFill.fillType == 'solid' ? borderFill.color :
+                borderFill.fillType == 'linearGradient' ? borderFill.colors[0].color : 0;
+
+            var alpha = Math.floor(color / 256 / 256 / 256);
+            color -= alpha * 256 * 256 * 256;
+            alpha = alpha / 255;
+
+            var red = Math.floor(color / 256 / 256);
+            color -= red * 256 * 256;
+            var green = Math.floor(color / 256);
+            var blue = color - green * 256;
+
+            borderQueryCss['border-color'] = _rgbaToFunc(red, green, blue, alpha);
+        }
+
+        var cornerRadiusTopLeft = style.cornerRadius;
+        if(cornerRadiusTopLeft) {
+            queryCss['border-radius'] = cornerRadiusTopLeft + 'px';
+            borderQueryCss['border-radius'] = cornerRadiusTopLeft + 'px';
+        }
+
+        var outerShadow = style.outerShadow;
+        if(outerShadow && outerShadow.on) {
+            var arg = '';
+            arg += outerShadow.offsetX + 'px' + ' ' + outerShadow.offsetY + 'px' + ' ';
+            var rgba = outerShadow.color;
+            arg += outerShadow.blurRadius + 'px' + ' 0px ' + _rgbaToFunc(rgba.r, rgba.g, rgba.b, rgba.a);
+            //query.css('-moz-box-shadow', arg);
+            //query.css('-wibkit-box-shadow', arg);
+            //query.css('box-shadow', arg);
+            //query.css('left', '0px');
+            //query.css('top', '0px');
+            //query.css({
+            //    '-moz-box-shadow': arg,
+            //    '-webkit-box-shadow': arg,
+            //    'box-shadow': arg,
+            //    'left': '0px',
+            //    'top': '0px'
+            //});
+            queryCss['-moz-box-shadow'] = arg;
+            queryCss['-wibkit-box-shadow'] = arg;
+            queryCss['box-shadow'] = arg;
+            queryCss['left'] = '0px';
+            queryCss['top'] = '0px';
+        }
+
+        queryCss['width'] = style.size.width;
+        queryCss['height'] = style.size.height;
+
+        borderQuery.css(borderQueryCss);
+        query.css(queryCss);
+
+        //query.css({ width: style.size.width, height: style.size.height });
+    };
+
+    var _rgbaToFunc = function(red, green, blue, alpha) {
+        return 'rgba(' + red + ',' + green + ',' + blue + ',' + alpha + ')';
+    };
+
+    var _applyImageAndTextJson = function(id, event) {
+        var textId = $ax.GetTextPanelId(id);
+        if(textId) _resetTextJson(id, textId);
+
+        // This should never be the case
+        //if(event != '') {
+        var imgQuery = $jobj($ax.GetImageIdFromShape(id));
+        var e = imgQuery.data('events');
+        if(e && e[event]) imgQuery.trigger(event);
+
+        var imageUrl = $ax.adaptive.getImageForStateAndView(id, event);
+        if(imageUrl) _applyImage(id, imageUrl, event);
+
+        var style = _computeAllOverrides(id, undefined, event, $ax.adaptive.currentViewId);
+        if(!$.isEmptyObject(style) && textId) _applyTextStyle(textId, style);
+
+        _updateStateClasses(
+            [
+                id,
+                $ax.repeater.applySuffixToElementId(id, '_div'),
+                $ax.repeater.applySuffixToElementId(id, '_input')
+            ], event, true
+        );
+    };
+    
+    let _updateStateClasses = function(ids, event, addMouseOverOnMouseDown) {
+        for(let i = 0; i < ids.length; i++) {
+            _updateStateClassesHelper(ids[i], event, addMouseOverOnMouseDown);
+        }
+    };
+
+    let _updateStateClassesHelper = function(id, event, addMouseOverOnMouseDown) {
+        let jobj = $jobj(id);
+
+        //if(jobj[0] && jobj[0].hasAttribute('widgetwidth')) {
+        //    for (var x = 0; x < jobj[0].children.length; x++) {
+        //        var childId = jobj[0].children[x].id;
+        //        if (childId.indexOf('p') < 0) continue;
+
+        //        _updateStateClasses(childId, event) ;
+        //    }
+        //} else {
+
+        if(event == DISABLED || event == SELECTED) {
+            let diagramObject = $ax.getObjectFromElementId(id);
+            if(diagramObject && $ax.public.fn.IsSelectionButton(diagramObject.type)) {
+                var addSelected = event == DISABLED && jobj.hasClass(SELECTED);
+                var addDisabled = event == SELECTED && jobj.hasClass(DISABLED);
+            }
+        }
+        for (let i = 0; i < ALL_STATES.length; i++) jobj.removeClass(ALL_STATES[i]);
+        
+        if(addMouseOverOnMouseDown && event == MOUSE_DOWN) jobj.addClass(MOUSE_OVER);
+        if(addSelected) jobj.addClass(SELECTED);
+        if(addDisabled) jobj.addClass(DISABLED);
+        if(event != NORMAL) jobj.addClass(event);
+        //}
+    };
+
+    /* -------------------
+
+    here's the algorithm in a nutshell:
+    [DOWN] -- refers to navigation down the view inheritance heirarchy (default to most specific)
+    [UP] -- navigate up the heirarchy
+
+    ComputeAllOverrides (object):
+    All view styles [DOWN]
+    If hyperlink
+    - DO ComputeStateStyle for parent object
+    - if (MouseOver || MouseDown) 
+    - linkMouseOver Style
+    - if (MouseDown) 
+    - linkMouseDown style
+    - ComputeStateStyleForViewChain (parent, STATE)
+    
+    if (MouseDown) DO ComputeStateStyleForViewChain for object, mouseOver
+    DO ComputeStateStyleForViewChain for object, style
+
+
+    ComputeStateStyleForViewChain (object, STATE)
+    FIRST STATE state style [UP] the chain OR default object STATE style
+
+    ------------------- */
+
+    var FONT_PROPS = {
+        'typeface': true,
+        'fontName': true,
+        'fontWeight': true,
+        'fontStyle': true,
+        'fontStretch': true,
+        'fontSize': true,
+        'underline': true,
+        'foreGroundFill': true,
+        'horizontalAlignment': true,
+        'letterCase': true,
+        'strikethrough': true
+    };
+
+    var _getViewIdChain = $ax.style.getViewIdChain = function(currentViewId, id, diagramObject) {
+        var viewIdChain;
+        if (diagramObject.owner.type != 'Axure:Master') {
+            viewIdChain = $ax.adaptive.getAdaptiveIdChain(currentViewId);
+        } else {
+            //set viewIdChain to the chain from the parent RDO
+            var parentRdoId = $ax('#' + id).getParents(true, ['rdo'])[0][0];
+            var rdoState = $ax.style.generateState(parentRdoId);
+            var rdoStyle = $ax.style.computeFullStyle(parentRdoId, rdoState, currentViewId);
+            var viewOverride = rdoStyle.viewOverride;
+            viewIdChain = $ax.adaptive.getMasterAdaptiveIdChain(diagramObject.owner.packageId, viewOverride);
+        }
+        return viewIdChain;
+    }
+
+    var _computeAllOverrides = $ax.style.computeAllOverrides = function(id, parentId, state, currentViewId) {
+        var computedStyle = {};
+        if(parentId) computedStyle = _computeAllOverrides(parentId, null, state, currentViewId);
+
+        var diagramObject = $ax.getObjectFromElementId(id);
+
+        var viewIdChain = _getViewIdChain(currentViewId, id, diagramObject);
+        var excludeFont = _shapesWithSetRichText[id];
+        for(var i = 0; i < viewIdChain.length; i++) {
+            var viewId = viewIdChain[i];
+            var style = diagramObject.adaptiveStyles[viewId];
+            if(style) {
+                // we want to exclude the normal font style for shapes where the rich text has been set with an interaction
+                // so we copy the style so we don't modify the original, then delete all the font props.
+                if(excludeFont) {
+                    style = $ax.deepCopy(style);
+                    for(var prop in FONT_PROPS) delete style[prop];
+                }
+
+                if(style) {
+                    var customStyle = style.baseStyle && $ax.document.stylesheet.stylesById[style.baseStyle];
+                    //make sure not to extend the customStyle this can mutate it for future use
+                    $.extend(computedStyle, customStyle);
+                }
+                $.extend(computedStyle, style);
+            }
+        }
+
+        var currState = NORMAL;
+        while(currState) {
+            $.extend(computedStyle, _computeStateStyleForViewChain(diagramObject, currState, viewIdChain, true));
+            currState = _unprogressState(currState, state);
+        }
+
+        return _removeUnsupportedProperties(computedStyle, diagramObject);
+    };
+
+    var _computeStateStyleForViewChain = function(diagramObject, state, viewIdChain, excludeNormal) {
+        var styleObject = diagramObject;
+        while(styleObject.isContained) styleObject = styleObject.parent;
+
+        var adaptiveStyles = styleObject.adaptiveStyles;
+
+        for(var i = viewIdChain.length - 1; i >= 0; i--) {
+            var viewId = viewIdChain[i];
+            var viewStyle = adaptiveStyles[viewId];
+            var stateStyle = viewStyle && _getFullStateStyle(viewStyle, state, excludeNormal);
+            if (stateStyle) return $.extend({}, stateStyle);
+            else if (viewStyle && viewStyle.stateStyles) return {}; //stateStyles are overriden but states could be null
+        }
+
+        // we dont want to actually include the object style because those are not overrides, hence the true for "excludeNormal" and not passing the val through
+        var stateStyleFromDefault = _getFullStateStyle(styleObject.style, state, true);
+        return $.extend({}, stateStyleFromDefault);
+    };
+
+    // returns the full effective style for an object in a state state and view
+    var _computeFullStyle = $ax.style.computeFullStyle = function(id, state, currentViewId) {
+        var obj = $obj(id);
+        var overrides = _computeAllOverrides(id, undefined, state, currentViewId);
+        // todo: account for image box
+        var objStyle = obj.style;
+        var customStyle = objStyle.baseStyle && $ax.document.stylesheet.stylesById[objStyle.baseStyle];
+        var returnVal = $.extend({}, $ax.document.stylesheet.defaultStyle, customStyle, objStyle, overrides);
+        return _removeUnsupportedProperties(returnVal, obj);
+    };
+
+    var _removeUnsupportedProperties = function(style, object) {
+        // for now all we need to do is remove padding from checkboxes and radio buttons
+        if ($ax.public.fn.IsRadioButton(object.type) || $ax.public.fn.IsCheckBox(object.type)) {
+            style.paddingTop = 0;
+            style.paddingLeft = 0;
+            style.paddingRight = 0;
+            style.paddingBottom = 0;
+        }
+        if ($ax.public.fn.IsTextBox(object.type) || $ax.public.fn.IsTextArea(object.type) || $ax.public.fn.IsButton(object.type)
+            || $ax.public.fn.IsListBox(object.type) || $ax.public.fn.IsComboBox(object.type)) {
+            if (object.images && style.fill) delete style['fill'];
+        }
+
+        return style;
+    };
+
+    var _getFullStateStyle = function(style, state, excludeNormal) {
+        //'normal' is needed because now DiagramObjects get their image from the Style and unapplying a rollover needs the image
+        var stateStyle = state == 'normal' && !excludeNormal ? style : style && style.stateStyles && style.stateStyles[state];
+        if(stateStyle) {
+            var customStyle = stateStyle.baseStyle && $ax.document.stylesheet.stylesById[stateStyle.baseStyle];
+            //make sure not to extend the customStyle this can mutate it for future use
+            return $.extend({}, customStyle, stateStyle);
+        }
+        return undefined;
+    };
+
+    // commented this out for now... we actually will probably need it for ie
+    var _applyOpacityFromStyle = $ax.style.applyOpacityFromStyle = function(id, style) {
+        return;
+        var opacity = style.opacity || '';
+        $jobj(id).children().css('opacity', opacity);
+    };
+
+    var _initialize = function() {
+        //$ax.style.initializeObjectTextAlignment($ax('*'));
+    };
+    $ax.style.initialize = _initialize;
+
+    //var _initTextAlignment = function(elementId) {
+    //    var textId = $ax.GetTextPanelId(elementId);
+    //    if(textId) {
+    //        _storeIdToAlignProps(textId);
+    //        // now handle vertical alignment
+    //        if(_getObjVisible(textId)) {
+    //            //_setTextAlignment(textId, _idToAlignProps[textId], false);
+    //            _setTextAlignment(textId);
+    //        }
+    //    }
+    //};
+
+    //$ax.style.initializeObjectTextAlignment = function(query) {
+    //    query.filter(function(diagramObject) {
+    //        return $ax.public.fn.IsVector(diagramObject.type) || $ax.public.fn.IsImageBox(diagramObject.type);
+    //    }).each(function(diagramObject, elementId) {
+    //        if($jobj(elementId).length == 0) return;
+    //        _initTextAlignment(elementId);
+    //    });
+    //};
+
+    //$ax.style.initializeObjectTextAlignment = function (query) {
+    //    var textIds = [];
+    //    query.filter(function(diagramObject) {
+    //        return $ax.public.fn.IsVector(diagramObject.type) || $ax.public.fn.IsImageBox(diagramObject.type);
+    //    }).each(function(diagramObject, elementId) {
+    //        if($jobj(elementId).length == 0) return;
+    //        var textId = $ax.GetTextPanelId(elementId);
+    //        if(textId) {
+    //            _storeIdToAlignProps(textId);
+    //            textIds.push(textId);
+    //        }
+    //    });
+
+    //    $ax.style.setTextAlignment(textIds);
+    //};
+
+    //var _getPadding = $ax.style.getPadding = function (textId) {
+    //    var shapeId = $ax.GetShapeIdFromText(textId);
+    //    var shapeObj = $obj(shapeId);
+    //    var state = _generateState(shapeId);
+
+    //    var style = _computeFullStyle(shapeId, state, $ax.adaptive.currentViewId);
+    //    var vAlign = style.verticalAlignment || 'middle';
+
+    //    var paddingLeft = Number(style.paddingLeft) || 0;
+    //    paddingLeft += (Number(shapeObj && shapeObj.extraLeft) || 0);
+    //    var paddingTop = style.paddingTop || 0;
+    //    var paddingRight = style.paddingRight || 0;
+    //    var paddingBottom = style.paddingBottom || 0;
+    //    return { vAlign: vAlign, paddingLeft: paddingLeft, paddingTop: paddingTop, paddingRight: paddingRight, paddingBottom: paddingBottom };
+    //}
+
+    //var _storeIdToAlignProps = function(textId) {
+    //    _idToAlignProps[textId] = _getPadding(textId);
+    //};
+
+    var _applyImage = $ax.style.applyImage = function (id, imgUrl, state) {
+            var object = $obj(id);
+            if (object.generateCompound) {
+                for (var i = 0; i < object.compoundChildren.length; i++) {
+                    var componentId = object.compoundChildren[i];
+                    var childId = $ax.public.fn.getComponentId(id, componentId);
+                    var childImgQuery = $jobj(childId + '_img');
+                    childImgQuery.attr('src', imgUrl[componentId]);
+
+                    _updateStateClasses(
+                        [
+                            childId + '_img',
+                            childId
+                        ], state, false
+                    );
+                }
+            } else {
+                var imgQuery = $jobj($ax.GetImageIdFromShape(id));
+                //it is hard to tell if setting the image or the class first causing less flashing when adding shadows.
+                imgQuery.attr('src', imgUrl);
+
+                _updateStateClasses(
+                    [
+                        id,
+                        $ax.GetImageIdFromShape(id)
+                    ], state, false
+                );
+                if (imgQuery.parents('a.basiclink').length > 0) imgQuery.css('border', 'none');
+            }
+
+    };
+
+    $ax.public.fn.getComponentId = function (id, componentId) {
+        var idParts = id.split('-');
+        idParts[0] = idParts[0] + componentId;
+        return idParts.join('-');
+    }
+
+    var _resetTextJson = function(id, textid) {
+        // reset the opacity
+        $jobj(id).children().css('opacity', '');
+
+        var cacheObject = _originalTextCache[textid];
+        if(cacheObject) {
+            _transformTextWithVerticalAlignment(textid, function() {
+                var styleCache = cacheObject.styleCache;
+                var textQuery = $('#' + textid);
+                textQuery.find('*').each(function(index, element) {
+                    element.style.cssText = styleCache[element.id];
+                });
+            });
+        }
+    };
+
+    // Preserves the alingment for the element textid after executing transformFn
+
+    //var _getRtfElementHeight = function(rtfElement) {
+    //    if(rtfElement.innerHTML == '') rtfElement.innerHTML = '&nbsp;';
+
+    //    // To handle render text as image
+    //    //var images = $(rtfElement).children('img');
+    //    //if(images.length) return images.height();
+    //    return rtfElement.offsetHeight;
+    //};
+
+    // why microsoft decided to default to round to even is beyond me...
+    //var _roundToEven = function(number) {
+    //    var numString = number.toString();
+    //    var parts = numString.split('.');
+    //    if(parts.length == 1) return number;
+    //    if(parts[1].length == 1 && parts[1] == '5') {
+    //        var wholePart = Number(parts[0]);
+    //        return wholePart % 2 == 0 ? wholePart : wholePart + 1;
+    //    } else return Math.round(number);
+    //};
+
+    //var _suspendTextAlignment = 0;
+    //var _suspendedTextIds = [];
+    //$ax.style.startSuspendTextAlignment = function() {
+    //    _suspendTextAlignment++;
+    //}
+    //$ax.style.resumeSuspendTextAlignment = function () {
+    //    _suspendTextAlignment--;
+    //    if(_suspendTextAlignment == 0) $ax.style.setTextAlignment(_suspendedTextIds);
+    //}
+
+    var _transformTextWithVerticalAlignment = $ax.style.transformTextWithVerticalAlignment = function(textId, transformFn) {
+        if(!_originalTextCache[textId]) {
+            $ax.style.CacheOriginalText(textId);
+        }
+
+        var rtfElement = window.document.getElementById(textId);
+        if(!rtfElement) return;
+
+        transformFn();
+
+        //_storeIdToAlignProps(textId);
+
+        //if (_suspendTextAlignment) {
+        //    _suspendedTextIds.push(textId);
+        //    return;
+        //}
+
+        //$ax.style.setTextAlignment([textId]);
+    };
+
+    // this is for vertical alignments set on hidden objects
+    //var _idToAlignProps = {};
+    
+    //$ax.style.updateTextAlignmentForVisibility = function (textId) {
+    //    var textObj = $jobj(textId);
+    //    // must check if parent id exists. Doesn't exist for text objs in check boxes, and potentially elsewhere.
+    //    var parentId = textObj.parent().attr('id');
+    //    if (parentId && $ax.visibility.isContainer(parentId)) return;
+
+    //    //var alignProps = _idToAlignProps[textId];
+    //    //if(!alignProps || !_getObjVisible(textId)) return;
+    //    //if (!alignProps) return;
+
+    //    //_setTextAlignment(textId, alignProps);
+    //    _setTextAlignment(textId);
+    //};
+
+    var _getObjVisible = _style.getObjVisible = function (id) {
+        var element = document.getElementById(id);
+        return element && (element.offsetWidth || element.offsetHeight);
+    };
+
+    //$ax.style.setTextAlignment = function (textIds) {
+        
+    //    var getTextAlignDim = function(textId, alignProps) {
+    //        var dim = {};
+    //        var vAlign = alignProps.vAlign;
+    //        var paddingTop = Number(alignProps.paddingTop);
+    //        var paddingBottom = Number(alignProps.paddingBottom);
+    //        var paddingLeft = Number(alignProps.paddingLeft);
+    //        var paddingRight = Number(alignProps.paddingRight);
+
+    //        var topParam = 0.0;
+    //        var bottomParam = 1.0;
+    //        var leftParam = 0.0;
+    //        var rightParam = 1.0;
+
+    //    var textObj = $jobj(textId);
+    //    var textObjParent = textObj.offsetParent();
+    //    var parentId = textObjParent.attr('id');
+    //    if(!parentId) {
+    //        // Only case should be for radio/checkbox that get the label now because it must be absolute positioned for animate (offset parent ignored it before)
+    //        textObjParent = textObjParent.parent();
+    //        parentId = textObjParent.attr('id');
+    //    }
+
+    //    parentId = $ax.visibility.getWidgetFromContainer(textObjParent.attr('id'));
+    //    textObjParent = $jobj(parentId);
+    //    var parentObj = $obj(parentId);
+    //    if(parentObj['bottomTextPadding']) bottomParam = parentObj['bottomTextPadding'];
+    //    if(parentObj['topTextPadding']) topParam = parentObj['topTextPadding'];
+    //    if(parentObj['leftTextPadding']) leftParam = parentObj['leftTextPadding'];
+    //    if(parentObj['rightTextPadding']) rightParam = parentObj['rightTextPadding'];
+
+    //    // smart shapes are mutually exclusive from compound vectors.
+    //    var isConnector = parentObj.type == $ax.constants.CONNECTOR_TYPE;
+    //    if(isConnector) return;
+
+    //        var axTextObjectParent = $ax('#' + textObjParent.attr('id'));
+
+
+    //        var jDims = textObj.css(['width','left','top']);
+    //        var oldWidth = $ax.getNumFromPx(jDims['width']);
+    //        var oldLeft = $ax.getNumFromPx(jDims['left']);
+    //        var oldTop = $ax.getNumFromPx(jDims['top']);
+
+    //        var newTop = 0;
+    //        var newLeft = 0.0;
+
+    //        var size = axTextObjectParent.size();
+    //        var width = size.width;
+    //        var height = size.height;
+    //        //var width = axTextObjectParent.width();
+    //        //var height = axTextObjectParent.height();
+
+    //        // If text rotated need to handle getting the correct width for text based on bounding rect of rotated parent.
+    //        var boundingRotation = -$ax.move.getRotationDegreeFromElement(textObj[0]);
+    //        var boundingParent = $axure.fn.getBoundingSizeForRotate(width, height, boundingRotation);
+    //        var extraLeftPadding = (width - boundingParent.width) / 2;
+    //        width = boundingParent.width;
+    //        var relativeTop = 0.0;
+    //        relativeTop = height * topParam;
+    //        var containerHeight = height * bottomParam - relativeTop;
+
+    //        newLeft = paddingLeft + extraLeftPadding + width * leftParam;
+
+    //        var newWidth = width * (rightParam - leftParam) - paddingLeft - paddingRight;
+
+    //        var horizChange = newWidth != oldWidth || newLeft != oldLeft;
+    //        if(horizChange) {
+    //            dim.left = newLeft;
+    //            dim.width = newWidth;
+    //            //textObj.css('left', newLeft);
+    //            //textObj.width(newWidth);
+    //        }
+
+    //        var textHeight = _getRtfElementHeight(textObj[0]);
+
+    //        if(vAlign == "middle")
+    //            newTop = _roundToEven(relativeTop + (containerHeight - textHeight + paddingTop - paddingBottom) / 2);
+    //        else if(vAlign == "bottom")
+    //            newTop = _roundToEven(relativeTop + containerHeight - textHeight - paddingBottom);
+    //        else newTop = _roundToEven(paddingTop + relativeTop);
+    //        var vertChange = oldTop != newTop;
+    //        if (vertChange) dim.top = newTop; //textObj.css('top', newTop + 'px');
+
+    //        return dim;
+    //    };
+
+    //    var applyTextAlignment = function(textId, dim) {
+    //        var textObj = $jobj(textId);
+    //        if(dim.left) {
+    //            textObj.css('left', dim.left);
+    //            textObj.width(dim.width);
+    //        }
+    //        if(dim.top) textObj.css('top', dim.top);
+
+    //        if((dim.top || dim.left)) _updateTransformOrigin(textId);
+    //    };
+
+    //    var idToDim = [];
+    //    for (var i = 0; i < textIds.length; i++) {
+    //        var textId = textIds[i];
+    //        var alignProps = _idToAlignProps[textId];
+    //        if (!alignProps || !_getObjVisible(textId)) continue;
+
+    //        idToDim.push({ id: textId, dim: getTextAlignDim(textId, alignProps) });
+    //    }
+
+    //    for (var i = 0; i < idToDim.length; i++) {
+    //        var info = idToDim[i];
+    //        applyTextAlignment(info.id, info.dim);
+    //    }
+    //};
+
+    //var _setTextAlignment = function(textId, alignProps, updateProps) {
+    //    if(updateProps) _storeIdToAlignProps(textId);
+    //    if(!alignProps) return;
+
+    //    var vAlign = alignProps.vAlign;
+    //    var paddingTop = Number(alignProps.paddingTop);
+    //    var paddingBottom = Number(alignProps.paddingBottom);
+    //    var paddingLeft = Number(alignProps.paddingLeft);
+    //    var paddingRight = Number(alignProps.paddingRight);
+
+    //    var topParam = 0.0;
+    //    var bottomParam = 1.0;
+    //    var leftParam = 0.0;
+    //    var rightParam = 1.0;
+
+    //    var textObj = $jobj(textId);
+    //    var textObjParent = textObj.offsetParent();
+    //    var parentId = textObjParent.attr('id');
+    //    var isConnector = false;
+    //    if(parentId) {
+    //        parentId = $ax.visibility.getWidgetFromContainer(textObjParent.attr('id'));
+    //        textObjParent = $jobj(parentId);
+    //        var parentObj = $obj(parentId);
+    //        if(parentObj['bottomTextPadding']) bottomParam = parentObj['bottomTextPadding'];
+    //        if(parentObj['topTextPadding']) topParam = parentObj['topTextPadding'];
+    //        if(parentObj['leftTextPadding']) leftParam = parentObj['leftTextPadding'];
+    //        if(parentObj['rightTextPadding']) rightParam = parentObj['rightTextPadding'];
+
+    //        // smart shapes are mutually exclusive from compound vectors.
+    //        isConnector = parentObj.type == $ax.constants.CONNECTOR_TYPE;
+    //    }
+    //    if(isConnector) return;
+
+    //    var axTextObjectParent = $ax('#' + textObjParent.attr('id'));
+
+    //    var oldWidth = $ax.getNumFromPx(textObj.css('width'));
+    //    var oldLeft = $ax.getNumFromPx(textObj.css('left'));
+    //    var oldTop = $ax.getNumFromPx(textObj.css('top'));
+
+    //    var newTop = 0;
+    //    var newLeft = 0.0;
+
+    //    var width = axTextObjectParent.width();
+    //    var height = axTextObjectParent.height();
+
+    //    // If text rotated need to handle getting the correct width for text based on bounding rect of rotated parent.
+    //    var boundingRotation = -$ax.move.getRotationDegreeFromElement(textObj[0]);
+    //    var boundingParent = $axure.fn.getBoundingSizeForRotate(width, height, boundingRotation);
+    //    var extraLeftPadding = (width - boundingParent.width) / 2;
+    //    width = boundingParent.width;
+    //    var relativeTop = 0.0;
+    //    relativeTop = height * topParam;
+    //    var containerHeight = height * bottomParam - relativeTop;
+
+
+    //    newLeft = paddingLeft + extraLeftPadding + width * leftParam;
+
+    //    var newWidth = width * (rightParam - leftParam) - paddingLeft - paddingRight;
+
+    //    var horizChange = newWidth != oldWidth || newLeft != oldLeft;
+    //    if(horizChange) {
+    //        textObj.css('left', newLeft);
+    //        textObj.width(newWidth);
+    //    }
+
+    //    var textHeight = _getRtfElementHeight(textObj[0]);
+
+    //    if(vAlign == "middle") newTop = _roundToEven(relativeTop + (containerHeight - textHeight + paddingTop - paddingBottom) / 2);
+    //    else if(vAlign == "bottom") newTop = _roundToEven(relativeTop + containerHeight - textHeight - paddingBottom);
+    //    else newTop = _roundToEven(paddingTop + relativeTop);
+    //    var vertChange = oldTop != newTop;
+    //    if(vertChange) textObj.css('top', newTop + 'px');
+
+    //    if((vertChange || horizChange)) _updateTransformOrigin(textId);
+    //};
+
+    //var _updateTransformOrigin = function (textId) {
+    //    var textObj = $jobj(textId);
+    //    var parentId = textObj.parent().attr('id');
+    //    if(!$obj(parentId).hasTransformOrigin) return;
+
+    //    //var transformOrigin = textObj.css('-webkit-transform-origin') ||
+    //    //        textObj.css('-moz-transform-origin') ||
+    //    //            textObj.css('-ms-transform-origin') ||
+    //    //                textObj.css('transform-origin');
+    //    //if(transformOrigin) {
+    //        var textObjParent = $ax('#' + textObj.parent().attr('id'));
+    //        var newX = (textObjParent.width() / 2 - $ax.getNumFromPx(textObj.css('left')));
+    //        var newY = (textObjParent.height() / 2 - $ax.getNumFromPx(textObj.css('top')));
+    //        var newOrigin = newX + 'px ' + newY + 'px';
+    //        textObj.css('-webkit-transform-origin', newOrigin);
+    //        textObj.css('-moz-transform-origin', newOrigin);
+    //        textObj.css('-ms-transform-origin', newOrigin);
+    //        textObj.css('transform-origin', newOrigin);
+    //    //}
+    //};
+
+    $ax.style.reselectElements = function() {
+        for(var id in _selectedWidgets) {
+            // Only looking for the selected widgets that don't have their class set
+            if(!_selectedWidgets[id] || $jobj(id).hasClass('selected')) continue;
+
+            $jobj(id).addClass('selected');
+            _applyImageAndTextJson(id, $ax.style.generateState(id));
+        }
+
+        for(id in _disabledWidgets) {
+            // Only looking for the disabled widgets that don't have their class yet
+            if (!_disabledWidgets[id] || $jobj(id).hasClass('disabled')) continue;
+
+            $jobj(id).addClass('disabled');
+            _applyImageAndTextJson(id, $ax.style.generateState(id));
+        }
+    }
+
+    $ax.style.clearStateForRepeater = function(repeaterId) {
+        var children = $ax.getChildElementIdsForRepeater(repeaterId);
+        for(var i = 0; i < children.length; i++) {
+            var id = children[i];
+            delete _selectedWidgets[id];
+            delete _disabledWidgets[id];
+        }
+    }
+
+    _style.updateStateClass = function (repeaterId) {
+        var subElementIds = $ax.getChildElementIdsForRepeater(repeaterId);
+        for (var i = 0; i < subElementIds.length; i++) {
+            _applyImageAndTextJson(subElementIds[i], $ax.style.generateState(subElementIds[i]));
+        }
+    }
+
+    $ax.style.clearAdaptiveStyles = function() {
+        for(var shapeId in _adaptiveStyledWidgets) {
+            var repeaterId = $ax.getParentRepeaterFromScriptId(shapeId);
+            if(repeaterId) continue;
+            var elementId = $ax.GetButtonShapeId(shapeId);
+            if(elementId) _applyImageAndTextJson(elementId, $ax.style.generateState(elementId));
+        }
+
+        _adaptiveStyledWidgets = {};
+    };
+
+    $ax.style.setAdaptiveStyle = function(shapeId, style) {
+        _adaptiveStyledWidgets[$ax.repeater.getScriptIdFromElementId(shapeId)] = style;
+
+        var textId = $ax.GetTextPanelId(shapeId);
+        if(textId) _applyTextStyle(textId, style);
+
+        $ax.placeholderManager.refreshPlaceholder(shapeId);
+
+        // removing this for now
+        //        if(style.location) {
+        //            $jobj(shapeId).css('top', style.location.x + "px")
+        //                .css('left', style.location.y + "px");
+        //        }
+    };
+
+    //-------------------------------------------------------------------------
+    // _applyTextStyle
+    //
+    // Applies a rollover style to a text element.
+    //       id : the id of the text object to set.
+    //       styleProperties : an object mapping style properties to values. eg:
+    //                         { 'fontWeight' : 'bold',
+    //                           'fontStyle' : 'italic' }
+    //-------------------------------------------------------------------------
+    var _applyTextStyle = function(id, style) {
+        _transformTextWithVerticalAlignment(id, function() {
+            var styleProperties = _getCssStyleProperties(style);
+            $('#' + id).find('*').each(function(index, element) {
+                _applyCssProps(element, styleProperties);
+            });
+        });
+    };
+
+    var _applyCssProps = function(element, styleProperties, applyAllStyle) {
+        if(applyAllStyle) {
+            var allProps = styleProperties.allProps;
+            for(var prop in allProps) element.style[prop] = allProps[prop];
+        } else {
+            var nodeName = element.nodeName.toLowerCase();
+            if(nodeName == 'p') {
+                var parProps = styleProperties.parProps;
+                for(prop in parProps) element.style[prop] = parProps[prop];
+            } else if(nodeName != 'a') {
+                var runProps = styleProperties.runProps;
+                for(prop in runProps) element.style[prop] = runProps[prop];
+            }
+        }
+    };
+
+    var _getCssShadow = function(shadow) {
+        return !shadow.on ? "none"
+            : shadow.offsetX + "px " + shadow.offsetY + "px " + shadow.blurRadius + "px " + _getCssColor(shadow.color);
+    };
+
+    var _getCssStyleProperties = function(style) {
+        var toApply = {};
+        toApply.runProps = {};
+        toApply.parProps = {};
+        toApply.allProps = {};
+
+        if(style.fontName) toApply.allProps.fontFamily = toApply.runProps.fontFamily = style.fontName;
+        // we need to set font size on both runs and pars because otherwise it well mess up the measure and thereby vertical alignment
+        if(style.fontSize) toApply.allProps.fontSize = toApply.runProps.fontSize = toApply.parProps.fontSize = style.fontSize;
+        if(style.fontWeight !== undefined) toApply.allProps.fontWeight = toApply.runProps.fontWeight = style.fontWeight;
+        if(style.fontStyle !== undefined) toApply.allProps.fontStyle = toApply.runProps.fontStyle = style.fontStyle;
+
+        var textDecoration = [];
+        if(style.underline !== undefined) textDecoration[0] = style.underline ? 'underline ' : 'none';
+        if(style.strikethrough !== undefined) {
+            var index = textDecoration.length;
+            if(style.strikethrough) textDecoration[index] ='line-through';
+            else if(index == 0) textDecoration[0] = 'none';
+        } 
+        if (textDecoration.length > 0) {
+            var decorationLineUp = "";
+            for (var l = 0; l < textDecoration.length; l++) {
+                decorationLineUp = decorationLineUp + textDecoration[l];
+            }
+            toApply.allProps.textDecoration = toApply.runProps.textDecoration = decorationLineUp;
+        }
+        if(style.foreGroundFill) {
+            toApply.allProps.color = toApply.runProps.color = _getColorFromFill(style.foreGroundFill);
+            //if(style.foreGroundFill.opacity) toApply.allProps.opacity = toApply.runProps.opacity = style.foreGroundFill.opacity;
+        }
+        if(style.horizontalAlignment) toApply.allProps.textAlign = toApply.parProps.textAlign = toApply.runProps.textAlign = style.horizontalAlignment;
+        if(style.lineSpacing) toApply.allProps.lineHeight = toApply.parProps.lineHeight = style.lineSpacing;
+        if(style.textShadow) toApply.allProps.textShadow = toApply.parProps.textShadow = _getCssShadow(style.textShadow);
+        if (style.letterCase) toApply.allProps.textTransform = toApply.parProps.textTransform = style.letterCase;
+        if (style.characterSpacing) toApply.allProps.letterSpacing = toApply.runProps.letterSpacing = style.characterSpacing;
+
+        return toApply;
+    };
+
+    var _getColorFromFill = function(fill) {
+        //var fillString = '00000' + fill.color.toString(16);
+        //return '#' + fillString.substring(fillString.length - 6);
+        var val = fill.color;
+        var color = {};
+        color.b = val % 256;
+        val = Math.floor(val / 256);
+        color.g = val % 256;
+        val = Math.floor(val / 256);
+        color.r = val % 256;
+        color.a = typeof (fill.opacity) == 'number' ? fill.opacity : 1;
+        return _getCssColor(color);
+    };
+
+    var _getCssColor = function(rgbaObj) {
+        return "rgba(" + rgbaObj.r + ", " + rgbaObj.g + ", " + rgbaObj.b + ", " + rgbaObj.a + ")";
+    };
+
+    //    //--------------------------------------------------------------------------
+    //    // ApplyStyleRecursive
+    //    //
+    //    // Applies a style recursively to all span and div tags including elementNode
+    //    // and all of its children.
+    //    //
+    //    //     element : the element to apply the style to
+    //    //     styleName : the name of the style property to set (eg. 'font-weight')     
+    //    //     styleValue : the value of the style to set (eg. 'bold')
+    //    //--------------------------------------------------------------------------
+    //    function ApplyStyleRecursive(element, styleName, styleValue) {
+    //        var nodeName = element.nodeName.toLowerCase();
+
+    //        if (nodeName == 'div' || nodeName == 'span' || nodeName == 'p') {
+    //            element.style[styleName] = styleValue;
+    //        }
+
+    //        for (var i = 0; i < element.childNodes.length; i++) {
+    //            ApplyStyleRecursive(element.childNodes[i], styleName, styleValue);
+    //        }
+    //    }
+
+    //    //---------------------------------------------------------------------------
+    //    // ApplyTextProperty
+    //    //
+    //    // Applies a text property to rtfElement.
+    //    //
+    //    //     rtfElement : the the root text element of the rtf object (this is the
+    //    //                  element named <id>_rtf
+    //    //     prop : the style property to set.
+    //    //     value : the style value to set.
+    //    //---------------------------------------------------------------------------
+    //    function ApplyTextProperty(rtfElement, prop, value) {
+    //        /*
+    //        var oldHtml = rtfElement.innerHTML;
+    //        if (prop == 'fontWeight') {
+    //            rtfElement.innerHTML = oldHtml.replace(/< *b *\/?>/gi, "");
+    //        } else if (prop == 'fontStyle') {
+    //            rtfElement.innerHTML = oldHtml.replace(/< *i *\/?>/gi, "");
+    //        } else if (prop == 'textDecoration') {
+    //            rtfElement.innerHTML = oldHtml.replace(/< *u *\/?>/gi, "");
+    //        }
+    //        */
+
+    //        for (var i = 0; i < rtfElement.childNodes.length; i++) {
+    //            ApplyStyleRecursive(rtfElement.childNodes[i], prop, value);
+    //        }
+    //    }
+    //}
+
+    //---------------------------------------------------------------------------
+    // GetAndCacheOriginalText
+    //
+    // Gets the html for the pre-rollover state and returns the Html representing
+    // the Rich text.
+    //---------------------------------------------------------------------------
+    var CACHE_COUNTER = 0;
+
+    $ax.style.CacheOriginalText = function(textId, hasRichTextBeenSet) {
+        var rtfQuery = $('#' + textId);
+        if(rtfQuery.length > 0) {
+
+            var styleCache = {};
+            rtfQuery.find('*').each(function(index, element) {
+                var elementId = element.id;
+                if(!elementId) element.id = elementId = 'cache' + CACHE_COUNTER++;
+                styleCache[elementId] = element.style.cssText;
+            });
+
+            _originalTextCache[textId] = {
+                styleCache: styleCache
+            };
+            if(hasRichTextBeenSet) {
+                var shapeId = $ax.GetShapeIdFromText(textId);
+                _shapesWithSetRichText[shapeId] = true;
+            }
+        }
+    };
+
+    $ax.style.ClearCacheForRepeater = function(repeaterId) {
+        for(var elementId in _originalTextCache) {
+            var scriptId = $ax.repeater.getScriptIdFromElementId(elementId);
+            if($ax.getParentRepeaterFromScriptId(scriptId) == repeaterId) delete _originalTextCache[elementId];
+        }
+    };
+
+
+
+    $ax.style.prefetch = function() {
+        var scriptIds = $ax.getAllScriptIds();
+        var image = new Image();
+        for(var i = 0; i < scriptIds.length; i++) {
+            var obj = $obj(scriptIds[i]);
+            if (!$ax.public.fn.IsImageBox(obj.type)) continue;
+            var images = obj.images;
+            for (var key in images) image.src = images[key];
+
+            var imageOverrides = obj.imageOverrides;
+            for(var elementId in imageOverrides) {
+                var override = imageOverrides[elementId];
+                for (var state in override) {
+                    _addImageOverride(elementId, state, override[state]);
+                    image.src = override[state];
+                }
+            }
+        }
+    };
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/tree.js b/src_old/resources/scripts/axure/tree.js
new file mode 100644
index 0000000..7c5ca2d
--- /dev/null
+++ b/src_old/resources/scripts/axure/tree.js
@@ -0,0 +1,189 @@
+// This is actually for BOTH trees and menus
+$axure.internal(function($ax) {
+    var _tree = $ax.tree = {};
+    var _menu = $ax.menu = {};
+
+    $ax.menu.InitializeSubmenu = function(subMenuId, cellId) {
+        var $submenudiv = $('#' + subMenuId);
+
+        //mouseenter and leave for parent table cell
+        $('#' + cellId).mouseenter(function(e) {
+            //show current submenu
+//            var submenuElement = document.getElementById(subMenuId);
+//            if($ax.visibility.IsVisible(submenuElement) && submenuElement.style.display !== 'none') return;
+            $ax.visibility.SetIdVisible(subMenuId, true);
+            $ax.legacy.BringToFront(subMenuId);
+            //$submenudiv.find('.menu_item').each(function() {
+            //    $ax.style.updateTextAlignmentForVisibility($ax.GetTextPanelId($(this).attr('id')));
+            //});
+            _fireEventForSubmenu(subMenuId, "onShow");
+
+        }).mouseleave(function (e) {
+            var offset = $submenudiv.offset();
+            var subcontwidth = $submenudiv.width();
+            var subcontheight = $submenudiv.height();
+            //If mouse is not within the submenu (added 3 pixel margin to top and left calculations), then close the submenu...
+            if(e.pageX + 3 < offset.left || e.pageX > offset.left + subcontwidth || e.pageY + 3 < offset.top || e.pageY > offset.top + subcontheight) {
+                $submenudiv.find('.sub_menu').addBack().each(function () {
+//                    if(!$ax.visibility.IsVisible(this)) return;
+                    $ax.visibility.SetVisible(this, false);
+                    _fireEventForSubmenu(subMenuId, "onHide");
+                });
+                $ax.style.SetWidgetHover(cellId, false);
+            }
+        });
+
+        $submenudiv.css('display', 'none');
+
+        //mouseleave for submenu
+        $submenudiv.mouseleave(function(e) {
+            //close this menu and all menus below it
+            $(this).find('.sub_menu').addBack().css({ 'visibility': 'hidden', 'display': 'none' }).each(function () {
+//                if(!$ax.visibility.IsVisible(this)) return;
+                _fireEventForSubmenu(this.id, "onHide");
+            });
+            $ax.style.SetWidgetHover(cellId, false);
+        });
+    };
+
+    var _fireEventForSubmenu = function(targetId, eventName) {
+        var diagramObject = $ax.getObjectFromElementId(targetId);
+        var event = diagramObject.interactionMap && diagramObject.interactionMap[eventName];
+        if(event) {
+            var eventInfo = $ax.getEventInfoFromEvent($ax.getjBrowserEvent(), false, targetId);
+            $ax.event.handleEvent(targetId, eventInfo, event, false, true);
+        }
+    }
+
+    function IsNodeVisible(nodeId) {
+        var current = window.document.getElementById(nodeId);
+        var parent = current.parentNode;
+
+        //move all the parent's children that are below the node and their annotations
+        while(!$(current).hasClass("treeroot")) {
+            if(!$ax.visibility.IsVisible(parent)) return false;
+            current = parent;
+            parent = parent.parentNode;
+        }
+        return true;
+    }
+
+    $ax.tree.ExpandNode = function(nodeId, childContainerId, plusMinusId) {
+        var container = window.document.getElementById(childContainerId);
+        if(!container || $ax.visibility.IsVisible(container)) return;
+        $ax.visibility.SetVisible(container, true);
+
+        if(plusMinusId != '') $ax.style.SetWidgetSelected(plusMinusId, true);
+
+        var delta = _getExpandCollapseDelta(nodeId, childContainerId);
+
+        var isVisible = IsNodeVisible(nodeId);
+        var current = window.document.getElementById(nodeId);
+        var parent = current.parentNode;
+
+        //move all the parent's children that are below the node and their annotations
+        while(!$(current).hasClass("treeroot")) {
+            var after = false;
+            var i = 0;
+            for(i = 0; i < parent.childNodes.length; i++) {
+                var child = parent.childNodes[i];
+                if(after && child.id && $(child).hasClass("treenode")) {
+                    var elementId = child.id;
+                    child.style.top = $ax.getNumFromPx($(child).css('top')) + delta + 'px';
+                    var ann = window.document.getElementById(elementId + "_ann");
+                    if (ann) ann.style.top = $ax.getNumFromPx($(ann).css('top')) + delta + 'px';
+                }
+                if(child == current) after = true;
+            }
+            current = parent;
+            parent = parent.parentNode;
+            if(!isVisible && $ax.visibility.IsVisible(parent)) break;
+        }
+    };
+
+    $ax.tree.CollapseNode = function(nodeId, childContainerId, plusMinusId) {
+        var container = window.document.getElementById(childContainerId);
+        if(!container || !$ax.visibility.IsVisible(container)) return;
+
+        if(plusMinusId != '') $ax.style.SetWidgetSelected(plusMinusId, false);
+
+        var delta = _getExpandCollapseDelta(nodeId, childContainerId);
+
+        //hide it after getting the delta, otherwise the delta can't be calculated (offsetParent is null)
+        $ax.visibility.SetVisible(container, false);
+
+        var isVisible = IsNodeVisible(nodeId);
+        var current = window.document.getElementById(nodeId);
+        var parent = current.parentNode;
+
+        //move all the parent's children that are below the node and their annotations
+        while(!$(current).hasClass("treeroot")) {
+            var after = false;
+            var i = 0;
+            for(i = 0; i < parent.childNodes.length; i++) {
+                var child = parent.childNodes[i];
+                if(after && child.id && $(child).hasClass("treenode")) {
+                    var elementId = child.id;
+                    child.style.top = $ax.getNumFromPx($(child).css('top')) - delta + 'px';
+                    var ann = window.document.getElementById(elementId + "_ann");
+                    if (ann) ann.style.top = $ax.getNumFromPx($(ann).css('top')) - delta + 'px';
+                }
+                if(child == current) after = true;
+            }
+            current = parent;
+            parent = current.parentNode;
+            if(!isVisible && $ax.visibility.IsVisible(parent)) break;
+        }
+    };
+
+    var _getExpandCollapseDelta = function(nodeId, childContainerId) {
+        return _getChildContainerHeightHelper(childContainerId);
+    };
+
+    var _getChildContainerHeightHelper = function(childContainerId) {
+        var height = 0;
+        $('#' + childContainerId).children().each(function() {
+            if($(this).hasClass("treenode")) {
+                height += $(this).height();
+                var subContainer = window.document.getElementById(this.id + '_children');
+                if(subContainer && $ax.visibility.IsVisible(subContainer)) {
+                    height += _getChildContainerHeightHelper(subContainer.id);
+                }
+            }
+        });
+        return height;
+    };
+
+    $ax.tree.InitializeTreeNode = function(nodeId, plusminusid, childContainerId, selectText) {
+        var childContainer = window.document.getElementById(childContainerId);
+        if(childContainer) {
+            //relying on the html generator to put this inline so we know to collapse by default
+            var isCollapsed = childContainer.style.visibility == "hidden";
+            if(isCollapsed) $ax.visibility.SetVisible(childContainer, false);
+
+            if(!isCollapsed && plusminusid != '') $ax.style.SetWidgetSelected(plusminusid, true);
+        }
+
+        if(plusminusid != '') {
+            $jobj(plusminusid).click(function() {
+                var visibleSet = $ax.visibility.IsIdVisible(childContainerId);
+
+                if(visibleSet) $ax.tree.CollapseNode(nodeId, childContainerId, plusminusid);
+                else $ax.tree.ExpandNode(nodeId, childContainerId, plusminusid);
+                $ax.tree.SelectTreeNode(nodeId, true);
+
+                return false;
+            }).css('cursor', 'default');
+        }
+    };
+
+    var _getButtonShapeId = function(id) {
+        var obj = $obj(id);
+        return $ax.public.fn.IsTreeNodeObject(obj.type) ? $ax.getElementIdFromPath([obj.buttonShapeId], { relativeTo: id }) : id;
+    };
+
+    $ax.tree.SelectTreeNode = function(id, selected) {
+        $ax.style.SetWidgetSelected(_getButtonShapeId(id), selected);
+    };
+
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/utils.temp.js b/src_old/resources/scripts/axure/utils.temp.js
new file mode 100644
index 0000000..43ba542
--- /dev/null
+++ b/src_old/resources/scripts/axure/utils.temp.js
@@ -0,0 +1,99 @@
+// ******* Deep Copy ******** //
+$axure.internal(function($ax) {
+    // TODO: [ben] Ah, infinite loops cause major issues here. Tried saving objects we've already hit, but that didn't seem to work (at least at my first shot).
+    // TODO:  [ben] To continue from above, added a filter to filter out problem keys. Will need a better way of sorting this out eventually.
+    var _deepCopy = function (original, trackCopies, filter) {
+        if(trackCopies) {
+            var index = _getCopyIndex(original);
+            if(index != -1) return _originalToCopy[index][1];
+        }
+        var isArray = original instanceof Array;
+        var isObject = !(original instanceof Function) && !(original instanceof Date) && (original instanceof Object);
+        if(!isArray && !isObject) return original;
+        var copy = isArray ? [] : { };
+        if(trackCopies) _originalToCopy.push([original, copy]);
+        isArray ? deepCopyArray(original, trackCopies, copy, filter) : deepCopyObject(original, trackCopies, copy, filter);
+        return copy;
+    };
+    $ax.deepCopy = _deepCopy;
+
+    // Hacky way to copy event info. Copying dragInfo causes major issues due to infinite loops
+    // Hashmap doesn't map objects well. It just toStrings them, making them all the same key. This has to be slow...
+    var _originalToCopy = [];
+    var _getCopyIndex = function(original) {
+        for(var i = 0; i < _originalToCopy.length; i++) if(original === _originalToCopy[i][0]) return i;
+        return -1;
+    };
+
+    $ax.eventCopy = function(eventInfo) {
+        var copy = _deepCopy(eventInfo, true, ['dragInfo', 'elementQuery', 'obj']);
+        // reset the map. TODO: May need to reset elsewhere too, but this is the only way it's used currently
+        _originalToCopy = [];
+
+        return copy;
+    };
+
+    var deepCopyArray = function(original, trackCopies, copy, filter) {
+        for(var i = 0; i < original.length; i++) {
+            copy[i] = _deepCopy(original[i], trackCopies, filter);
+        }
+    };
+
+    var deepCopyObject = function(original, trackCopies, copy, filter) {
+        for(var key in original) {
+            if(!original.hasOwnProperty(key)) continue; // Continue if the prop was not put there like a dictionary, but just a native part of the object
+
+            if(filter && filter.indexOf[key] != -1) copy[key] = original[key]; // If that key is filtered out, skip recursion on it.
+            else copy[key] = _deepCopy(original[key], trackCopies, filter);
+        }
+    };
+
+    // Our implementation of splice because it is broken in IE8...
+    $ax.splice = function(array, startIndex, count) {
+        var retval = [];
+        if(startIndex >= array.length || startIndex < 0 || count == 0) return retval;
+        if(!count || startIndex + count > array.length) count = array.length - startIndex;
+        for(var i = 0; i < count; i++) retval[i] = array[startIndex + i];
+        for(i = startIndex + count; i < array.length; i++) array[i - count] = array[i];
+        for(i = 0; i < count; i++) array.pop();
+        return retval;
+    };
+});
+
+
+
+// ******* Flow Shape Links ******** //
+$axure.internal(function($ax) {
+
+    $(window.document).ready(function() {
+        if (!$ax.document.configuration.linkFlowsToPages && !$ax.document.configuration.linkFlowsToPagesNewWindow) return;
+
+        $ax(function (dObj) { return ($ax.public.fn.IsVector(dObj.type) || $ax.public.fn.IsSnapshot(dObj.type)) && dObj.referencePageUrl; }).each(function (dObj, elementId) {
+
+            var elementIdQuery = $('#' + elementId);
+
+            if($ax.document.configuration.linkFlowsToPages && !$ax.event.HasClick(dObj)) {
+                elementIdQuery.css("cursor", "pointer");
+                elementIdQuery.click(function() {
+                    $ax.navigate({
+                        url: dObj.referencePageUrl,
+                        target: "current",
+                        includeVariables: true
+                    });
+                });
+            }
+
+            if($ax.document.configuration.linkFlowsToPagesNewWindow) {
+                $('#' + elementId + "_ref").append("<div id='" + elementId + "PagePopup' class='refpageimage'></div>");
+                $('#' + elementId + "PagePopup").click(function() {
+                    $ax.navigate({
+                        url: dObj.referencePageUrl,
+                        target: "new",
+                        includeVariables: true
+                    });
+                });
+            }
+        });
+    });
+
+});
diff --git a/src_old/resources/scripts/axure/variables.js b/src_old/resources/scripts/axure/variables.js
new file mode 100644
index 0000000..7839bdd
--- /dev/null
+++ b/src_old/resources/scripts/axure/variables.js
@@ -0,0 +1,136 @@
+// ******* GLOBAL VARIABLE PROVIDER ******** //
+$axure.internal(function($ax) {
+    var _globalVariableValues = {};
+
+    var _globalVariableProvider = {};
+    $ax.globalVariableProvider = _globalVariableProvider;
+
+    var setVariableValue = function(variable, value, suppressBroadcast) {
+        if(!(value instanceof Object)) value = value.toString();
+
+        variable = variable.toLowerCase();
+        _globalVariableValues[variable] = value;
+
+        if(suppressBroadcast !== true) {
+            var varData = {
+                globalVarName: variable,
+                globalVarValue: value.toString()
+            };
+
+            $axure.messageCenter.postMessage('setGlobalVar', varData);
+        }
+
+        //Post global var values only if pageData is loaded (suppresses exception which occurs when page loads)
+        if($ax.pageData) {
+            _postGlobalVarVals();
+        }
+    };
+    _globalVariableProvider.setVariableValue = setVariableValue;
+
+    var getVariableValue = function(variable, eventInfo, ignoreDefaultsForLinkUrl) {
+        variable = variable.toLowerCase();
+        if(_globalVariableValues[variable] !== undefined) {
+            //If this is for the GetLinkUrl function and 
+            //the current value of the global variable is the same as the default defined in the document, don't return it
+            if(ignoreDefaultsForLinkUrl == true && $ax.document.globalVariables[variable] == _globalVariableValues[variable]) {
+                return null;
+            }
+
+            return _globalVariableValues[variable];
+        }
+        if($ax.document.globalVariables[variable] !== undefined) return ignoreDefaultsForLinkUrl == true ? null : $ax.document.globalVariables[variable];
+        switch(variable) {
+            case "pagename": return $ax.pageData.page.name;
+
+            case "now": return eventInfo.now;
+            case "gendate": return $ax.pageData.generationDate;
+
+            case "dragx": return $ax.drag.GetDragX();
+            case "dragy": return $ax.drag.GetDragY();
+            case "totaldragx": return $ax.drag.GetTotalDragX();
+            case "totaldragy": return $ax.drag.GetTotalDragY();
+            case "dragtime": return $ax.drag.GetDragTime();
+
+            case "math": return Math;
+            case "date": return Date;
+
+            case "window": return eventInfo && eventInfo.window;
+            case "this": return eventInfo && eventInfo.thiswidget && $ax.getWidgetInfo(eventInfo.thiswidget.elementId);
+            case "item": return (eventInfo && eventInfo.item && eventInfo.item.valid && eventInfo.item) || getVariableValue('targetitem', eventInfo, ignoreDefaultsForLinkUrl);
+            case "targetitem": return eventInfo && eventInfo.targetElement && $ax.getItemInfo(eventInfo.targetElement);
+            case "repeater": return eventInfo && eventInfo.repeater;
+            case "target": return eventInfo && eventInfo.targetElement && $ax.getWidgetInfo(eventInfo.targetElement);
+            case "cursor": return eventInfo && eventInfo.cursor;
+            default:
+                var gen = variable.substr(0, 3) == "gen";
+                var date = gen ? $ax.pageData.generationDate : new Date();
+                var prop = gen ? variable.substr(3) : variable;
+                switch(prop) {
+                    case "day": return date.getDate();
+                    case "month": return date.getMonth() + 1;
+                    case "monthname": return $ax.getMonthName(date.getMonth());
+                    case "dayofweek": return $ax.getDayOfWeek(date.getDay());
+                    case "year": return date.getFullYear();
+                    case "time": return date.toLocaleTimeString();
+                    case "hours": return date.getHours();
+                    case "minutes": return date.getMinutes();
+                    case "seconds": return date.getSeconds();
+                    default: return '';
+                }
+        }
+    };
+    _globalVariableProvider.getVariableValue = getVariableValue;
+
+    var load = function() {
+        let query = (window.location.href.split("#")[1] || ''); //hash.substring(1); Firefox decodes this so & in variables breaks
+        if(query.length > 0) {
+            $ax.utils.parseGlobalVars(query, setVariableValue);
+        }
+    };
+
+    var getLinkUrl = function(baseUrl, useGlobalVarName) {
+        var toAdd = '';
+        var definedVariables = _getDefinedVariables();
+        for(var i = 0; i < definedVariables.length; i++) {
+            var key = definedVariables[i];
+            var val = getVariableValue(key, undefined, true);
+            if(val != null) {
+                if(toAdd.length > 0) toAdd += '&';
+                else if(useGlobalVarName) toAdd = GLOBAL_VAR_NAME;
+                toAdd += key + '=' + encodeURIComponent(val);
+            }
+        }
+        return toAdd.length > 0 ? baseUrl + (useGlobalVarName ? '' : $axure.shouldSendVarsToServer() ? '?' : '#') + toAdd + "&" + GLOBAL_VAR_CHECKSUM + "=1" : baseUrl;
+    };
+    _globalVariableProvider.getLinkUrl = getLinkUrl;
+
+    var _getDefinedVariables = function() {
+        return $ax.pageData.variables;
+    };
+    _globalVariableProvider.getDefinedVariables = _getDefinedVariables;
+
+    var _postGlobalVarVals = function() {
+        var retVal = {};
+        var definedVariables = _getDefinedVariables();
+        for(var i = 0; i < definedVariables.length; i++) {
+            var key = definedVariables[i];
+            var val = getVariableValue(key);
+            if(val != null) {
+                retVal[key] = val;
+            }
+        }
+
+        $ax.messageCenter.postMessage('globalVariableValues', retVal);
+    };
+
+    $ax.messageCenter.addMessageListener(function(message, data) {
+        if(message == 'getGlobalVariables') {
+            _postGlobalVarVals();
+        } else if(message == 'resetGlobalVariables') {
+            _globalVariableValues = {};
+            _postGlobalVarVals();
+        }
+    });
+
+    load();
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/viewer.js b/src_old/resources/scripts/axure/viewer.js
new file mode 100644
index 0000000..10415e4
--- /dev/null
+++ b/src_old/resources/scripts/axure/viewer.js
@@ -0,0 +1,268 @@
+// ******* SITEMAP TOOLBAR VIEWER ACTIONS ******** //
+$axure.internal(function ($ax) {
+    var userTriggeredEventNames = ['onClick', 'onDoubleClick', 'onMouseOver', 'onMouseMove', 'onMouseOut', 'onMouseDown', 'onMouseUp',
+        'onKeyDown', 'onKeyUp', 'onFocus', 'onLostFocus', 'onTextChange', 'onSelectionChange', 'onSelectedChange', 'onSelect', 'onUnselect',
+        'onSwipeLeft', 'onSwipeRight', 'onSwipeUp', 'onSwipeDown', 'onDragStart', 'onDrag', 'onDragDrop', 'onScroll', 'onContextMenu', 'onMouseHover', 'onLongClick'];
+    
+    //var _toggleSelectWidgetNoteForRepeater = function (repeaterId, scriptId, select) {
+    //    var itemIds = $ax.getItemIdsForRepeater(repeaterId);
+
+    //    for(var i = 0; i < itemIds.length; i++) {
+    //        var itemId = itemIds[i];
+    //        var elementId = $ax.repeater.createElementId(scriptId, itemId);
+    //        if(select) $('#' + elementId).addClass('widgetNoteSelected');
+    //        else $('#' + elementId).removeClass('widgetNoteSelected');
+    //    }
+    //}
+    $ax.messageCenter.addMessageListener(function (message, data) {
+        //If annotation toggle message received from sitemap, toggle footnotes
+        if(message == 'toggleSelectWidgetNote') {
+
+            if (!IOS) {
+                $('.widgetNoteSelected').removeClass('widgetNoteSelected');
+            }
+
+            if(!data.value) return;
+
+            //if(lastSelectedWidgetNote == data.id) {
+            //    lastSelectedWidgetNote = null;
+            //    return;
+            //}
+
+            $ax('*').each(function(obj, elementId) {
+                if (obj.id == data.id) {
+                    if (!IOS) {
+                        $('#' + elementId).addClass('widgetNoteSelected');
+                    }
+
+                    _scrollToSelectedNote($('#' + elementId), data.view);
+                }
+            });
+        }
+    });
+
+    var _scrollToSelectedNote = function ($elmt, view) {
+        var isLandscape = IOS ? window.orientation != 0 && window.orientation != 180 : false;
+        var winWidth = !IOS ? $(window).width() : (isLandscape ? window.screen.height : window.screen.width) - view.panelWidthOffset;
+        var winHeight = !IOS ? $(window).height() : view.height;
+        var docLeft = $('html').last().scrollLeft();
+        var docTop = $('html').last().scrollTop();
+        var docRight = docLeft + winWidth;
+        var docBottom = docTop + winHeight;
+
+        var scale = $('#base').css('transform');;
+        scale = (scale == "none") ? 1 : Number(scale.substring(scale.indexOf('(') + 1, scale.indexOf(',')));
+
+        var bodyLeft = ($('body').css('left') !== undefined && $('body').css('left') !== "auto") ? Number($('body').css('left').replace('px','')) : 0;
+        var top = scale * Number($elmt.css('top').replace('px', ''));
+        var bottom = top + scale * $elmt.height();
+        var left = scale * Number($elmt.css('left').replace('px', '')) + bodyLeft;
+        var right = left + scale * $elmt.width();
+
+        var doHorizontalMove = left < docLeft || right > docRight;
+        var doVerticalMove = top < docTop || bottom > docBottom;
+        var padding = scale * 50;
+
+        var newScrollLeft = 0
+        if (left < docLeft) {
+            newScrollLeft = left - padding;
+        } else if (right > docRight) {
+            newScrollLeft = right + padding - winWidth;
+        }
+
+        var newScrollTop = 0
+        if (top < docTop) {
+            newScrollTop = top - padding;
+        } else if (bottom > docBottom) {
+            newScrollTop = bottom + padding - winHeight;
+        }
+
+        // Device Frame or Scale to width or Scale to fit (situations where there is no horizontal scroll)
+        if (view.h || view.scaleVal == 1 || view.scaleVal == 2) {
+            doHorizontalMove = false;
+        }
+
+        // Has Device Frame or Scale to Width and widget with note is outside of viewable panel right bounds
+        if ((view.scaleVal == 1 || view.h) && (left > docRight)) {
+            doVerticalMove = false;
+        }
+
+        // TODO: need to do something for dynamic panel with scroll
+        if (doHorizontalMove && doVerticalMove) {
+            $("html, body").animate({ scrollLeft: newScrollLeft, scrollTop: newScrollTop }, 300);
+        } else if (doHorizontalMove) {
+            $("html, body").animate({ scrollLeft: newScrollLeft }, 300);
+        } else if (doVerticalMove) {
+            $("html, body").animate({ scrollTop: newScrollTop }, 300);
+        }
+    }
+
+    var highlightEnabled = false;
+    $ax.messageCenter.addMessageListener(function(message, data) {
+        if(message == 'highlightInteractive') {
+            highlightEnabled = data == true;
+            _applyHighlight($ax('*'));
+        }
+    });
+
+    var _applyHighlight = $ax.applyHighlight = function(query, ignoreUnset) {
+        if(ignoreUnset && !highlightEnabled) return;
+
+        var pulsateClassName = 'legacyPulsateBorder';
+        //Determine if the widget has a defined userTriggeredEventName specified in the array above
+        var _isInteractive = function(diagramObject) {
+            if(diagramObject && diagramObject.interactionMap) {
+                for(var index in userTriggeredEventNames) {
+                    if(diagramObject.interactionMap[userTriggeredEventNames[index]]) return true;
+                }
+            }
+            return false;
+        };
+
+        //Traverse through parent layers (if any) of an element and see if any have a defined userTriggeredEventName
+        var _findMatchInParent = function(id) {
+            var parents = $ax('#' + id).getParents(true, ['layer'])[0];
+            for(var i in parents) {
+                var parentId = parents[i];
+                var parentObj = $ax.getObjectFromScriptId(parentId);
+                if(_isInteractive(parentObj)) return true;
+            }
+            return false;
+        };
+
+        //Find all widgets with a defined userTriggeredEventName specified in the array above
+        var $matchingElements = query.filter(function (obj, id) {
+
+            //This prevents the top left corner of the page from highlighting with everything else
+            if($ax.public.fn.IsLayer(obj.type)) return false;
+
+            if(_isInteractive(obj)) return true;
+            else if($ax.public.fn.IsVector(obj.type) && obj.referencePageUrl) return true;
+
+            //Last check on the object's parent layer(s), if a layer has a defined userTriggeredEventName
+            //then we shall highlight each member of that layer TODO This is a design decision and is subject to change
+            return _findMatchInParent(id);
+        }).$();
+
+        var isHighlighted = $matchingElements.is('.' + pulsateClassName);
+
+        //Toggle the pulsate class on the matched elements
+        if(highlightEnabled && !isHighlighted) {
+            $matchingElements.addClass(pulsateClassName);
+        } else if(!highlightEnabled && isHighlighted) {
+            $matchingElements.removeClass(pulsateClassName);
+        }
+    };
+    
+    var getElementsFromPoint = function (x, y) {
+        var elementsFromPointFn = document.elementsFromPoint || document.msElementsFromPoint;
+        if (typeof elementsFromPointFn === "function") {
+            return elementsFromPointFn.bind(document)(x, y);
+        }
+        return [];
+    }
+
+    $axure.getIdAndRectAtLoc = function (data) {
+        var element = document.elementFromPoint(data.x, data.y);
+        if (!element) return undefined;
+
+        var jObj = _getElementIdFromTarget(element);
+        if (jObj.length > 0) {
+          var id = jObj.attr('id');
+          var axObj = $ax('#' + id);
+          var rect = axObj.pageBoundingRect();
+          return { 'id': id, 'rect': rect };
+        }
+        return undefined;
+    }
+
+    $axure.getListOfIdAndRectAtLoc = function (data) {
+        var domElements = getElementsFromPoint(data.x, data.y);
+
+        if (!domElements || !domElements.length) return [];
+
+        const elements = [];
+        
+        domElements.forEach(function (domElement) {
+            var jObj = _getElementIdFromTarget(domElement);
+            if (jObj.length > 0) {
+                var id = jObj.attr('id');
+                var axObj = $ax('#' + id);                
+                var rect = axObj.pageBoundingRect();
+                if (elements.findIndex(function (x) { return x.id === id }) < 0) {                    
+                    elements.push( { 'id': id, 'rect': rect } );
+                }
+            }
+        });
+
+        return elements;
+    }
+
+    $axure.getIdRectAndStyleAtLoc = function(data) {
+        var element = document.elementFromPoint(data.x, data.y);
+        if (!element) return undefined;
+
+        var jObj = _getElementIdFromTarget(element);
+        if (jObj.length > 0) {
+          var id = jObj.attr('id');
+          return $axure.getRectAndStyleById(id);
+        }
+        return undefined;
+    }
+
+    $axure.getListOfIdRectAndStyleAtLoc = function(data) {
+        var domElements = getElementsFromPoint(data.x, data.y);
+
+        if (!domElements || !domElements.length) return [];
+        
+        const elements = [];
+        
+        domElements.forEach(function (domElement) {
+            var jObj = _getElementIdFromTarget(domElement);
+            if (jObj.length > 0) {
+                var id = jObj.attr('id');
+                if (elements.findIndex(function (x) { return x.id === id }) < 0) {                    
+                    elements.push($axure.getRectAndStyleById(id));
+                }
+            }
+        });
+
+        return elements;
+    }
+
+    $axure.getRectAndStyleById = function (id) {
+        var axObj = $ax('#' + id);
+        var rect = axObj.pageBoundingRect();
+        var style = $ax.style.computeFullStyle(id, $ax.style.generateState(id), $ax.adaptive.currentViewId);
+        style.text = axObj.text();
+        return { 'id': id, 'rect': rect, 'style': style };
+    }
+
+    $axure.isIdVisible = function (id) {
+        return id ? $ax.visibility.IsIdVisible(id) : false;
+    }
+
+    $axure.getParentElementById = function (elementId) {
+        if (!elementId) return undefined;
+        var parentId = $ax.getLayerParentFromElementId(elementId);
+        if (!parentId) {
+            return undefined;
+        }
+        return $axure.getRectAndStyleById(parentId);
+    }
+
+    var _getElementIdFromTarget = function (target) {
+        var targetId = target.id;
+        var jTarget = $(target);
+        while((!targetId || targetId.indexOf('cache') > -1) && jTarget[0].tagName != 'HTML') {
+            jTarget = jTarget.parent();
+            targetId = jTarget.attr('id');
+        }
+        if(targetId && targetId != 'base') {
+            var sections = targetId.split('_');
+            return $('#' + sections[0]);
+        }
+        return '';
+    }
+
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axure/visibility.js b/src_old/resources/scripts/axure/visibility.js
new file mode 100644
index 0000000..d5c8b38
--- /dev/null
+++ b/src_old/resources/scripts/axure/visibility.js
@@ -0,0 +1,1315 @@
+$axure.internal(function($ax) {
+    var document = window.document;
+    var _visibility = {};
+    $ax.visibility = _visibility;
+
+    var _defaultHidden = {};
+    var _defaultLimbo = {};
+
+    // ******************  Visibility and State Functions ****************** //
+
+    var _isIdVisible = $ax.visibility.IsIdVisible = function(id) {
+        return $ax.visibility.IsVisible(window.document.getElementById(id));
+    };
+
+    $ax.visibility.IsVisible = function(element) {
+        //cannot use css('visibility') because that gets the effective visiblity
+        //e.g. won't be able to set visibility on panels inside hidden panels
+        return element.style.visibility != 'hidden';
+    };
+
+    $ax.visibility.SetIdVisible = function(id, visible) {
+        $ax.visibility.SetVisible(window.document.getElementById(id), visible);
+        // Hide lightbox if necessary
+        if(!visible) {
+            $jobj($ax.repeater.applySuffixToElementId(id, '_lightbox')).remove();
+            $ax.flyoutManager.unregisterPanel(id, true);
+        }
+    };
+
+    var _setAllVisible = function(query, visible) {
+        for(var i = 0; i < query.length; i++) {
+            _visibility.SetVisible(query[i], visible);
+        }
+    }
+
+    $ax.visibility.SetVisible = function (element, visible) {
+        //not setting display to none to optimize measuring
+        if(visible) {
+            if($(element).hasClass(HIDDEN_CLASS)) $(element).removeClass(HIDDEN_CLASS);
+            if($(element).hasClass(UNPLACED_CLASS)) $(element).removeClass(UNPLACED_CLASS);
+            element.style.display = '';
+            element.style.visibility = 'inherit';
+        } else {
+            element.style.display = 'none';
+            element.style.visibility = 'hidden';
+        }
+    };
+
+    var _setWidgetVisibility = $ax.visibility.SetWidgetVisibility = function (elementId, options) {
+        var visible = $ax.visibility.IsIdVisible(elementId);
+        // If limboed, just fire the next action then leave.
+        if(visible == options.value || _limboIds[elementId]) {
+            if(!_limboIds[elementId]) options.onComplete && options.onComplete();
+            $ax.action.fireAnimationFromQueue(elementId, $ax.action.queueTypes.fade);
+            return;
+        }
+
+        options.containInner = true;
+        var query = $jobj(elementId);
+        var parentId = query.parent().attr('id');
+        var axObj = $obj(elementId);
+        var preserveScroll = false;
+        var isPanel = $ax.public.fn.IsDynamicPanel(axObj.type);
+        var isLayer = $ax.public.fn.IsLayer(axObj.type);
+        if(!options.noContainer && (isPanel || isLayer)) {
+            //if dp has scrollbar, save its scroll position
+            if(isPanel && axObj.scrollbars != 'none') {
+                var shownState = $ax.dynamicPanelManager.getShownState(elementId);
+                preserveScroll = true;
+                //before hiding, try to save scroll location
+                if(!options.value && shownState) {
+                    DPStateAndScroll[elementId] = {
+                        shownId: shownState.attr('id'),
+                        left: shownState.scrollLeft(),
+                        top: shownState.scrollTop()
+                    }
+                }
+            }
+
+            _pushContainer(elementId, isPanel);
+            if(isPanel && !options.value) _tryResumeScrollForDP(elementId);
+            var complete = options.onComplete;
+            options.onComplete = function () {
+                if(complete) complete();
+                _popContainer(elementId, isPanel);
+                //using containers stops mouseleave from firing on IE/Edge and FireFox
+                if(!options.value && $ax.event.mouseOverObjectId && (FIREFOX || $axure.browser.isEdge || IE)) {
+                    var mouseOveredElement = $('#' + $ax.event.mouseOverObjectId);
+                    if(mouseOveredElement && !mouseOveredElement.is(":visible")) {
+                        var axObj = $obj($ax.event.mouseOverObjectId);
+
+                        if(($ax.public.fn.IsDynamicPanel(axObj.type) || $ax.public.fn.IsLayer(axObj.type)) && axObj.propagate) {
+                            mouseOveredElement.trigger('mouseleave');
+                        } else mouseOveredElement.trigger('mouseleave.ixStyle');
+                    }
+                }
+                //after showing dp, restore the scoll position
+                if(isPanel && options.value) _tryResumeScrollForDP(elementId, true);
+            }
+            options.containerExists = true;
+        }
+        _setVisibility(parentId, elementId, options, preserveScroll);
+
+        //set the visibility of the annotation box as well if it exists
+        var ann = document.getElementById(elementId + "_ann");
+        if(ann) _visibility.SetVisible(ann, options.value);
+
+        //set ref visibility for ref of flow shape, if that exists
+        var ref = document.getElementById(elementId + '_ref');
+        if(ref) _visibility.SetVisible(ref, options.value);
+
+        if(options.value && !MOBILE_DEVICE && $ax.adaptive.isDeviceMode()) _updateMobileScrollForWidgetShown(axObj);
+    };
+
+    var _updateMobileScrollForWidgetShown = function(widget) {
+        var isPanel = $ax.public.fn.IsDynamicPanel(widget.type);
+        var isLayer = $ax.public.fn.IsLayer(widget.type);
+        if (isPanel) {
+            var elementId = $id(widget);
+            var stateId = $ax.repeater.applySuffixToElementId(elementId, '_state0');
+            $ax.dynamicPanelManager.updateMobileScroll(elementId, stateId, true);
+            if (!widget.diagrams) return;
+            for (var i = 0; i < widget.diagrams.length; ++i) {
+                var diagram = widget.diagrams[i];
+                if (!diagram.objects) continue;
+                for (var j = 0; j < diagram.objects.length; ++j) {
+                    _updateMobileScrollForWidgetShown(diagram.objects[j]);
+                }
+            }
+        } else if (isLayer) {
+            for (var i = 0; i < widget.objs.length; ++i) {
+                _updateMobileScrollForWidgetShown(widget.objs[i]);
+            }
+        }
+    }
+
+    var _setVisibility = function(parentId, childId, options, preserveScroll) {
+        var wrapped = $jobj(childId);
+        var completeTotal = 1;
+        var visible = $ax.visibility.IsIdVisible(childId);
+
+        if(visible == options.value) {
+            options.onComplete && options.onComplete();
+            $ax.action.fireAnimationFromQueue(childId, $ax.action.queueTypes.fade);
+            return;
+        }
+
+        var child = $jobj(childId);
+        var size = options.size || (options.containerExists ? $(child.children()[0]) : child);
+
+        var isIdFitToContent = $ax.dynamicPanelManager.isIdFitToContent(parentId);
+        //fade and resize won't work together when there is a container... but we still needs the container for fit to content DPs
+        var needContainer = options.easing && options.easing != 'none' && (options.easing != 'fade' || isIdFitToContent);
+        var cullPosition = options.cull ? options.cull.css('position') : '';
+        var containerExists = options.containerExists;
+
+        var isFullWidth = $ax.dynamicPanelManager.isPercentWidthPanel($obj(childId));
+
+        // If fixed fit to content panel, then we must set size on it. It will be size of 0 otherwise, because container in it is absolute position.
+        var needSetSize = false;
+        var sizeObj = {};
+        if(needContainer) {
+            var sizeId = '';
+            if($ax.dynamicPanelManager.isIdFitToContent(childId)) sizeId = childId;
+            else {
+                var panelId = $ax.repeater.removeSuffixFromElementId(childId);
+                if($ax.dynamicPanelManager.isIdFitToContent(panelId)) sizeId = panelId;
+            }
+
+            if(sizeId) {
+                needSetSize = true;
+
+                sizeObj = $jobj(sizeId);
+                var newSize = options.cull || sizeObj;
+                var newAxSize = $ax('#' + newSize.attr('id'));
+                sizeObj.width(newAxSize.width());
+                sizeObj.height(newAxSize.height());
+            }
+        }
+
+        var wrappedOffset = { left: 0, top: 0 };
+        var visibleWrapped = wrapped;
+        if(needContainer) {
+            var childObj = $obj(childId);
+            if (options.cull) {
+                var axCull = $ax('#' + options.cull.attr('id'));
+                var containerWidth = axCull.width();
+                var containerHeight = axCull.height();
+            } else {
+                if (childObj && ($ax.public.fn.IsLayer(childObj.type))) {// || childObj.generateCompound)) {
+                    var boundingRectangle = $ax('#' + childId).offsetBoundingRect();
+                    //var boundingRectangle = $ax.public.fn.getWidgetBoundingRect(childId);
+                    wrappedOffset.left = boundingRectangle.left;
+                    wrappedOffset.top = boundingRectangle.top;
+                    containerWidth = boundingRectangle.width;
+                    containerHeight = boundingRectangle.height;
+                } else if (childObj && childObj.generateCompound) {
+                    var image = $jobj(childId + '_img');
+                    containerWidth = $ax.getNumFromPx(image.css('width'));
+                    containerHeight = $ax.getNumFromPx(image.css('height'));
+                    wrappedOffset.left = $ax.getNumFromPx(image.css('left'));
+                    wrappedOffset.top = $ax.getNumFromPx(image.css('top'));
+                } else {
+                    containerWidth = $ax('#' + childId).width();
+                    containerHeight = $ax('#' + childId).height();
+                }
+            }
+
+            var containerId = $ax.visibility.applyWidgetContainer(childId);
+//            var container = _makeContainer(containerId, options.cull || boundingRectangle, isFullWidth, options.easing == 'flip', wrappedOffset, options.containerExists);
+            var container = _makeContainer(containerId, containerWidth, containerHeight, isFullWidth, options.easing == 'flip', wrappedOffset, options.containerExists);
+
+            if(options.containInner) {
+                wrapped = _wrappedChildren(containerExists ? $(child.children()[0]) : child);
+
+                // Filter for visibile wrapped children
+                visibleWrapped = [];
+                for (var i = 0; i < wrapped.length; i++) if($ax.visibility.IsVisible(wrapped[i])) visibleWrapped.push(wrapped[i]);
+                visibleWrapped = $(visibleWrapped);
+
+                completeTotal = visibleWrapped.length;
+                if(!containerExists) container.prependTo(child);
+
+                // Offset items if necessary
+                if(!containerExists && (wrappedOffset.left != 0 || wrappedOffset.top != 0)) {
+                    for(var i = 0; i < wrapped.length; i++) {
+                        var inner = $(wrapped[i]);
+                        inner.css('left', $ax.getNumFromPx(inner.css('left')) - wrappedOffset.left);
+                        inner.css('top', $ax.getNumFromPx(inner.css('top')) - wrappedOffset.top);
+                        // Parent layer is now size 0, so have to have to use conatiner since it's the real size.
+                        //  Should we use container all the time? This may make things easier for fit panels too.
+                        size = container;
+                    }
+                }
+            } else if(!containerExists) container.insertBefore(child);
+            if(!containerExists) wrapped.appendTo(container);
+
+            if (options.value && options.containInner) {
+                //has to set children first because flip to show needs children invisible
+                _setAllVisible(visibleWrapped, false);
+                //_updateChildAlignment(childId);
+                _setAllVisible(child, true);
+            }
+        }
+
+        var completeCount = 0;
+        var onComplete = function () {
+            completeCount++;
+            if (needContainer && completeCount == completeTotal) {
+                if ($ax.public.fn.isCompoundVectorHtml(container.parent()[0])) {
+                    wrappedOffset.left = $ax.getNumFromPx(container.css('left'));
+                    wrappedOffset.top = $ax.getNumFromPx(container.css('top'));
+                }
+
+                if (options.containInner && !containerExists) {
+                    if (wrappedOffset.left != 0 || wrappedOffset.top != 0) {
+                        for (i = 0; i < wrapped.length; i++) {
+                            inner = $(wrapped[i]);
+                            if (!inner.hasClass('text')) {
+                                inner.css('left', $ax.getNumFromPx(inner.css('left')) + wrappedOffset.left);
+                                inner.css('top', $ax.getNumFromPx(inner.css('top')) + wrappedOffset.top);
+                            }
+                        }
+                    }
+
+                    wrapped.filter('.text').css({ 'left': '', 'top': '' });
+                }
+
+                if(options.containInner && !options.value) {
+                    _setAllVisible(child, false);
+                    _setAllVisible(visibleWrapped, true);
+                }
+
+                if(containerExists) {
+                    if(!options.settingChild) container.css('position', 'relative;');
+                } else {
+                    wrapped.insertBefore(container);
+                    container.remove();
+                }
+
+                if(childObj && $ax.public.fn.IsDynamicPanel(childObj.type) && window.modifiedDynamicPanleParentOverflowProp) {
+                    child.css('overflow', 'hidden');
+                    window.modifiedDynamicPanleParentOverflowProp = false;
+                }
+            }
+
+            //if(options.value) _updateChildAlignment(childId);
+
+            if(!needContainer || completeTotal == completeCount) {
+                if(options.cull) options.cull.css('position', cullPosition);
+
+                if(needSetSize) {
+                    sizeObj.css('width', 'auto');
+                    sizeObj.css('height', 'auto');
+                }
+
+                options.onComplete && options.onComplete();
+
+                if(options.fire) {
+                    $ax.event.raiseSyntheticEvent(childId, options.value ? 'onShow' : 'onHide');
+                    $ax.action.fireAnimationFromQueue(childId, $ax.action.queueTypes.fade);
+                }
+            }
+        };
+
+        // Nothing actually being animated, all wrapped elements invisible
+        if(!visibleWrapped.length) {
+            if(!options.easing || options.easing == 'none') {
+                $ax.visibility.SetIdVisible(childId, options.value);
+                completeTotal = 1;
+                onComplete();
+            } else {
+                window.setTimeout(function() {
+                    completeCount = completeTotal - 1;
+                    onComplete();
+                },options.duration);
+            }
+
+            return;
+        }
+
+        if(!options.easing || options.easing == 'none') {
+            $ax.visibility.SetIdVisible(childId, options.value);
+            completeTotal = 1;
+            onComplete();
+        } else if(options.easing == 'fade') {
+            if(options.value) {
+                if(preserveScroll) {
+                    visibleWrapped.css('opacity', 0);
+                    visibleWrapped.css('visibility', 'inherit');
+                    visibleWrapped.css('display', 'block');
+                    //was hoping we could just use fadein here, but need to set display before set scroll position
+                    _tryResumeScrollForDP(childId);
+                    visibleWrapped.animate({ opacity: 1 }, {
+                        duration: options.duration,
+                        easing: 'swing',
+                        queue: false,
+                        complete: function() {
+                            $ax.visibility.SetIdVisible(childId, true);
+                            visibleWrapped.css('opacity', '');
+                            onComplete();
+                        }
+                    });
+                } else {
+                    // Can't use $ax.visibility.SetIdVisible, because we only want to set visible, we don't want to set display, fadeIn will handle that.
+                    visibleWrapped.css('visibility', 'inherit');
+                    visibleWrapped.fadeIn({
+                        queue: false,
+                        duration: options.duration, 
+                        complete: onComplete
+                    });
+                }
+            } else {
+                // Fading here is being strange...
+                visibleWrapped.animate({ opacity: 0 }, { duration: options.duration, easing: 'swing', queue: false, complete: function() {
+                    $ax.visibility.SetIdVisible(childId, false);
+                    visibleWrapped.css('opacity', '');
+
+                    onComplete();
+                }});
+            }
+        } else if (options.easing == 'flip') {
+            //this container will hold 
+            var trapScroll = _trapScrollLoc(childId);
+            var innerContainer = $('<div></div>');
+            innerContainer.attr('id', containerId + "_inner");
+            innerContainer.data('flip', options.direction == 'left' || options.direction == 'right' ? 'y' : 'x');
+            innerContainer.css({
+                position: 'relative',
+                'width': containerWidth,
+                'height': containerHeight,
+                'display': 'flex'
+            });
+
+            innerContainer.appendTo(container);
+            wrapped.appendTo(innerContainer);
+
+            if(childObj && $ax.public.fn.IsDynamicPanel(childObj.type)) var containerDiv = child;
+            else containerDiv = parentId ? $jobj(parentId) : child.parent();
+
+            completeTotal = 1;
+            var flipdegree;
+
+            var originForFlip = containerWidth / 2 + 'px ' + containerHeight / 2 + 'px';
+            if (options.value) {
+                innerContainer.css({
+                    '-webkit-transform-origin': originForFlip,
+                    '-ms-transform-origin': originForFlip,
+                    'transform-origin': originForFlip,
+                });
+
+                //options.value == true means in or show, note to get here, the element must be currently hidden to show,
+                // we need to first flip it +/- 90deg without animation (180 if we want to show the back of the flip)
+                switch(options.direction) {
+                    case 'right':
+                    case 'left':
+                        _setRotateTransformation(innerContainer, _getRotateString(true, options.direction === 'right', options.showFlipBack));
+                        flipdegree = 'rotateY(0deg)';
+                        break;
+                    case 'up':
+                    case 'down':
+                        _setRotateTransformation(innerContainer, _getRotateString(false, options.direction === 'up', options.showFlipBack));
+                        flipdegree = 'rotateX(0deg)';
+                        break;
+                }
+
+                var onFlipShowComplete = function() {
+                    var trapScroll = _trapScrollLoc(childId);
+                    $ax.visibility.SetIdVisible(childId, true);
+
+                    wrapped.insertBefore(innerContainer);
+                    innerContainer.remove();
+                    trapScroll();
+
+                    onComplete();
+                };
+
+                innerContainer.css({
+                    '-webkit-backface-visibility': 'hidden',
+                    'backface-visibility': 'hidden'
+                });
+
+                child.css({
+                    'display': '',
+                    'visibility': 'inherit'
+                });
+
+                visibleWrapped.css({
+                    'display': '',
+                    'visibility': 'inherit'
+                });
+
+                innerContainer.css({
+                    '-webkit-transition-duration': options.duration + 'ms',
+                    'transition-duration': options.duration + 'ms'
+                });
+
+                if(preserveScroll) _tryResumeScrollForDP(childId);
+                _setRotateTransformation(innerContainer, flipdegree, containerDiv, onFlipShowComplete, options.duration, true);
+            } else { //hide or out
+                innerContainer.css({
+                    '-webkit-transform-origin': originForFlip,
+                    '-ms-transform-origin': originForFlip,
+                    'transform-origin': originForFlip,
+                });
+                switch(options.direction) {
+                    case 'right':
+                    case 'left':
+                        flipdegree = _getRotateString(true, options.direction !== 'right', options.showFlipBack);
+                        break;
+                    case 'up':
+                    case 'down':
+                        flipdegree = _getRotateString(false, options.direction !== 'up', options.showFlipBack);
+                        break;
+                }
+
+                var onFlipHideComplete = function() {
+                    var trapScroll = _trapScrollLoc(childId);
+                    wrapped.insertBefore(innerContainer);
+                    $ax.visibility.SetIdVisible(childId, false);
+
+                    innerContainer.remove();
+                    trapScroll();
+
+                    onComplete();
+                };
+
+                innerContainer.css({
+                    '-webkit-backface-visibility': 'hidden',
+                    'backface-visibility': 'hidden',
+                    '-webkit-transition-duration': options.duration + 'ms',
+                    'transition-duration': options.duration + 'ms'
+                });
+
+                if(preserveScroll) _tryResumeScrollForDP(childId);
+                _setRotateTransformation(innerContainer, flipdegree, containerDiv, onFlipHideComplete, options.duration, true);
+            }
+
+            trapScroll();
+        } else {
+            // Because the move is gonna fire on annotation and ref too, need to update complete total
+            completeTotal = $addAll(visibleWrapped, childId).length;
+            if(options.value) {
+                _slideStateIn(childId, childId, options, size, false, onComplete, visibleWrapped, preserveScroll);
+            } else {
+                var tops = [];
+                var lefts = [];
+                for(var i = 0; i < visibleWrapped.length; i++) {
+                    var currWrapped = $(visibleWrapped[i]);
+                    
+                    tops.push(fixAuto(currWrapped, 'top'));
+                    lefts.push(fixAuto(currWrapped, 'left'));
+                }
+
+                var onOutComplete = function () {
+                    //bring back SetIdVisible on childId for hiding lightbox
+                    $ax.visibility.SetIdVisible(childId, false);
+                    for(i = 0; i < visibleWrapped.length; i++) {
+                        currWrapped = $(visibleWrapped[i]);
+                        $ax.visibility.SetVisible(currWrapped[0], false);
+                        currWrapped.css('top', tops[i]);
+                        currWrapped.css('left', lefts[i]);
+                    }
+                    onComplete();
+                };
+                _slideStateOut(size, childId, options, onOutComplete, visibleWrapped);
+            }
+        }
+
+        // If showing, go through all rich text objects inside you, and try to redo alignment of them
+        //if(options.value && !options.containInner) {
+        //    _updateChildAlignment(childId);
+        //}
+    };
+
+    // IE/Safari are giving auto here instead of calculating to for us. May need to calculate this eventually, but for now we can assume auto === 0px for the edge case found
+    var fixAuto = function (jobj, prop) {
+        var val = jobj.css(prop);
+        return val == 'auto' ? '0px' : val;
+    };
+
+    var _getRotateString = function (y, neg, showFlipBack) {
+        // y means flip on y axis, or left/right, neg means flipping it left/down, and show back is for set panel state
+        //  and will show the back of the widget (transparent) for the first half of a show, or second half of a hide.
+        return 'rotate' + (y ? 'Y' : 'X') + '(' + (neg ? '-' : '') + (showFlipBack ? 180 : IE ? 91 : 90) + 'deg)';
+    }
+
+    //var _updateChildAlignment = function(childId) {
+    //    var descendants = $jobj(childId).find('.text');
+    //    for(var i = 0; i < descendants.length; i++) $ax.style.updateTextAlignmentForVisibility(descendants[i].id);
+    //};
+    var _wrappedChildren = function (child) {
+        return child.children();
+        //var children = child.children();
+        //var valid = [];
+        //for(var i = 0; i < children.length; i++) if($ax.visibility.IsVisible(children[i])) valid.push(children[i]);
+        //return $(valid);
+    };
+
+    var requestAnimationFrame = window.requestAnimationFrame ||
+        window.webkitRequestAnimationFrame ||
+        window.mozRequestAnimationFrame || window.msRequestAnimationFrame ||
+        function (callback) {
+            window.setTimeout(callback, 1000 / 60);
+        };
+
+    var _setRotateTransformation = function(elementsToSet, transformValue, elementParent, flipCompleteCallback, flipDurationMs, useAnimationFrame) {
+        if(flipCompleteCallback) {
+            //here we didn't use 'transitionend' event to fire callback
+            //when show/hide on one element, changing transition property will stop the event from firing
+            window.setTimeout(flipCompleteCallback, flipDurationMs);
+        }
+
+        var trasformCss = {
+            '-webkit-transform': transformValue,
+            '-moz-transform': transformValue,
+            '-ms-transform': transformValue,
+            '-o-transform': transformValue,
+            'transform': transformValue
+        };
+
+        if(useAnimationFrame) {
+            if(FIREFOX || CHROME) $('body').hide().show(0); //forces FF to render the animation            
+            requestAnimationFrame(function() {
+                elementsToSet.css(trasformCss);
+            });
+        } else elementsToSet.css(trasformCss);
+
+        //when deal with dynamic panel, we need to set it's parent's overflow to visible to have the 3d effect
+        //NOTE: we need to set this back when both flips finishes in DP, to prevents one animation finished first and set this back
+        if(elementParent && elementParent.css('overflow') === 'hidden') {
+            elementParent.css('overflow', 'visible');
+            window.modifiedDynamicPanleParentOverflowProp = true;
+        }
+    };
+
+    $ax.visibility.GetPanelState = function(id) {
+        var children = $ax.visibility.getRealChildren($jobj(id).children());
+        for(var i = 0; i < children.length; i++) {
+            if(children[i].style && $ax.visibility.IsVisible(children[i])) return children[i].id;
+        }
+        return '';
+    };
+
+    var containerCount = {};
+    $ax.visibility.SetPanelState = function(id, stateId, easingOut, directionOut, durationOut, easingIn, directionIn, durationIn, showWhenSet) {
+        var show = !$ax.visibility.IsIdVisible(id) && showWhenSet;
+        if(show) $ax.visibility.SetIdVisible(id, true);
+
+        // Exit here if already at desired state.
+        if($ax.visibility.IsIdVisible(stateId)) {
+            if(show) {
+                $ax.event.raiseSyntheticEvent(id, 'onShow');
+                // If showing size changes and need to update parent panels
+                $ax.dynamicPanelManager.fitParentPanel(id);
+            }
+
+            $ax.action.fireAnimationFromQueue(id, $ax.action.queueTypes.setState);
+            return;
+        }
+
+        var hasEasing = easingIn != 'none' || easingOut != 'none';
+        if(hasEasing) _pushContainer(id, true);
+
+        var state = $jobj(stateId);
+        var oldStateId = $ax.visibility.GetPanelState(id);
+        var oldState = $jobj(oldStateId);
+
+        var isFixed = $jobj(id).css('position') == 'fixed';
+        //pin to browser
+        if(isFixed) $ax.dynamicPanelManager.adjustFixed(id, oldState.width(), oldState.height(), state.width(), state.height());
+
+        _bringPanelStateToFront(id, stateId, oldStateId, easingIn == 'none' || durationIn == '0');
+
+        var fitToContent = $ax.dynamicPanelManager.isIdFitToContent(id);
+        var resized = false;
+        if(fitToContent) {
+            // Set resized
+            //var width = state.width();
+            //var height = state.height();
+            var newBoundingRect = $ax('#' + stateId).childrenBoundingRect();
+            var width = newBoundingRect.right;
+            var height = newBoundingRect.bottom;
+            var oldBoundingRect = $ax('#' + id).size();
+            var oldWidth = oldBoundingRect.right;
+            var oldHeight = oldBoundingRect.bottom;
+            resized = width != oldWidth || height != oldHeight;
+            //resized = width != oldState.width() || height != oldState.height();
+
+            $ax.visibility.setResizedSize(id, $obj(id).percentWidth ? oldWidth : width, height);
+        }
+
+        //edge case for sliding
+        var movement = (directionOut == 'left' || directionOut == 'up' || state.children().length == 0) && oldState.children().length != 0 ? oldState : state;
+        var onCompleteCount = 0;
+        var onComplete = function () {
+            //move this call from _setVisibility() for animate out.
+            //Because this will make the order of dp divs consistence: the showing panel is always in front after both animation finished
+            //tested in the cases where one panel is out/show slower/faster/same time/instantly. 
+            _bringPanelStateToFront(id, stateId, oldStateId, false);
+
+            if (window.modifiedDynamicPanleParentOverflowProp) {
+                var parent = id ? $jobj(id) : child.parent();
+                parent.css('overflow', 'hidden');
+                window.modifiedDynamicPanleParentOverflowProp = false;
+            }
+
+            $ax.dynamicPanelManager.fitParentPanel(id);
+            $ax.dynamicPanelManager.updatePanelPercentWidth(id);
+            $ax.dynamicPanelManager.updatePanelContentPercentWidth(id);
+            $ax.action.fireAnimationFromQueue(id, $ax.action.queueTypes.setState);
+            $ax.event.raiseSyntheticEvent(id, "onPanelStateChange");
+            $ax.event.leavingState(oldStateId);
+            if (hasEasing) _popContainer(id, true);
+
+            $ax.dynamicPanelManager.updateMobileScroll(id, stateId);
+        };
+        // Must do state out first, so if we cull by new state, location is correct
+        _setVisibility(id, oldStateId, {
+            value: false,
+            easing: easingOut,
+            direction: directionOut,
+            duration: durationOut,
+            containerExists: true,
+            onComplete: function() {
+//                if(easingIn !== 'flip') _bringPanelStateToFront(id, stateId);
+                if (++onCompleteCount == 2) onComplete();
+            },
+            settingChild: true,
+            size: movement,
+            //cull for 
+            cull: easingOut == 'none' || state.children().length == 0 ? oldState : state,
+            showFlipBack: true
+        });
+
+        _setVisibility(id, stateId, {
+            value: true,
+            easing: easingIn,
+            direction: directionIn,
+            duration: durationIn,
+            containerExists: true,
+            onComplete: function () {
+//                if (easingIn === 'flip') _bringPanelStateToFront(id, stateId);
+                if (++onCompleteCount == 2) onComplete();
+            },
+            settingChild: true,
+            //size for offset
+            size: movement,
+            showFlipBack: true
+        });
+
+        if(show) $ax.event.raiseSyntheticEvent(id, 'onShow');
+        if(resized) $ax.event.raiseSyntheticEvent(id, 'onResize');
+    };
+
+    var containedFixed = {};
+    var _pushContainer = _visibility.pushContainer = function(id, panel) {
+        var count = containerCount[id];
+        if(count) containerCount[id] = count + 1;
+        else {
+            var trapScroll = _trapScrollLoc(id);
+            var jobj = $jobj(id);
+            var children = jobj.children();
+            var css = {
+                position: 'relative',
+                top: 0,
+                left: 0
+            };
+
+            if(!panel) {
+                var boundingRect = $ax('#' + id).offsetBoundingRect();
+                //var boundingRect = $axure.fn.getWidgetBoundingRect(id);
+                css.top = boundingRect.top;
+                css.left = boundingRect.left;
+            }
+
+            var container = $('<div></div>');
+            container.attr('id', ''); // Placeholder id, so we won't try to recurse the container until it is ready
+            container.css(css);
+            //container.append(jobj.children());
+            jobj.append(container);
+            containerCount[id] = 1;
+
+            // Panel needs to wrap children
+            if(panel) {
+                for(var i = 0; i < children.length; i++) {
+                    var child = $(children[i]);
+                    var childContainer = $('<div></div>');
+                    childContainer.attr('id', $ax.visibility.applyWidgetContainer(child.attr('id')));
+                    childContainer.css(css);
+                    child.after(childContainer);
+                    childContainer.append(child);
+                    container.append(childContainer);
+                }
+            } else {
+                var focus = _getCurrFocus();
+                if(focus) $ax.event.addSuppressedEvent($ax.repeater.removeSuffixFromElementId(focus), 'OnLostFocus');
+
+                // Layer needs to fix top left
+                var childIds = $ax('#' + id).getChildren()[0].children;
+                for(var i = 0; i < childIds.length; i++) {
+                    var childId = childIds[i];
+                    var childObj = $jobj(childId);
+                    var fixedInfo = $ax.dynamicPanelManager.getFixedInfo(childId);
+                    if(fixedInfo.fixed) {
+                        var axObj = $ax('#' + childId);
+                        var viewportLocation = axObj.viewportLocation();
+                        var left = viewportLocation.left;
+                        var top = viewportLocation.top;
+                        //var left = axObj.left();
+                        //var top = axObj.top();
+                        containedFixed[childId] = { left: left, top: top, fixed: fixedInfo };
+                        childObj.css('left', left);
+                        childObj.css('top', top);
+                        childObj.css('margin-left', 0);
+                        childObj.css('margin-top', 0);
+                        childObj.css('right', 'auto');
+                        childObj.css('bottom', 'auto');
+                        childObj.css('position', 'absolute');
+                    }
+                    var cssChange = {
+                        left: '-=' + css.left,
+                        top: '-=' + css.top
+                    };
+                    if($ax.getTypeFromElementId(childId) == $ax.constants.LAYER_TYPE) {
+                        _pushContainer(childId, false);
+                        $ax.visibility.applyWidgetContainer(childId, true).css(cssChange);
+                    } else {
+                        //if ($ax.public.fn.isCompoundVectorHtml(jobj[0])) {
+                        //    var grandChildren = jobj[0].children;
+                        //    //while (grandChildren.length > 0 && grandChildren[0].id.indexOf('container') >= 0) grandChildren = grandChildren[0].children;
+
+                        //    for (var j = 0; j < grandChildren.length; j++) {
+                        //        var grandChildId = grandChildren[j].id;
+                        //        if (grandChildId.indexOf(childId + 'p') >= 0 || grandChildId.indexOf('_container') >= 0) $jobj(grandChildId).css(cssChange);
+                        //    }
+                        //} else 
+                        // Need to include ann and ref in move.
+                        childObj = $addAll(childObj, childId);
+                        childObj.css(cssChange);
+                    }
+
+                    container.append(childObj);
+                }
+                _setCurrFocus(focus);
+            }
+            container.attr('id', $ax.visibility.applyWidgetContainer(id)); // Setting the correct final id for the container
+            trapScroll();
+        }
+    };
+
+    var _popContainer = _visibility.popContainer = function (id, panel) {
+        var count = containerCount[id];
+        if(!count) return;
+        count--;
+        containerCount[id] = count;
+        if(count != 0) return;
+
+        var trapScroll = _trapScrollLoc(id);
+
+        var jobj = $jobj(id);
+        var container = $ax.visibility.applyWidgetContainer(id, true);
+
+        // If layer is at bottom or right of page, unwrapping could change scroll by temporarily reducting page size.
+        //  To avoid this, we let container persist on page, with the size it is at this point, and don't remove container completely
+        //  until the children are back to their proper locations.
+        var size = $ax('#' + id).size();
+        container.css('width', size.width);
+        container.css('height', size.height);
+        var focus = _getCurrFocus();
+        if(focus) $ax.event.addSuppressedEvent($ax.repeater.removeSuffixFromElementId(focus), 'OnLostFocus');
+        jobj.append(container.children());
+        _setCurrFocus(focus);
+        $('body').first().append(container);
+
+        // Layer doesn't have children containers to clean up
+        if(panel) {
+            var children = jobj.children();
+            for(var i = 0; i < children.length; i++) {
+                var childContainer = $(children[i]);
+                var child = $(childContainer.children()[0]);
+                childContainer.after(child);
+                childContainer.remove();
+            }
+        } else {
+            var left = container.css('left');
+            var top = container.css('top');
+            var childIds = $ax('#' + id).getChildren()[0].children;
+            for (var i = 0; i < childIds.length; i++) {
+                var childId = childIds[i];
+                var cssChange = {
+                    left: '+=' + left,
+                    top: '+=' + top
+                };
+                if($ax.getTypeFromElementId(childId) == $ax.constants.LAYER_TYPE) {
+                    $ax.visibility.applyWidgetContainer(childId, true).css(cssChange);
+                    _popContainer(childId, false);
+                } else {
+                    var childObj = $jobj(childId);
+                    //    if ($ax.public.fn.isCompoundVectorHtml(jobj[0])) {
+                    //        var grandChildren = jobj[0].children;
+                    //        //while (grandChildren.length > 0 && grandChildren[0].id.indexOf('container') >= 0) grandChildren = grandChildren[0].children;
+                    //        for (var j = 0; j < grandChildren.length; j++) {
+                    //            var grandChildId = grandChildren[j].id;
+                    //            if (grandChildId.indexOf(childId + 'p') >= 0 || grandChildId.indexOf('_container') >= 0) $jobj(grandChildId).css(cssChange);
+                    //        }
+                    //} else
+                    
+                    var allObjs = $addAll(childObj, childId); // Just include other objects for initial css. Fixed panels need to be dealt with separately.
+                    allObjs.css(cssChange);
+
+                    var fixedInfo = containedFixed[childId];
+                    if(fixedInfo) {
+                        delete containedFixed[childId];
+
+                        childObj.css('position', 'fixed');
+                        var deltaX = $ax.getNumFromPx(childObj.css('left')) - fixedInfo.left;
+                        var deltaY = $ax.getNumFromPx(childObj.css('top')) - fixedInfo.top;
+
+                        fixedInfo = fixedInfo.fixed;
+                        if(fixedInfo.horizontal == 'left') childObj.css('left', fixedInfo.x + deltaX);
+                        else if(fixedInfo.horizontal == 'center') {
+                            childObj.css('left', '50%');
+                            childObj.css('margin-left', fixedInfo.x + deltaX);
+                        } else {
+                            childObj.css('left', 'auto');
+                            childObj.css('right', fixedInfo.x - deltaX);
+                        }
+
+                        if(fixedInfo.vertical == 'top') childObj.css('top', fixedInfo.y + deltaY);
+                        else if(fixedInfo.vertical == 'middle') {
+                            childObj.css('top', '50%');
+                            childObj.css('margin-top', fixedInfo.y + deltaY);
+                        } else {
+                            childObj.css('top', 'auto');
+                            childObj.css('bottom', fixedInfo.y - deltaY);
+                        }
+
+                        $ax.dynamicPanelManager.updatePanelPercentWidth(childId);
+                        $ax.dynamicPanelManager.updatePanelContentPercentWidth(childId);
+
+                    }
+                }
+            }
+        }
+        container.remove();
+        trapScroll();
+    };
+
+    var _trapScrollLoc = function(id) {
+        var locs = {};
+        var states = $jobj(id).find('.panel_state');
+        for(var i = 0; i < states.length; i++) {
+            var state = $(states[i]);
+            locs[state.attr('id')] = { x: state.scrollLeft(), y: state.scrollTop() };
+        }
+        return function() {
+            for(var key in locs) {
+                var state = $jobj(key);
+                state.scrollLeft(locs[key].x);
+                state.scrollTop(locs[key].y);
+            }
+        };
+    }
+
+    var _getCurrFocus = function () {
+        // Only care about focused a tags and inputs
+        var id = window.lastFocusedClickable && window.lastFocusedClickable.id;
+
+        if(!id) return id;
+        var jobj = $(window.lastFocusedClickable);
+        return jobj.is('a') || jobj.is('input') ? id : '';
+    }
+
+    var _setCurrFocus = function(id) {
+        if(id) {
+            // This is really just needed for IE, so if this causes issues on other browsers, try adding that check here
+            var trap = $ax.event.blockEvent($ax.repeater.removeSuffixFromElementId(id), 'OnFocus');
+            window.setTimeout(function () {
+                $jobj(id).focus();
+                trap();
+            }, 0);
+        }
+    }
+
+    //use this to save & restore DP's scroll position when show/hide
+    //key => dp's id (not state's id, because it seems we can change state while hiding)
+    //value => first state's id & scroll position
+    //we only need to store one scroll position for one DP, and remove the key after shown.
+    var DPStateAndScroll = {}
+    var _tryResumeScrollForDP = function (dpId, deleteId) {
+        var scrollObj = DPStateAndScroll[dpId];
+        if(scrollObj) {
+            var shownState = document.getElementById(scrollObj.shownId);
+            if(scrollObj.left) shownState.scrollLeft = scrollObj.left;
+            if(scrollObj.top) shownState.scrollTop = scrollObj.top;
+            if(deleteId) delete DPStateAndScroll[dpId];
+        }
+    };
+//    var _makeContainer = function (containerId, rect, isFullWidth, isFlip, offset, containerExists) {
+    var _makeContainer = function (containerId, width, height, isFullWidth, isFlip, offset, containerExists) {
+        if(containerExists) var container = $jobj(containerId);
+        else {
+            container = $('<div></div>');
+            container.attr('id', containerId);
+        }
+        var css = {
+            position: 'absolute',
+            width: width,
+            height: height,
+            display: 'flex'
+        };
+
+        if(!containerExists) {
+            // If container exists, may be busy updating location. Will init and update it correctly.
+            css.top = offset.top;
+            css.left = offset.left;
+        }
+
+
+        if(isFlip) {
+            css.perspective = '800px';
+            css.webkitPerspective = "800px";
+            css.mozPerspective = "800px";
+            //adding this to make Edge happy
+            css['transform-style'] = 'preserve-3d';
+        } else css.overflow = 'hidden';
+
+        //perspective on container will give us 3d effect when flip
+        //if(!isFlip) css.overflow = 'hidden';
+
+        // Rect should be a jquery not axquery obj
+        //_getFixedCss(css, rect.$ ? rect.$() : rect, fixedInfo, isFullWidth);
+        
+        container.css(css);
+        return container;
+    };
+
+    var CONTAINER_SUFFIX = _visibility.CONTAINER_SUFFIX = '_container';
+    var CONTAINER_INNER = CONTAINER_SUFFIX + '_inner';
+    _visibility.getWidgetFromContainer = function(id) {
+        var containerIndex = id.indexOf(CONTAINER_SUFFIX);
+        if(containerIndex == -1) return id;
+        return id.substr(0, containerIndex) + id.substr(containerIndex + CONTAINER_SUFFIX.length);
+    };
+
+    // Apply container to widget id if necessary.
+    // returnJobj: True if you want the jquery object rather than id returned
+    // skipCheck: True if you want the query returned reguardless of container existing
+    // checkInner: True if inner container should be checked
+    _visibility.applyWidgetContainer = function (id, returnJobj, skipCheck, checkInner) {
+        // If container exists, just return (return query if requested)
+        if(id.indexOf(CONTAINER_SUFFIX) != -1) return returnJobj ? $jobj(id) : id;
+
+        // Get desired id, and return it if query is not desired
+        var containerId = $ax.repeater.applySuffixToElementId(id, checkInner ? CONTAINER_INNER : CONTAINER_SUFFIX);
+        if(!returnJobj) return containerId;
+
+        // If skipping check or container exists, just return innermost container requested
+        var container = $jobj(containerId);
+        if(skipCheck || container.length) return container;
+        // If inner container was not checked, then no more to check, return query for widget
+        if(!checkInner) return $jobj(id);
+
+        // If inner container was checked, check for regular container still
+        container = $jobj($ax.repeater.applySuffixToElementId(id, CONTAINER_SUFFIX));
+        return container.length ? container : $jobj(id);
+    };
+
+    _visibility.isContainer = function(id) {
+        return id.indexOf(CONTAINER_SUFFIX) != -1;
+    };
+
+    _visibility.getRealChildren = function(query) {
+        while(query.length && $(query[0]).attr('id').indexOf(CONTAINER_SUFFIX) != -1) query = query.children();
+        return query;
+    };
+
+    //var _getFixedCss = function(css, rect, fixedInfo, isFullWidth) {
+    //    // todo: **mas** make sure this is ok
+    //    if(fixedInfo.fixed) {
+    //        css.position = 'fixed';
+
+    //        if(fixedInfo.horizontal == 'left') css.left = fixedInfo.x;
+    //        else if(fixedInfo.horizontal == 'center') {
+    //            css.left = isFullWidth ? '0px' : '50%';
+    //            css['margin-left'] = fixedInfo.x;
+    //        } else if(fixedInfo.horizontal == 'right') {
+    //            css.left = 'auto';
+    //            css.right = fixedInfo.x;
+    //        }
+
+    //        if(fixedInfo.vertical == 'top') css.top = fixedInfo.y;
+    //        else if(fixedInfo.vertical == 'middle') {
+    //            css.top = '50%';
+    //            css['margin-top'] = fixedInfo.y;
+    //        } else if(fixedInfo.vertical == 'bottom') {
+    //            css.top = 'auto';
+    //            css.bottom = fixedInfo.y;
+    //        }
+    //    } else {
+    //        css.left = Number(rect.css('left').replace('px', '')) || 0;
+    //        css.top = Number(rect.css('top').replace('px', '')) || 0;
+    //    }
+    //};
+
+    var _slideStateOut = function (container, stateId, options, onComplete, jobj) {
+        var directionOut = options.direction;
+        var axObject = $ax('#' + container.attr('id'));
+        var width = axObject.width();
+        var height = axObject.height();
+
+        _blockSetMoveIds = true;
+
+        if(directionOut == "right") {
+            $ax.move.MoveWidget(stateId, width, 0, options, false, onComplete, false, jobj, true);
+        } else if(directionOut == "left") {
+            $ax.move.MoveWidget(stateId, -width, 0, options, false, onComplete, false, jobj, true);
+        } else if(directionOut == "up") {
+            $ax.move.MoveWidget(stateId, 0, -height, options, false, onComplete, false, jobj, true);
+        } else if(directionOut == "down") {
+            $ax.move.MoveWidget(stateId, 0, height, options, false, onComplete, false, jobj, true);
+        }
+
+        _blockSetMoveIds = false;
+    };
+
+    var _slideStateIn = function (id, stateId, options, container, makePanelVisible, onComplete, jobj, preserveScroll) {
+        var directionIn = options.direction;
+        var axObject = $ax('#' +container.attr('id'));
+        var width = axObject.width();
+        var height = axObject.height();
+
+        if (makePanelVisible) $ax.visibility.SetIdVisible(id, true);
+        for (i = 0; i < jobj.length; i++) $ax.visibility.SetVisible(jobj[i], true);
+
+        for(var i = 0; i < jobj.length; i++) {
+            var child = $(jobj[i]);
+            var oldTop = $ax.getNumFromPx(fixAuto(child, 'top'));
+            var oldLeft = $ax.getNumFromPx(fixAuto(child, 'left'));
+            if (directionIn == "right") {
+                child.css('left', oldLeft - width + 'px');
+            } else if(directionIn == "left") {
+                child.css('left', oldLeft + width + 'px');
+            } else if(directionIn == "up") {
+                child.css('top', oldTop + height + 'px');
+            } else if(directionIn == "down") {
+                child.css('top', oldTop - height + 'px');
+            }
+        }
+
+        if(preserveScroll) _tryResumeScrollForDP(id);
+
+        _blockSetMoveIds = true;
+
+        if(directionIn == "right") {
+            $ax.move.MoveWidget(stateId, width, 0, options, false, onComplete, false, jobj, true);
+        } else if(directionIn == "left") {
+            $ax.move.MoveWidget(stateId, -width, 0, options, false, onComplete, false, jobj, true);
+        } else if(directionIn == "up") {
+            $ax.move.MoveWidget(stateId, 0, -height, options, false, onComplete, false, jobj, true);
+        } else if(directionIn == "down") {
+            $ax.move.MoveWidget(stateId, 0, height, options, false, onComplete, false, jobj, true);
+        }
+
+        _blockSetMoveIds = false;
+    };
+
+    $ax.visibility.GetPanelStateId = function(dpId, index) {
+        var itemNum = $ax.repeater.getItemIdFromElementId(dpId);
+        var panelStateId = $ax.repeater.getScriptIdFromElementId(dpId) + '_state' + index;
+        return $ax.repeater.createElementId(panelStateId, itemNum);
+    };
+
+    $ax.visibility.GetPanelStateCount = function(id) {
+        return $ax.visibility.getRealChildren($jobj(id).children()).filter("[id*='_state']").length;
+    };
+
+    var _bringPanelStateToFront = function (dpId, stateId, oldStateId, oldInFront) {
+        var panel = $jobj(dpId);
+        var frontId = oldInFront ? oldStateId : stateId;
+        if(containerCount[dpId]) {
+            frontId = $ax.visibility.applyWidgetContainer(frontId);
+            panel = $ax.visibility.applyWidgetContainer(dpId, true, false, true);
+        }
+        $jobj(frontId).appendTo(panel);
+        //when bring a panel to front, it will be focused, and the previous front panel should fire blur event if it's lastFocusedClickableSelector
+        //ie(currently 11) and firefox(currently 34) doesn't fire blur event, this is the hack to fire it manually
+        if((IE || FIREFOX) && window.lastFocusedClickable && $ax.event.getFocusableWidgetOrChildId(window.lastFocusedControl) == window.lastFocusedClickable.id) {
+            // Only need to do this if the currently focused widget is in the panel state that is being hidden.
+            if($jobj(oldStateId).find('#' + window.lastFocusedClickable.id.split('_')[0]).length) $(window.lastFocusedClickable).triggerHandler('blur');
+        }
+    };
+
+    var _limboIds = _visibility.limboIds = {};
+    // limboId's is a dictionary of id->true, essentially a set.
+    var _addLimboAndHiddenIds = $ax.visibility.addLimboAndHiddenIds = function(newLimboIds, newHiddenIds, query, skipRepeater) {
+        var limboedByMaster = {};
+        for(var key in newLimboIds) {
+            if (!$ax.public.fn.IsReferenceDiagramObject($ax.getObjectFromElementId(key).type)) continue;
+            var ids = $ax.model.idsInRdoToHideOrLimbo(key);
+            for(var i = 0; i < ids.length; i++) limboedByMaster[ids[i]] = true;
+        }
+
+        var hiddenByMaster = {};
+        for(key in newHiddenIds) {
+            if (!$ax.public.fn.IsReferenceDiagramObject($ax.getObjectFromElementId(key).type)) continue;
+            ids = $ax.model.idsInRdoToHideOrLimbo(key);
+            for(i = 0; i < ids.length; i++) hiddenByMaster[ids[i]] = true;
+        }
+
+        // Extend with children of rdos
+        newLimboIds = $.extend(newLimboIds, limboedByMaster);
+        newHiddenIds = $.extend(newHiddenIds, hiddenByMaster);
+
+        // something is only visible if it's not hidden and limboed
+        query.each(function(diagramObject, elementId) {
+            // Rdos already handled, contained widgets are limboed by the parent, and sub menus should be ignored
+            if(diagramObject.isContained || $ax.public.fn.IsReferenceDiagramObject(diagramObject.type) || $ax.public.fn.IsTableCell(diagramObject.type) || $jobj(elementId).hasClass('sub_menu')) return;
+            if(diagramObject.type == 'table' && $jobj(elementId).parent().hasClass('ax_menu')) return;
+            if(skipRepeater) {
+                // Any item in a repeater should return
+                if($ax.getParentRepeaterFromElementIdExcludeSelf(elementId)) return;
+            }
+
+            var scriptId = $ax.repeater.getScriptIdFromElementId(elementId);
+            var shouldBeVisible = Boolean(!newLimboIds[scriptId] && !newHiddenIds[scriptId]);
+            var isVisible = Boolean(_isIdVisible(elementId));
+            if(shouldBeVisible != isVisible) {
+                _setWidgetVisibility(elementId, { value: shouldBeVisible, noContainer: true });
+            }
+        });
+
+        _limboIds = _visibility.limboIds = $.extend(_limboIds, newLimboIds);
+
+    };
+
+    var _clearLimboAndHidden = $ax.visibility.clearLimboAndHidden = function(ids) {
+        _limboIds = _visibility.limboIds = {};
+    };
+
+    $ax.visibility.clearLimboAndHiddenIds = function(ids) {
+        for(var i = 0; i < ids.length; i++) {
+            var scriptId = $ax.repeater.getScriptIdFromElementId(ids[i]);
+            delete _limboIds[scriptId];
+        }
+    };
+
+    $ax.visibility.resetLimboAndHiddenToDefaults = function (query) {
+        if(!query) query = $ax('*');
+        _clearLimboAndHidden();
+        _addLimboAndHiddenIds(_defaultLimbo, _defaultHidden, query);
+    };
+
+    $ax.visibility.isScriptIdLimbo = function(scriptId) {
+        if(_limboIds[scriptId]) return true;
+
+        var repeater = $ax.getParentRepeaterFromScriptId(scriptId);
+        if(!repeater) return false;
+
+        var itemId = $ax.getItemIdsForRepeater(repeater)[0];
+        return _limboIds[$ax.repeater.createElementId(scriptId, itemId)];
+    }
+
+    $ax.visibility.isElementIdLimboOrInLimboContainer = function (elementId) {
+        var parent = document.getElementById(elementId);
+        while(parent) {
+            var scriptId = $ax.repeater.getScriptIdFromElementId($(parent).attr('id'));
+            if(_limboIds[scriptId]) return true;
+            parent = parent.parentElement;
+        }
+        return false;
+    }
+
+    var _blockSetMoveIds = false;
+    var _movedIds = _visibility.movedIds = {};
+    var _resizedIds = _visibility.resizedIds = {};
+    var _rotatedIds = _visibility.rotatedIds = {};
+
+    $ax.visibility.getMovedLocation = function(scriptId) {
+        return _movedIds[scriptId];
+
+        //var repeater = $ax.getParentRepeaterFromScriptId(scriptId);
+        //if (!repeater) return false;
+
+        //var itemId = $ax.getItemIdsForRepeater(repeater)[0];
+        //return _movedIds[$ax.repeater.createElementId(scriptId, itemId)];
+    };
+
+    $ax.visibility.setMovedLocation = function (scriptId, left, top) {
+        if ($jobj(scriptId).css('position') == 'fixed') return;
+        _movedIds[scriptId] = { left: left, top: top };
+    };
+
+    $ax.visibility.moveMovedLocation = function (scriptId, deltaLeft, deltaTop) {
+        if(_blockSetMoveIds) return false;
+
+        var offsetLocation = $ax('#' + scriptId).offsetLocation();
+        $ax.visibility.setMovedLocation(scriptId, offsetLocation.x + deltaLeft, offsetLocation.y + deltaTop);
+
+        if($ax.getTypeFromElementId(scriptId) == $ax.constants.LAYER_TYPE) {
+            var childIds = $ax('#' + scriptId).getChildren()[0].children;
+            for (var i = 0; i < childIds.length; i++) {
+                $ax.visibility.moveMovedLocation(childIds[i], deltaLeft, deltaTop);
+            }
+        }
+    };
+
+    $ax.visibility.getResizedSize = function(scriptId) {
+        return _resizedIds[scriptId];
+
+        //var repeater = $ax.getParentRepeaterFromScriptId(scriptId);
+        //if (!repeater) return false;
+
+        //var itemId = $ax.getItemIdsForRepeater(repeater)[0];
+        //return _resizedIds[$ax.repeater.createElementId(scriptId, itemId)];
+    };
+
+    $ax.visibility.setResizedSize = function(scriptId, width, height) {
+        _resizedIds[scriptId] = { width: width, height: height };
+    };
+
+    $ax.visibility.getRotatedAngle = function (scriptId) {
+        return _rotatedIds[scriptId];
+    };
+
+    $ax.visibility.setRotatedAngle = function (scriptId, rotation) {
+        _rotatedIds[scriptId] = rotation;
+    };
+
+    $ax.visibility.clearMovedAndResized = function () {
+        _movedIds = _visibility.movedIds = {};
+        _resizedIds = _visibility.resizedIds = {};
+        _rotatedIds = _visibility.rotatedIds = {};
+    };
+
+    $ax.visibility.clearMovedAndResizedIds = function (elementIds) {
+        for (var i = 0; i < elementIds.length; i++) {
+            var id = elementIds[i];
+            delete _movedIds[id];
+            delete _resizedIds[id];
+            delete _rotatedIds[id];
+        }
+    };
+
+    $ax.visibility.initialize = function() {
+        // initialize initial visible states
+        $('.' + HIDDEN_CLASS).each(function (index, diagramObject) {
+            _defaultHidden[$ax.repeater.getScriptIdFromElementId(diagramObject.id)] = true;
+        });
+
+        $('.' + UNPLACED_CLASS).each(function (index, diagramObject) {
+            _defaultLimbo[$ax.repeater.getScriptIdFromElementId(diagramObject.id)] = true;
+        });
+
+        _addLimboAndHiddenIds(_defaultLimbo, _defaultHidden, $ax('*'), true);
+    };
+
+    _visibility.initRepeater = function(repeaterId) {
+        var html = $('<div></div>');
+        html.append($jobj(repeaterId + '_script').html());
+
+        html.find('.' + HIDDEN_CLASS).each(function (index, element) {
+            _defaultHidden[$ax.repeater.getScriptIdFromElementId(element.id)] = true;
+        });
+
+        html.find('.' + UNPLACED_CLASS).each(function (index, element) {
+            _defaultLimbo[$ax.repeater.getScriptIdFromElementId(element.id)] = true;
+        });
+    }
+
+    var HIDDEN_CLASS = _visibility.HIDDEN_CLASS = 'ax_default_hidden';
+    var UNPLACED_CLASS = _visibility.UNPLACED_CLASS = 'ax_default_unplaced';
+
+});
\ No newline at end of file
diff --git a/src_old/resources/scripts/axutils.js b/src_old/resources/scripts/axutils.js
new file mode 100644
index 0000000..8579ee0
--- /dev/null
+++ b/src_old/resources/scripts/axutils.js
@@ -0,0 +1,293 @@
+/*
+ *
+ *
+ *
+ *
+ */
+const START_URL_NAME = 'start.html';
+const PAGE_ID_NAME = 'id';
+const PAGE_URL_NAME = 'p';
+const SITEMAP_COLLAPSE_VAR_NAME = 'c';
+const SITEMAP_COLLAPSE_VALUE = "1";
+const SITEMAP_CLOSE_VALUE = "2";
+const GLOBAL_VAR_NAME = '&ZQZ=s&';
+const GLOBAL_VAR_CHECKSUM = 'CSUM';
+
+ (function() {
+     // define the root namespace object
+     if(!window.$axure) window.$axure = {};
+
+     $axure.utils = {};
+
+     // ------------------------------------------------------------------------
+     // Makes an object bindable
+     // ------------------------------------------------------------------------
+     $axure.utils.makeBindable = function(obj, events) {
+         if(obj.registeredBindings != null) return;
+
+         // copy the events
+         obj.bindableEvents = events.slice();
+         obj.registeredBindings = {};
+
+         obj.bind = function(eventName, fn) {
+             var binding = {};
+             binding.eventName = eventName;
+             binding.action = fn;
+
+             var bindingList = this.registeredBindings[eventName];
+             if(bindingList == null) {
+                 bindingList = [];
+                 this.registeredBindings[eventName] = bindingList;
+             }
+             bindingList[bindingList.length] = binding;
+         };
+
+         obj.unbind = function(eventName) {
+             if(eventName.indexOf('.') >= 0) {
+                 this.registeredBindings[eventName] = null;
+             } else {
+                 var event = eventName.split('.')[0];
+                 for(var bindingKey in this.registeredBindings) {
+                     if(bindingKey.split('.')[0] == event) {
+                         this.registeredBindings[bindingKey] = null;
+                     }
+                 }
+             }
+         };
+
+         obj.triggerEvent = function(eventName, arg) {
+             for(var bindingKey in this.registeredBindings) {
+                 if(bindingKey.split('.')[0] == eventName) {
+                     var bindings = this.registeredBindings[bindingKey];
+                     for(var i = 0; i < bindings.length; i++) {
+                         if(arg == null) {
+                             bindings[i].action();
+                         } else {
+                             bindings[i].action(arg);
+                         }
+                     }
+                 }
+             }
+         };
+     };
+
+
+     $axure.utils.loadCSS = function(url) {
+         $('head').append('<link text="text/css" href="' + url + '" rel="Stylesheet" />');
+     };
+
+     $axure.utils.loadJS = function(url) {
+         $('head').append('<script text="text/javascript" language="JavaScript" src="' + url + '"></script>');
+     };
+
+     $axure.utils.curry = function(fn) {
+         var curriedArgs = Array.prototype.slice.call(arguments, [1]);
+         return function() {
+             fn.apply(this, curriedArgs.concat(Array.prototype.slice.call(arguments)));
+         };
+     };
+
+     $axure.utils.succeeded = function(result) {
+         return result && result.success;
+     };
+
+     $axure.utils.createUniqueTag = function() {
+         return Math.random().toString().substring(2) +
+             Math.random().toString().substring(2) +
+                 Math.random().toString().substring(2) +
+                     Math.random().toString().substring(2);
+     };
+
+     $axure.utils.formatDate = function(date) {
+         var months = [
+             "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+             "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+         var hours = date.getHours();
+         var amPm = (hours > 11 ? 'PM' : 'AM');
+         hours = hours % 12;
+         if(hours == '0') hours = '12';
+         var minutes = date.getMinutes() + '';
+         if(minutes.length == 1) {
+             minutes = '0' + minutes;
+         }
+         return [
+             months[date.getMonth()], ' ', date.getDate(), ' ', date.getFullYear(), ' ',
+             hours, ':', minutes, ' ', amPm].join('');
+
+     };
+
+     $axure.utils.quickObject = function() {
+         var returnVal = {};
+         for(var i = 0; i < arguments.length; i += 2) {
+             returnVal[arguments[i]] = arguments[i + 1];
+         }
+         return returnVal;
+     };
+     
+     $axure.utils.isInPlayer = function() { return window.name == 'mainFrame'; }
+     // This will return true if prototype is opened from version of app after update with code that sets this value 
+     // (won't be able to distinguish between browser and outdated app)
+     $axure.utils.isShareApp = function () { return /ShareApp/.test(navigator.userAgent); }
+
+     $axure.utils.setHashStringVar = function(currentHash, varName, varVal) {
+         var varWithEqual = varName + '=';
+         var poundVarWithEqual = varVal === '' ? '' : '#' + varName + '=' + varVal;
+         var ampVarWithEqual = varVal === '' ? '' : '&' + varName + '=' + varVal;
+         var hashToSet = '';
+
+         var pageIndex = currentHash.indexOf('#' + varWithEqual);
+         if (pageIndex == -1) pageIndex = currentHash.indexOf('&' + varWithEqual);
+         if (pageIndex != -1) {
+             var newHash = currentHash.substring(0, pageIndex);
+
+             newHash = newHash == '' ? poundVarWithEqual : newHash + ampVarWithEqual;
+
+             var ampIndex = currentHash.indexOf('&', pageIndex + 1);
+             if (ampIndex != -1) {
+                 newHash = newHash == '' ? '#' + currentHash.substring(ampIndex + 1) : newHash + currentHash.substring(ampIndex);
+             }
+             hashToSet = newHash;
+         } else if (currentHash.indexOf('#') != -1) {
+             hashToSet = currentHash + ampVarWithEqual;
+         } else {
+             hashToSet = poundVarWithEqual;
+         }
+
+         if (hashToSet != '' || varVal == '') {
+             return hashToSet;
+         }
+
+         return null;
+     }
+
+     $axure.utils.parseGlobalVars = function(query, setAction) {
+         let vars = query.split("&");
+         let csum = false;
+         for(let i = 0; i < vars.length; i++) {
+             let pair = vars[i].split("=");
+             let varName = pair[0];
+             let varValue = pair[1];
+             if(varName) {
+                 if(varName == GLOBAL_VAR_CHECKSUM) csum = true;
+                 else setAction(varName, decodeURIComponent(varValue), true);
+             }
+         }
+
+         if(!csum && query.length > 250) {
+             window.alert('Axure Warning: The variable values were too long to pass to this page.\n\nIf you are using IE, using Chrome or Firefox will support more data.');
+         }
+     }
+
+     var matrixBase = {
+         mul: function(val) {
+             if(val.x !== undefined) {
+                 return $axure.utils.Vector2D(
+                     this.m11 * val.x + this.m12 * val.y + this.tx,
+                     this.m21 * val.x + this.m22 * val.y + this.ty);
+             } else if(val.m11) {
+                 return $axure.utils.Matrix2D(
+                     this.m11 * val.m11 + this.m12 * val.m21,
+                     this.m11 * val.m12 + this.m12 * val.m22,
+                     this.m21 * val.m11 + this.m22 * val.m21,
+                     this.m21 * val.m12 + this.m22 * val.m22,
+                     val.tx + this.tx * val.m11 + this.ty * val.m21,
+                     val.ty + this.tx * val.m12 + this.ty * val.m22
+                 );
+             } else if(Number(val)) {
+                 var num = Number(val);
+                 return $axure.utils.Matrix2D(this.m11 * num, this.m12 * num,
+                     this.m21 * num, this.m22 * num,
+                     this.tx * num, this.ty * num);
+             } else return undefined;
+         },
+         rotate: function(angle) {
+             var angleRad = angle * Math.PI / 180;
+             var c = Math.cos(angleRad);
+             var s = Math.sin(angleRad);
+
+             return this.mul($axure.utils.Matrix2D(c, -s, s, c));
+         },
+         translate: function(tx, ty) {
+             return this.mul($axure.utils.Matrix2D(1, 0, 0, 1, tx, ty));
+         }
+     };
+
+     $axure.utils.Matrix2D = function(m11, m12, m21, m22, tx, ty) {
+         return $.extend({
+             m11: m11 || 0,
+             m12: m12 || 0,
+             m21: m21 || 0,
+             m22: m22 || 0,
+             tx: tx || 0,
+             ty: ty || 0
+         }, matrixBase);
+     };
+
+     $axure.utils.Vector2D = function(x, y) {
+         return { x: x || 0, y: y || 0 };
+     };
+
+     $axure.utils.Matrix2D.identity = function() {
+         return $axure.utils.Matrix2D(1, 0, 0, 1, 0, 0);
+     };
+
+ })();
+
+ // TODO: [mas] simplify this
+ if(window.$axure && window.$axure.internal) {
+     $axure.internal(function($ax) { $ax.utils = $axure.utils; });
+ }
+
+ // Its too much of a pain to escape everything and use regular expresions, just replace manually
+ (function () {
+     var original = String.prototype.replace;
+     // TODO: maybe use flags or object instead to pass options in
+     String.prototype.replace = function (search, newVal, replaceFirst, ignoreCase) {
+         // Use original is some cases
+         if (search instanceof RegExp) return original.apply(this, arguments);
+
+         search = String(search);
+         var searchCompare = ignoreCase ? this.toLowerCase() : this;
+         if (ignoreCase) search = search.toLowerCase();
+
+         var searchLength = search.length;
+         var thisLength = this.length;
+
+         var index = 0;
+         var retVal = '';
+         while (index != -1) {
+             var nextIndex = searchCompare.indexOf(search, index);
+             if (nextIndex != -1) {
+                 retVal += this.substring(index, nextIndex) + newVal;
+                 index = nextIndex + searchLength;
+                 if (index >= thisLength) index = -1;
+             } else {
+                 retVal += this.substring(index);
+                 index = -1;
+             }
+             if (replaceFirst) break;
+         }
+
+         return retVal;
+     };
+
+     if (!Array.prototype.indexOf) {
+         Array.prototype.indexOf = function (elt /*, from*/) {
+             var len = this.length >>> 0;
+
+             var from = trunc(Number(arguments[1]) || 0);
+             if(from < 0) from += len;
+
+             for(; from < len; from++) {
+                 if(from in this && this[from] === elt) return from;
+             }
+             return -1;
+         };
+     }
+
+     var trunc = function(num) {
+         return num < 0 ? Math.ceil(num) : Math.floor(num);
+     };
+
+
+ })();
diff --git a/src_old/resources/scripts/jquery-1.7.1.min.js b/src_old/resources/scripts/jquery-1.7.1.min.js
new file mode 100644
index 0000000..198b3ff
--- /dev/null
+++ b/src_old/resources/scripts/jquery-1.7.1.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
+f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
+{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/src_old/resources/scripts/jquery-3.2.1.min.js b/src_old/resources/scripts/jquery-3.2.1.min.js
new file mode 100644
index 0000000..1f824ba
--- /dev/null
+++ b/src_old/resources/scripts/jquery-3.2.1.min.js
@@ -0,0 +1,14 @@
+/*! jQuery v3.2.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.2.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=Array.isArray(d)))?(e?(e=!1,f=c&&Array.isArray(c)?c:[]):f=c&&r.isPlainObject(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){return a.replace(t,"ms-").replace(u,v)},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},guid:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return a.apply(b||this,d.concat(f.call(arguments)))},e.guid=a.guid=a.guid||r.guid++,e},now:Date.now,support:o}),"function"==typeof Symbol&&(r.fn[Symbol.iterator]=c[Symbol.iterator]),r.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){j["[object "+b+"]"]=b.toLowerCase()});function w(a){var b=!!a&&"length"in a&&a.length,c=r.type(a);return"function"!==c&&!r.isWindow(a)&&("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+K+"*("+L+")(?:"+K+"*([*^$|!~]?=)"+K+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+L+"))|)"+K+"*\\]",N=":("+L+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",O=new RegExp(K+"+","g"),P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0&&("form"in a||"label"in a)},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"form"in b?b.parentNode&&b.disabled===!1?"label"in b?"label"in b.parentNode?b.parentNode.disabled===a:b.disabled===a:b.isDisabled===a||b.isDisabled!==!a&&ea(b)===a:b.disabled===a:"label"in b&&b.disabled===a}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}}):(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c,d,e,f=b.getElementById(a);if(f){if(c=f.getAttributeNode("id"),c&&c.value===a)return[f];e=b.getElementsByName(a),d=0;while(f=e[d++])if(c=f.getAttributeNode("id"),c&&c.value===a)return[f]}return[]}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c<b;c+=2)a.push(c);return a}),odd:pa(function(a,b){for(var c=1;c<b;c+=2)a.push(c);return a}),lt:pa(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function ra(){}ra.prototype=d.filters=d.pseudos,d.setFilters=new ra,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=Q.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function sa(a){for(var b=0,c=a.length,d="";b<c;b++)d+=a[b].value;return d}function ta(a,b,c){var d=b.dir,e=b.next,f=e||d,g=c&&"parentNode"===f,h=x++;return b.first?function(b,c,e){while(b=b[d])if(1===b.nodeType||g)return a(b,c,e);return!1}:function(b,c,i){var j,k,l,m=[w,h];if(i){while(b=b[d])if((1===b.nodeType||g)&&a(b,c,i))return!0}else while(b=b[d])if(1===b.nodeType||g)if(l=b[u]||(b[u]={}),k=l[b.uniqueID]||(l[b.uniqueID]={}),e&&e===b.nodeName.toLowerCase())b=b[d]||b;else{if((j=k[f])&&j[0]===w&&j[1]===h)return m[2]=j[2];if(k[f]=m,m[2]=a(b,c,i))return!0}return!1}}function ua(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d<e;d++)ga(a,b[d],c);return c}function wa(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;h<i;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function xa(a,b,c,d,e,f){return d&&!d[u]&&(d=xa(d)),e&&!e[u]&&(e=xa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||va(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:wa(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=wa(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i<f;i++)if(c=d.relative[a[i].type])m=[ta(ua(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;e<f;e++)if(d.relative[a[e].type])break;return xa(i>1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i<e&&ya(a.slice(i,e)),e<f&&ya(a=a.slice(e)),e<f&&sa(a))}m.push(c)}return ua(m)}function za(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,c,e){var f,i,j,k,l,m="function"==typeof a&&a,n=!e&&g(a=m.selector||a);if(c=c||[],1===n.length){if(i=n[0]=n[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&9===b.nodeType&&p&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(_,aa),b)||[])[0],!b)return c;m&&(b=b.parentNode),a=a.slice(i.shift().value.length)}f=V.needsContext.test(a)?0:i.length;while(f--){if(j=i[f],d.relative[k=j.type])break;if((l=d.find[k])&&(e=l(j.matches[0].replace(_,aa),$.test(i[0].type)&&qa(b.parentNode)||b))){if(i.splice(f,1),a=e.length&&sa(i),!a)return G.apply(c,e),c;break}}}return(m||h(a,n))(e,b,!p,c,!b||$.test(a)&&qa(b.parentNode)||b),c},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext;function B(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()}var C=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,D=/^.[^:#\[\.,]*$/;function E(a,b,c){return r.isFunction(b)?r.grep(a,function(a,d){return!!b.call(a,d,a)!==c}):b.nodeType?r.grep(a,function(a){return a===b!==c}):"string"!=typeof b?r.grep(a,function(a){return i.call(b,a)>-1!==c}):D.test(b)?r.filter(b,a,c):(b=r.filter(b,a),r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType}))}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b<d;b++)if(r.contains(e[b],this))return!0}));for(c=this.pushStack([]),b=0;b<d;b++)r.find(a,e[b],c);return d>1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(E(this,a||[],!1))},not:function(a){return this.pushStack(E(this,a||[],!0))},is:function(a){return!!E(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var F,G=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,H=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||F,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:G.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),C.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};H.prototype=r.fn,F=r(d);var I=/^(?:parents|prev(?:Until|All))/,J={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a<c;a++)if(r.contains(this,b[a]))return!0})},closest:function(a,b){var c,d=0,e=this.length,f=[],g="string"!=typeof a&&r(a);if(!A.test(a))for(;d<e;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function K(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return K(a,"nextSibling")},prev:function(a){return K(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return B(a,"iframe")?a.contentDocument:(B(a,"template")&&(a=a.content||a),r.merge([],a.childNodes))}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(J[a]||r.uniqueSort(e),I.test(a)&&e.reverse()),this.pushStack(e)}});var L=/[^\x20\t\r\n\f]+/g;function M(a){var b={};return r.each(a.match(L)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?M(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=e||a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){r.each(b,function(b,c){r.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==r.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return r.each(arguments,function(a,b){var c;while((c=r.inArray(b,f,c))>-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function N(a){return a}function O(a){throw a}function P(a,b,c,d){var e;try{a&&r.isFunction(e=a.promise)?e.call(a).done(b).fail(c):a&&r.isFunction(e=a.then)?e.call(a,b,c):b.apply(void 0,[a].slice(d))}catch(a){c.apply(void 0,[a])}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b<f)){if(a=d.apply(h,i),a===c.promise())throw new TypeError("Thenable self-resolution");j=a&&("object"==typeof a||"function"==typeof a)&&a.then,r.isFunction(j)?e?j.call(a,g(f,c,N,e),g(f,c,O,e)):(f++,j.call(a,g(f,c,N,e),g(f,c,O,e),g(f,c,N,c.notifyWith))):(d!==N&&(h=void 0,i=[a]),(e||c.resolveWith)(h,i))}},k=e?j:function(){try{j()}catch(a){r.Deferred.exceptionHook&&r.Deferred.exceptionHook(a,k.stackTrace),b+1>=f&&(d!==O&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:N,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:N)),c[2][3].add(g(0,a,r.isFunction(d)?d:O))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(P(a,g.done(h(c)).resolve,g.reject,!b),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)P(e[c],h(c),g.reject);return g.promise()}});var Q=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&Q.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var R=r.Deferred();r.fn.ready=function(a){return R.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||R.resolveWith(d,[r]))}}),r.ready.then=R.then;function S(){d.removeEventListener("DOMContentLoaded",S),
+a.removeEventListener("load",S),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",S),a.addEventListener("load",S));var T=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)T(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},U=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function V(){this.expando=r.expando+V.uid++}V.uid=1,V.prototype={cache:function(a){var b=a[this.expando];return b||(b={},U(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[r.camelCase(b)]=c;else for(d in b)e[r.camelCase(d)]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][r.camelCase(b)]},access:function(a,b,c){return void 0===b||b&&"string"==typeof b&&void 0===c?this.get(a,b):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d=a[this.expando];if(void 0!==d){if(void 0!==b){Array.isArray(b)?b=b.map(r.camelCase):(b=r.camelCase(b),b=b in d?[b]:b.match(L)||[]),c=b.length;while(c--)delete d[b[c]]}(void 0===b||r.isEmptyObject(d))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!r.isEmptyObject(b)}};var W=new V,X=new V,Y=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function $(a){return"true"===a||"false"!==a&&("null"===a?null:a===+a+""?+a:Y.test(a)?JSON.parse(a):a)}function _(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Z,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c=$(c)}catch(e){}X.set(a,b,c)}else c=void 0;return c}r.extend({hasData:function(a){return X.hasData(a)||W.hasData(a)},data:function(a,b,c){return X.access(a,b,c)},removeData:function(a,b){X.remove(a,b)},_data:function(a,b,c){return W.access(a,b,c)},_removeData:function(a,b){W.remove(a,b)}}),r.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=X.get(f),1===f.nodeType&&!W.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=r.camelCase(d.slice(5)),_(f,d,e[d])));W.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){X.set(this,a)}):T(this,function(b){var c;if(f&&void 0===b){if(c=X.get(f,a),void 0!==c)return c;if(c=_(f,a),void 0!==c)return c}else this.each(function(){X.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){X.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=W.get(a,b),c&&(!d||Array.isArray(c)?d=W.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return W.get(a,c)||W.access(a,c,{empty:r.Callbacks("once memory").add(function(){W.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?r.queue(this[0],a):void 0===b?this:this.each(function(){var c=r.queue(this,a,b);r._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&r.dequeue(this,a)})},dequeue:function(a){return this.each(function(){r.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=r.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=W.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var aa=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ba=new RegExp("^(?:([+-])=|)("+aa+")([a-z%]*)$","i"),ca=["Top","Right","Bottom","Left"],da=function(a,b){return a=b||a,"none"===a.style.display||""===a.style.display&&r.contains(a.ownerDocument,a)&&"none"===r.css(a,"display")},ea=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};function fa(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return r.css(a,b,"")},i=h(),j=c&&c[3]||(r.cssNumber[b]?"":"px"),k=(r.cssNumber[b]||"px"!==j&&+i)&&ba.exec(r.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,r.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var ga={};function ha(a){var b,c=a.ownerDocument,d=a.nodeName,e=ga[d];return e?e:(b=c.body.appendChild(c.createElement(d)),e=r.css(b,"display"),b.parentNode.removeChild(b),"none"===e&&(e="block"),ga[d]=e,e)}function ia(a,b){for(var c,d,e=[],f=0,g=a.length;f<g;f++)d=a[f],d.style&&(c=d.style.display,b?("none"===c&&(e[f]=W.get(d,"display")||null,e[f]||(d.style.display="")),""===d.style.display&&da(d)&&(e[f]=ha(d))):"none"!==c&&(e[f]="none",W.set(d,"display",c)));for(f=0;f<g;f++)null!=e[f]&&(a[f].style.display=e[f]);return a}r.fn.extend({show:function(){return ia(this,!0)},hide:function(){return ia(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){da(this)?r(this).show():r(this).hide()})}});var ja=/^(?:checkbox|radio)$/i,ka=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,la=/^$|\/(?:java|ecma)script/i,ma={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ma.optgroup=ma.option,ma.tbody=ma.tfoot=ma.colgroup=ma.caption=ma.thead,ma.th=ma.td;function na(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&B(a,b)?r.merge([a],c):c}function oa(a,b){for(var c=0,d=a.length;c<d;c++)W.set(a[c],"globalEval",!b||W.get(b[c],"globalEval"))}var pa=/<|&#?\w+;/;function qa(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],n=0,o=a.length;n<o;n++)if(f=a[n],f||0===f)if("object"===r.type(f))r.merge(m,f.nodeType?[f]:f);else if(pa.test(f)){g=g||l.appendChild(b.createElement("div")),h=(ka.exec(f)||["",""])[1].toLowerCase(),i=ma[h]||ma._default,g.innerHTML=i[1]+r.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;r.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",n=0;while(f=m[n++])if(d&&r.inArray(f,d)>-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=na(l.appendChild(f),"script"),j&&oa(g),c){k=0;while(f=g[k++])la.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var ra=d.documentElement,sa=/^key/,ta=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ua=/^([^.]*)(?:\.(.+)|)/;function va(){return!0}function wa(){return!1}function xa(){try{return d.activeElement}catch(a){}}function ya(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ya(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=wa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(ra,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(L)||[""],j=b.length;while(j--)h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.hasData(a)&&W.get(a);if(q&&(i=q.events)){b=(b||"").match(L)||[""],j=b.length;while(j--)if(h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&W.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(W.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c<arguments.length;c++)i[c]=arguments[c];if(b.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,b)!==!1){h=r.event.handlers.call(this,b,j),c=0;while((f=h[c++])&&!b.isPropagationStopped()){b.currentTarget=f.elem,d=0;while((g=f.handlers[d++])&&!b.isImmediatePropagationStopped())b.rnamespace&&!b.rnamespace.test(g.namespace)||(b.handleObj=g,b.data=g.data,e=((r.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(b.result=e)===!1&&(b.preventDefault(),b.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,b),b.result}},handlers:function(a,b){var c,d,e,f,g,h=[],i=b.delegateCount,j=a.target;if(i&&j.nodeType&&!("click"===a.type&&a.button>=1))for(;j!==this;j=j.parentNode||this)if(1===j.nodeType&&("click"!==a.type||j.disabled!==!0)){for(f=[],g={},c=0;c<i;c++)d=b[c],e=d.selector+" ",void 0===g[e]&&(g[e]=d.needsContext?r(e,this).index(j)>-1:r.find(e,this,null,[j]).length),g[e]&&f.push(d);f.length&&h.push({elem:j,handlers:f})}return j=this,i<b.length&&h.push({elem:j,handlers:b.slice(i)}),h},addProp:function(a,b){Object.defineProperty(r.Event.prototype,a,{enumerable:!0,configurable:!0,get:r.isFunction(b)?function(){if(this.originalEvent)return b(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[a]},set:function(b){Object.defineProperty(this,a,{enumerable:!0,configurable:!0,writable:!0,value:b})}})},fix:function(a){return a[r.expando]?a:new r.Event(a)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==xa()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===xa()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&B(this,"input"))return this.click(),!1},_default:function(a){return B(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},r.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},r.Event=function(a,b){return this instanceof r.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?va:wa,this.target=a.target&&3===a.target.nodeType?a.target.parentNode:a.target,this.currentTarget=a.currentTarget,this.relatedTarget=a.relatedTarget):this.type=a,b&&r.extend(this,b),this.timeStamp=a&&a.timeStamp||r.now(),void(this[r.expando]=!0)):new r.Event(a,b)},r.Event.prototype={constructor:r.Event,isDefaultPrevented:wa,isPropagationStopped:wa,isImmediatePropagationStopped:wa,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=va,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=va,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=va,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},r.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(a){var b=a.button;return null==a.which&&sa.test(a.type)?null!=a.charCode?a.charCode:a.keyCode:!a.which&&void 0!==b&&ta.test(a.type)?1&b?1:2&b?3:4&b?2:0:a.which}},r.event.addProp),r.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){r.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||r.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),r.fn.extend({on:function(a,b,c,d){return ya(this,a,b,c,d)},one:function(a,b,c,d){return ya(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,r(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=wa),this.each(function(){r.event.remove(this,a,c,b)})}});var za=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,Aa=/<script|<style|<link/i,Ba=/checked\s*(?:[^=]|=\s*.checked.)/i,Ca=/^true\/(.*)/,Da=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Ea(a,b){return B(a,"table")&&B(11!==b.nodeType?b:b.firstChild,"tr")?r(">tbody",a)[0]||a:a}function Fa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Ga(a){var b=Ca.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ha(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(W.hasData(a)&&(f=W.access(a),g=W.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c<d;c++)r.event.add(b,e,j[e][c])}X.hasData(a)&&(h=X.access(a),i=r.extend({},h),X.set(b,i))}}function Ia(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ja.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function Ja(a,b,c,d){b=g.apply([],b);var e,f,h,i,j,k,l=0,m=a.length,n=m-1,q=b[0],s=r.isFunction(q);if(s||m>1&&"string"==typeof q&&!o.checkClone&&Ba.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ja(f,b,c,d)});if(m&&(e=qa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(na(e,"script"),Fa),i=h.length;l<m;l++)j=e,l!==n&&(j=r.clone(j,!0,!0),i&&r.merge(h,na(j,"script"))),c.call(a[l],j,l);if(i)for(k=h[h.length-1].ownerDocument,r.map(h,Ga),l=0;l<i;l++)j=h[l],la.test(j.type||"")&&!W.access(j,"globalEval")&&r.contains(k,j)&&(j.src?r._evalUrl&&r._evalUrl(j.src):p(j.textContent.replace(Da,""),k))}return a}function Ka(a,b,c){for(var d,e=b?r.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||r.cleanData(na(d)),d.parentNode&&(c&&r.contains(d.ownerDocument,d)&&oa(na(d,"script")),d.parentNode.removeChild(d));return a}r.extend({htmlPrefilter:function(a){return a.replace(za,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=na(h),f=na(a),d=0,e=f.length;d<e;d++)Ia(f[d],g[d]);if(b)if(c)for(f=f||na(a),g=g||na(h),d=0,e=f.length;d<e;d++)Ha(f[d],g[d]);else Ha(a,h);return g=na(h,"script"),g.length>0&&oa(g,!i&&na(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(U(c)){if(b=c[W.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[W.expando]=void 0}c[X.expando]&&(c[X.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ka(this,a,!0)},remove:function(a){return Ka(this,a)},text:function(a){return T(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.appendChild(a)}})},prepend:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(na(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return T(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!Aa.test(a)&&!ma[(ka.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c<d;c++)b=this[c]||{},1===b.nodeType&&(r.cleanData(na(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ja(this,arguments,function(b){var c=this.parentNode;r.inArray(this,a)<0&&(r.cleanData(na(this)),c&&c.replaceChild(b,this))},a)}}),r.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){r.fn[a]=function(a){for(var c,d=[],e=r(a),f=e.length-1,g=0;g<=f;g++)c=g===f?this:this.clone(!0),r(e[g])[b](c),h.apply(d,c.get());return this.pushStack(d)}});var La=/^margin/,Ma=new RegExp("^("+aa+")(?!px)[a-z%]+$","i"),Na=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)};!function(){function b(){if(i){i.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",i.innerHTML="",ra.appendChild(h);var b=a.getComputedStyle(i);c="1%"!==b.top,g="2px"===b.marginLeft,e="4px"===b.width,i.style.marginRight="50%",f="4px"===b.marginRight,ra.removeChild(h),i=null}}var c,e,f,g,h=d.createElement("div"),i=d.createElement("div");i.style&&(i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",o.clearCloneStyle="content-box"===i.style.backgroundClip,h.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",h.appendChild(i),r.extend(o,{pixelPosition:function(){return b(),c},boxSizingReliable:function(){return b(),e},pixelMarginRight:function(){return b(),f},reliableMarginLeft:function(){return b(),g}}))}();function Oa(a,b,c){var d,e,f,g,h=a.style;return c=c||Na(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||r.contains(a.ownerDocument,a)||(g=r.style(a,b)),!o.pixelMarginRight()&&Ma.test(g)&&La.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function Pa(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Qa=/^(none|table(?!-c[ea]).+)/,Ra=/^--/,Sa={position:"absolute",visibility:"hidden",display:"block"},Ta={letterSpacing:"0",fontWeight:"400"},Ua=["Webkit","Moz","ms"],Va=d.createElement("div").style;function Wa(a){if(a in Va)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ua.length;while(c--)if(a=Ua[c]+b,a in Va)return a}function Xa(a){var b=r.cssProps[a];return b||(b=r.cssProps[a]=Wa(a)||a),b}function Ya(a,b,c){var d=ba.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Za(a,b,c,d,e){var f,g=0;for(f=c===(d?"border":"content")?4:"width"===b?1:0;f<4;f+=2)"margin"===c&&(g+=r.css(a,c+ca[f],!0,e)),d?("content"===c&&(g-=r.css(a,"padding"+ca[f],!0,e)),"margin"!==c&&(g-=r.css(a,"border"+ca[f]+"Width",!0,e))):(g+=r.css(a,"padding"+ca[f],!0,e),"padding"!==c&&(g+=r.css(a,"border"+ca[f]+"Width",!0,e)));return g}function $a(a,b,c){var d,e=Na(a),f=Oa(a,b,e),g="border-box"===r.css(a,"boxSizing",!1,e);return Ma.test(f)?f:(d=g&&(o.boxSizingReliable()||f===a.style[b]),"auto"===f&&(f=a["offset"+b[0].toUpperCase()+b.slice(1)]),f=parseFloat(f)||0,f+Za(a,b,c||(g?"border":"content"),d,e)+"px")}r.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Oa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=r.camelCase(b),i=Ra.test(b),j=a.style;return i||(b=Xa(h)),g=r.cssHooks[b]||r.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:j[b]:(f=typeof c,"string"===f&&(e=ba.exec(c))&&e[1]&&(c=fa(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(r.cssNumber[h]?"":"px")),o.clearCloneStyle||""!==c||0!==b.indexOf("background")||(j[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i?j.setProperty(b,c):j[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=r.camelCase(b),i=Ra.test(b);return i||(b=Xa(h)),g=r.cssHooks[b]||r.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Oa(a,b,d)),"normal"===e&&b in Ta&&(e=Ta[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),r.each(["height","width"],function(a,b){r.cssHooks[b]={get:function(a,c,d){if(c)return!Qa.test(r.css(a,"display"))||a.getClientRects().length&&a.getBoundingClientRect().width?$a(a,b,d):ea(a,Sa,function(){return $a(a,b,d)})},set:function(a,c,d){var e,f=d&&Na(a),g=d&&Za(a,b,d,"border-box"===r.css(a,"boxSizing",!1,f),f);return g&&(e=ba.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=r.css(a,b)),Ya(a,c,g)}}}),r.cssHooks.marginLeft=Pa(o.reliableMarginLeft,function(a,b){if(b)return(parseFloat(Oa(a,"marginLeft"))||a.getBoundingClientRect().left-ea(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px"}),r.each({margin:"",padding:"",border:"Width"},function(a,b){r.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];d<4;d++)e[a+ca[d]+b]=f[d]||f[d-2]||f[0];return e}},La.test(a)||(r.cssHooks[a+b].set=Ya)}),r.fn.extend({css:function(a,b){return T(this,function(a,b,c){var d,e,f={},g=0;if(Array.isArray(b)){for(d=Na(a),e=b.length;g<e;g++)f[b[g]]=r.css(a,b[g],!1,d);return f}return void 0!==c?r.style(a,b,c):r.css(a,b)},a,b,arguments.length>1)}});function _a(a,b,c,d,e){return new _a.prototype.init(a,b,c,d,e)}r.Tween=_a,_a.prototype={constructor:_a,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=_a.propHooks[this.prop];return a&&a.get?a.get(this):_a.propHooks._default.get(this)},run:function(a){var b,c=_a.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):_a.propHooks._default.set(this),this}},_a.prototype.init.prototype=_a.prototype,_a.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},_a.propHooks.scrollTop=_a.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=_a.prototype.init,r.fx.step={};var ab,bb,cb=/^(?:toggle|show|hide)$/,db=/queueHooks$/;function eb(){bb&&(d.hidden===!1&&a.requestAnimationFrame?a.requestAnimationFrame(eb):a.setTimeout(eb,r.fx.interval),r.fx.tick())}function fb(){return a.setTimeout(function(){ab=void 0}),ab=r.now()}function gb(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=ca[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function hb(a,b,c){for(var d,e=(kb.tweeners[b]||[]).concat(kb.tweeners["*"]),f=0,g=e.length;f<g;f++)if(d=e[f].call(c,b,a))return d}function ib(a,b,c){var d,e,f,g,h,i,j,k,l="width"in b||"height"in b,m=this,n={},o=a.style,p=a.nodeType&&da(a),q=W.get(a,"fxshow");c.queue||(g=r._queueHooks(a,"fx"),null==g.unqueued&&(g.unqueued=0,h=g.empty.fire,g.empty.fire=function(){g.unqueued||h()}),g.unqueued++,m.always(function(){m.always(function(){g.unqueued--,r.queue(a,"fx").length||g.empty.fire()})}));for(d in b)if(e=b[d],cb.test(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}n[d]=q&&q[d]||r.style(a,d)}if(i=!r.isEmptyObject(b),i||!r.isEmptyObject(n)){l&&1===a.nodeType&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=q&&q.display,null==j&&(j=W.get(a,"display")),k=r.css(a,"display"),"none"===k&&(j?k=j:(ia([a],!0),j=a.style.display||j,k=r.css(a,"display"),ia([a]))),("inline"===k||"inline-block"===k&&null!=j)&&"none"===r.css(a,"float")&&(i||(m.done(function(){o.display=j}),null==j&&(k=o.display,j="none"===k?"":k)),o.display="inline-block")),c.overflow&&(o.overflow="hidden",m.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]})),i=!1;for(d in n)i||(q?"hidden"in q&&(p=q.hidden):q=W.access(a,"fxshow",{display:j}),f&&(q.hidden=!p),p&&ia([a],!0),m.done(function(){p||ia([a]),W.remove(a,"fxshow");for(d in n)r.style(a,d,n[d])})),i=hb(p?q[d]:0,d,m),d in q||(q[d]=i.start,p&&(i.end=i.start,i.start=0))}}function jb(a,b){var c,d,e,f,g;for(c in a)if(d=r.camelCase(c),e=b[d],f=a[c],Array.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=r.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kb(a,b,c){var d,e,f=0,g=kb.prefilters.length,h=r.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=ab||fb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;g<i;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),f<1&&i?c:(i||h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:r.extend({},b),opts:r.extend(!0,{specialEasing:{},easing:r.easing._default},c),originalProperties:b,originalOptions:c,startTime:ab||fb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=r.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;c<d;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jb(k,j.opts.specialEasing);f<g;f++)if(d=kb.prefilters[f].call(j,a,k,j.opts))return r.isFunction(d.stop)&&(r._queueHooks(j.elem,j.opts.queue).stop=r.proxy(d.stop,d)),d;return r.map(k,hb,j),r.isFunction(j.opts.start)&&j.opts.start.call(a,j),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always),r.fx.timer(r.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j}r.Animation=r.extend(kb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return fa(c.elem,a,ba.exec(b),c),c}]},tweener:function(a,b){r.isFunction(a)?(b=a,a=["*"]):a=a.match(L);for(var c,d=0,e=a.length;d<e;d++)c=a[d],kb.tweeners[c]=kb.tweeners[c]||[],kb.tweeners[c].unshift(b)},prefilters:[ib],prefilter:function(a,b){b?kb.prefilters.unshift(a):kb.prefilters.push(a)}}),r.speed=function(a,b,c){var d=a&&"object"==typeof a?r.extend({},a):{complete:c||!c&&b||r.isFunction(a)&&a,duration:a,easing:c&&b||b&&!r.isFunction(b)&&b};return r.fx.off?d.duration=0:"number"!=typeof d.duration&&(d.duration in r.fx.speeds?d.duration=r.fx.speeds[d.duration]:d.duration=r.fx.speeds._default),null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){r.isFunction(d.old)&&d.old.call(this),d.queue&&r.dequeue(this,d.queue)},d},r.fn.extend({fadeTo:function(a,b,c,d){return this.filter(da).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=r.isEmptyObject(a),f=r.speed(b,c,d),g=function(){var b=kb(this,r.extend({},a),f);(e||W.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=r.timers,g=W.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&db.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||r.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=W.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=r.timers,g=d?d.length:0;for(c.finish=!0,r.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;b<g;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),r.each(["toggle","show","hide"],function(a,b){var c=r.fn[b];r.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gb(b,!0),a,d,e)}}),r.each({slideDown:gb("show"),slideUp:gb("hide"),slideToggle:gb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){r.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),r.timers=[],r.fx.tick=function(){var a,b=0,c=r.timers;for(ab=r.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||r.fx.stop(),ab=void 0},r.fx.timer=function(a){r.timers.push(a),r.fx.start()},r.fx.interval=13,r.fx.start=function(){bb||(bb=!0,eb())},r.fx.stop=function(){bb=null},r.fx.speeds={slow:600,fast:200,_default:400},r.fn.delay=function(b,c){return b=r.fx?r.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",o.checkOn=""!==a.value,o.optSelected=c.selected,a=d.createElement("input"),a.value="t",a.type="radio",o.radioValue="t"===a.value}();var lb,mb=r.expr.attrHandle;r.fn.extend({attr:function(a,b){return T(this,r.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?lb:void 0)),void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),
+null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&B(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(L);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),lb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=mb[b]||r.find.attr;mb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=mb[g],mb[g]=e,e=null!=c(a,b,d)?g:null,mb[g]=f),e}});var nb=/^(?:input|select|textarea|button)$/i,ob=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return T(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):nb.test(a.nodeName)||ob.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function pb(a){var b=a.match(L)||[];return b.join(" ")}function qb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,qb(this)))});if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,qb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,qb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(L)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=qb(this),b&&W.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":W.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+pb(qb(c))+" ").indexOf(b)>-1)return!0;return!1}});var rb=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":Array.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:pb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d<i;d++)if(c=e[d],(c.selected||d===f)&&!c.disabled&&(!c.parentNode.disabled||!B(c.parentNode,"optgroup"))){if(b=r(c).val(),g)return b;h.push(b)}return h},set:function(a,b){var c,d,e=a.options,f=r.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=r.inArray(r.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(Array.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var sb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!sb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,sb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(W.get(h,"events")||{})[b.type]&&W.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&U(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!U(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=W.access(d,b);e||d.addEventListener(a,c,!0),W.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=W.access(d,b)-1;e?W.access(d,b,e):(d.removeEventListener(a,c,!0),W.remove(d,b))}}});var tb=a.location,ub=r.now(),vb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(Array.isArray(b))r.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)Ab(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(Array.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)Ab(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&zb.test(this.nodeName)&&!yb.test(a)&&(this.checked||!ja.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:Array.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}});var Bb=/%20/g,Cb=/#.*$/,Db=/([?&])_=[^&]*/,Eb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Fb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Gb=/^(?:GET|HEAD)$/,Hb=/^\/\//,Ib={},Jb={},Kb="*/".concat("*"),Lb=d.createElement("a");Lb.href=tb.href;function Mb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(L)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nb(a,b,c,d){var e={},f=a===Jb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Ob(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Pb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Qb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:tb.href,type:"GET",isLocal:Fb.test(tb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Ob(Ob(a,r.ajaxSettings),b):Ob(r.ajaxSettings,a)},ajaxPrefilter:Mb(Ib),ajaxTransport:Mb(Jb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Eb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||tb.href)+"").replace(Hb,tb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(L)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Lb.protocol+"//"+Lb.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Nb(Ib,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Gb.test(o.type),f=o.url.replace(Cb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(Bb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(vb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Db,"$1"),n=(vb.test(f)?"&":"?")+"_="+ub++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Kb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Nb(Jb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Pb(o,y,d)),v=Qb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Rb={0:200,1223:204},Sb=r.ajaxSettings.xhr();o.cors=!!Sb&&"withCredentials"in Sb,o.ajax=Sb=!!Sb,r.ajaxTransport(function(b){var c,d;if(o.cors||Sb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Rb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Tb=[],Ub=/(=)\?(?=&|$)|\?\?/;r.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Tb.pop()||r.expando+"_"+ub++;return this[a]=!0,a}}),r.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Ub.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ub.test(b.data)&&"data");if(h||"jsonp"===b.dataTypes[0])return e=b.jsonpCallback=r.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Ub,"$1"+e):b.jsonp!==!1&&(b.url+=(vb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||r.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?r(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Tb.push(e)),g&&r.isFunction(f)&&f(g[0]),g=f=void 0}),"script"}),o.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),r.parseHTML=function(a,b,c){if("string"!=typeof a)return[];"boolean"==typeof b&&(c=b,b=!1);var e,f,g;return b||(o.createHTMLDocument?(b=d.implementation.createHTMLDocument(""),e=b.createElement("base"),e.href=d.location.href,b.head.appendChild(e)):b=d),f=C.exec(a),g=!c&&[],f?[b.createElement(f[1])]:(f=qa([a],b,g),g&&g.length&&r(g).remove(),r.merge([],f.childNodes))},r.fn.load=function(a,b,c){var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=pb(a.slice(h)),a=a.slice(0,h)),r.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&r.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?r("<div>").append(r.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},r.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){r.fn[b]=function(a){return this.on(b,a)}}),r.expr.pseudos.animated=function(a){return r.grep(r.timers,function(b){return a===b.elem}).length},r.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=r.css(a,"position"),l=r(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=r.css(a,"top"),i=r.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),r.isFunction(b)&&(b=b.call(a,c,r.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},r.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){r.offset.setOffset(this,a,b)});var b,c,d,e,f=this[0];if(f)return f.getClientRects().length?(d=f.getBoundingClientRect(),b=f.ownerDocument,c=b.documentElement,e=b.defaultView,{top:d.top+e.pageYOffset-c.clientTop,left:d.left+e.pageXOffset-c.clientLeft}):{top:0,left:0}},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===r.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),B(a[0],"html")||(d=a.offset()),d={top:d.top+r.css(a[0],"borderTopWidth",!0),left:d.left+r.css(a[0],"borderLeftWidth",!0)}),{top:b.top-d.top-r.css(c,"marginTop",!0),left:b.left-d.left-r.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===r.css(a,"position"))a=a.offsetParent;return a||ra})}}),r.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;r.fn[a]=function(d){return T(this,function(a,d,e){var f;return r.isWindow(a)?f=a:9===a.nodeType&&(f=a.defaultView),void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),r.each(["top","left"],function(a,b){r.cssHooks[b]=Pa(o.pixelPosition,function(a,c){if(c)return c=Oa(a,b),Ma.test(c)?r(a).position()[b]+"px":c})}),r.each({Height:"height",Width:"width"},function(a,b){r.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){r.fn[d]=function(e,f){var g=arguments.length&&(c||"boolean"!=typeof e),h=c||(e===!0||f===!0?"margin":"border");return T(this,function(b,c,e){var f;return r.isWindow(b)?0===d.indexOf("outer")?b["inner"+a]:b.document.documentElement["client"+a]:9===b.nodeType?(f=b.documentElement,Math.max(b.body["scroll"+a],f["scroll"+a],b.body["offset"+a],f["offset"+a],f["client"+a])):void 0===e?r.css(b,c,h):r.style(b,c,e,h)},b,g?e:void 0,g)}})}),r.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),r.holdReady=function(a){a?r.readyWait++:r.ready(!0)},r.isArray=Array.isArray,r.parseJSON=JSON.parse,r.nodeName=B,"function"==typeof define&&define.amd&&define("jquery",[],function(){return r});var Vb=a.jQuery,Wb=a.$;return r.noConflict=function(b){return a.$===r&&(a.$=Wb),b&&a.jQuery===r&&(a.jQuery=Vb),r},b||(a.jQuery=a.$=r),r});
+
+/*! jQuery UI - v1.12.1 - 2016-09-14 * http://jqueryui.com * Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js * Copyright jQuery Foundation and other contributors; Licensed MIT */
+(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(t){for(var e=t.css("visibility");"inherit"===e;)t=t.parent(),e=t.css("visibility");return"hidden"!==e}function i(t){for(var e,i;t.length&&t[0]!==document;){if(e=t.css("position"),("absolute"===e||"relative"===e||"fixed"===e)&&(i=parseInt(t.css("zIndex"),10),!isNaN(i)&&0!==i))return i;t=t.parent()}return 0}function s(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.regional.en=t.extend(!0,{},this.regional[""]),this.regional["en-US"]=t.extend(!0,{},this.regional.en),this.dpDiv=n(t("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function n(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.on("mouseout",i,function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).on("mouseover",i,o)}function o(){t.datepicker._isDisabledDatepicker(m.inline?m.dpDiv.parent()[0]:m.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))}function a(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}function r(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.ui=t.ui||{},t.ui.version="1.12.1";var h=0,l=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},h=e.split(".")[0];e=e.split(".")[1];var l=h+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][l.toLowerCase()]=function(e){return!!t.data(e,l)},t[h]=t[h]||{},n=t[h][e],o=t[h][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:h,widgetName:e,widgetFullName:l}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,s,n=l.call(arguments,1),o=0,a=n.length;a>o;o++)for(i in n[o])s=n[o][i],n[o].hasOwnProperty(i)&&void 0!==s&&(e[i]=t.isPlainObject(s)?t.isPlainObject(e[i])?t.widget.extend({},e[i],s):t.widget.extend({},s):s);return e},t.widget.bridge=function(e,i){var s=i.prototype.widgetFullName||e;t.fn[e]=function(n){var o="string"==typeof n,a=l.call(arguments,1),r=this;return o?this.length||"instance"!==n?this.each(function(){var i,o=t.data(this,s);return"instance"===n?(r=o,!1):o?t.isFunction(o[n])&&"_"!==n.charAt(0)?(i=o[n].apply(o,a),i!==o&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+n+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+n+"'")}):r=void 0:(a.length&&(n=t.widget.extend.apply(null,[n].concat(a))),this.each(function(){var e=t.data(this,s);e?(e.option(n||{}),e._init&&e._init()):t.data(this,s,new i(n,this))})),r}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(e,i){i=t(i||this.defaultElement||this)[0],this.element=t(i),this.uuid=h++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},i!==this&&(t.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===i&&this.destroy()}}),this.document=t(i.style?i.ownerDocument:i.document||i),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+o.eventNamespace,c=h[2];c?n.on(l,c,r):i.on(l,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,h=/top|center|bottom/,l=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType,o=!s&&!n;return{element:i,isWindow:s,isDocument:n,offset:o?t(e).offset():{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:i.outerWidth(),height:i.outerHeight()}}},t.fn.position=function(n){if(!n||!n.of)return d.apply(this,arguments);n=t.extend({},n);var u,p,f,g,m,_,v=t(n.of),b=t.position.getWithinInfo(n.within),y=t.position.getScrollInfo(b),w=(n.collision||"flip").split(" "),k={};return _=s(v),v[0].preventDefault&&(n.at="left top"),p=_.width,f=_.height,g=_.offset,m=t.extend({},g),t.each(["my","at"],function(){var t,e,i=(n[this]||"").split(" ");1===i.length&&(i=r.test(i[0])?i.concat(["center"]):h.test(i[0])?["center"].concat(i):["center","center"]),i[0]=r.test(i[0])?i[0]:"center",i[1]=h.test(i[1])?i[1]:"center",t=l.exec(i[0]),e=l.exec(i[1]),k[this]=[t?t[0]:0,e?e[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===n.at[0]?m.left+=p:"center"===n.at[0]&&(m.left+=p/2),"bottom"===n.at[1]?m.top+=f:"center"===n.at[1]&&(m.top+=f/2),u=e(k.at,p,f),m.left+=u[0],m.top+=u[1],this.each(function(){var s,r,h=t(this),l=h.outerWidth(),c=h.outerHeight(),d=i(this,"marginLeft"),_=i(this,"marginTop"),x=l+d+i(this,"marginRight")+y.width,C=c+_+i(this,"marginBottom")+y.height,D=t.extend({},m),I=e(k.my,h.outerWidth(),h.outerHeight());"right"===n.my[0]?D.left-=l:"center"===n.my[0]&&(D.left-=l/2),"bottom"===n.my[1]?D.top-=c:"center"===n.my[1]&&(D.top-=c/2),D.left+=I[0],D.top+=I[1],s={marginLeft:d,marginTop:_},t.each(["left","top"],function(e,i){t.ui.position[w[e]]&&t.ui.position[w[e]][i](D,{targetWidth:p,targetHeight:f,elemWidth:l,elemHeight:c,collisionPosition:s,collisionWidth:x,collisionHeight:C,offset:[u[0]+I[0],u[1]+I[1]],my:n.my,at:n.at,within:b,elem:h})}),n.using&&(r=function(t){var e=g.left-D.left,i=e+p-l,s=g.top-D.top,r=s+f-c,u={target:{element:v,left:g.left,top:g.top,width:p,height:f},element:{element:h,left:D.left,top:D.top,width:l,height:c},horizontal:0>i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};l>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),h.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-a-n;e.collisionWidth>a?h>0&&0>=l?(i=t.left+h+e.collisionWidth-a-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+a-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-a-n;e.collisionHeight>a?h>0&&0>=l?(i=t.top+h+e.collisionHeight-a-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+a-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-r-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-r-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-h,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}});var c="ui-effects-",u="ui-effects-style",d="ui-effects-animated",p=t;t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(t,o){var a,r=o.re.exec(i),h=r&&o.parse(r),l=o.space||"rgba";return h?(a=s[l](h),s[c[l].cache]=a[c[l].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],l=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=l.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),l.fn=t.extend(l.prototype,{parse:function(n,a,r,h){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,h],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof l?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=l(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=l(t),n=s._space(),o=c[n],a=0===this.alpha()?l("transparent"):this,r=a[o.cache]||o.to(a._rgba),h=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],l=s[o],c=u[n.type]||{};null!==l&&(null===a?h[o]=l:(c.mod&&(l-a>c.mod/2?a+=c.mod:a-l>c.mod/2&&(a-=c.mod)),h[o]=i((l-a)*e+a,n)))}),this[n](h)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(e)._rgba;return l(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),h=Math.min(s,n,o),l=r-h,c=r+h,u=.5*c;return e=h===r?0:s===r?60*(n-o)/l+360:n===r?60*(o-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=u?l/c:l/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,h=n.to,c=n.from;l.fn[s]=function(s){if(h&&!this[a]&&(this[a]=h(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=l(c(d)),n[a]=d,n):l(d)},f(o,function(e,i){l.fn[e]||(l.fn[e]=function(n){var o,a=t.type(n),h="alpha"===e?this._hsla?"hsla":"rgba":s,l=this[h](),c=l[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=l(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(h){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=l(e.elem,i),e.end=l(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},l.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(p),function(){function e(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function i(e,i){var s,o,a={};for(s in i)o=i[s],e[s]!==o&&(n[s]||(t.fx.step[s]||!isNaN(parseFloat(o)))&&(a[s]=o));return a}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(p.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(n,o,a,r){var h=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",l=h.children?a.find("*").addBack():a;l=l.map(function(){var i=t(this);return{el:i,start:e(this)}}),o=function(){t.each(s,function(t,e){n[e]&&a[e+"Class"](n[e])})},o(),l=l.map(function(){return this.end=e(this.el[0]),this.diff=i(this.start,this.end),this}),a.attr("class",r),l=l.map(function(){var e=this,i=t.Deferred(),s=t.extend({},h,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,l.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),h.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(e){return function(i,s,n,o,a){return"boolean"==typeof s||void 0===s?n?t.effects.animateClass.call(this,s?{add:i}:{remove:i},n,o,a):e.apply(this,arguments):t.effects.animateClass.call(this,{toggle:i},s,n,o)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function e(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function i(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}function s(t,e){var i=e.outerWidth(),s=e.outerHeight(),n=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,o=n.exec(t)||["",0,i,s,0];return{top:parseFloat(o[1])||0,right:"auto"===o[2]?i:parseFloat(o[2]),bottom:"auto"===o[3]?s:parseFloat(o[3]),left:parseFloat(o[4])||0}}t.expr&&t.expr.filters&&t.expr.filters.animated&&(t.expr.filters.animated=function(e){return function(i){return!!t(i).data(d)||e(i)}}(t.expr.filters.animated)),t.uiBackCompat!==!1&&t.extend(t.effects,{save:function(t,e){for(var i=0,s=e.length;s>i;i++)null!==e[i]&&t.data(c+e[i],t[0].style[e[i]])},restore:function(t,e){for(var i,s=0,n=e.length;n>s;s++)null!==e[s]&&(i=t.data(c+e[s]),t.css(e[s],i))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).trigger("focus"),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).trigger("focus")),e}}),t.extend(t.effects,{version:"1.12.1",define:function(e,i,s){return s||(s=i,i="effect"),t.effects.effect[e]=s,t.effects.effect[e].mode=i,s},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,n="vertical"!==i?(e||100)/100:1;return{height:t.height()*n,width:t.width()*s,outerHeight:t.outerHeight()*n,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();e>1&&s.splice.apply(s,[1,0].concat(s.splice(e,i))),t.dequeue()},saveStyle:function(t){t.data(u,t[0].style.cssText)},restoreStyle:function(t){t[0].style.cssText=t.data(u)||"",t.removeData(u)},mode:function(t,e){var i=t.is(":hidden");return"toggle"===e&&(e=i?"show":"hide"),(i?"hide"===e:"show"===e)&&(e="none"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createPlaceholder:function(e){var i,s=e.css("position"),n=e.position();return e.css({marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()),/^(static|relative)/.test(s)&&(s="absolute",i=t("<"+e[0].nodeName+">").insertAfter(e).css({display:/^(inline|ruby)/.test(e.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight"),"float":e.css("float")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).addClass("ui-effects-placeholder"),e.data(c+"placeholder",i)),e.css({position:s,left:n.left,top:n.top}),i},removePlaceholder:function(t){var e=c+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(e){t.effects.restoreStyle(e),t.effects.removePlaceholder(e)},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function i(e){function i(){r.removeData(d),t.effects.cleanUp(r),"hide"===s.mode&&r.hide(),a()}function a(){t.isFunction(h)&&h.call(r[0]),t.isFunction(e)&&e()}var r=t(this);s.mode=c.shift(),t.uiBackCompat===!1||o?"none"===s.mode?(r[l](),a()):n.call(r[0],s,i):(r.is(":hidden")?"hide"===l:"show"===l)?(r[l](),a()):n.call(r[0],s,a)}var s=e.apply(this,arguments),n=t.effects.effect[s.effect],o=n.mode,a=s.queue,r=a||"fx",h=s.complete,l=s.mode,c=[],u=function(e){var i=t(this),s=t.effects.mode(i,l)||o;i.data(d,!0),c.push(s),o&&("show"===s||s===o&&"hide"===s)&&i.show(),o&&"none"===s||t.effects.saveStyle(i),t.isFunction(e)&&e()};return t.fx.off||!n?l?this[l](s.duration,h):this.each(function(){h&&h.call(this)}):a===!1?this.each(u).each(i):this.queue(r,u).queue(r,i)},show:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="show",this.effect.call(this,n)
+}}(t.fn.show),hide:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(t.fn.hide),toggle:function(t){return function(s){if(i(s)||"boolean"==typeof s)return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s},cssClip:function(t){return t?this.css("clip","rect("+t.top+"px "+t.right+"px "+t.bottom+"px "+t.left+"px)"):s(this.css("clip"),this)},transfer:function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,h=o?a.scrollLeft():0,l=n.offset(),c={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo("body").addClass(e.className).css({top:u.top-r,left:u.left-h,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),t.isFunction(i)&&i()})}}),t.fx.step.clip=function(e){e.clipInit||(e.start=t(e.elem).cssClip(),"string"==typeof e.end&&(e.end=s(e.end,e.elem)),e.clipInit=!0),t(e.elem).cssClip({top:e.pos*(e.end.top-e.start.top)+e.start.top,right:e.pos*(e.end.right-e.start.right)+e.start.right,bottom:e.pos*(e.end.bottom-e.start.bottom)+e.start.bottom,left:e.pos*(e.end.left-e.start.left)+e.start.left})}}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}();var f=t.effects;t.effects.define("blind","hide",function(e,i){var s={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},n=t(this),o=e.direction||"up",a=n.cssClip(),r={clip:t.extend({},a)},h=t.effects.createPlaceholder(n);r.clip[s[o][0]]=r.clip[s[o][1]],"show"===e.mode&&(n.cssClip(r.clip),h&&h.css(t.effects.clipToBox(r)),r.clip=a),h&&h.animate(t.effects.clipToBox(r),e.duration,e.easing),n.animate(r,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("bounce",function(e,i){var s,n,o,a=t(this),r=e.mode,h="hide"===r,l="show"===r,c=e.direction||"up",u=e.distance,d=e.times||5,p=2*d+(l||h?1:0),f=e.duration/p,g=e.easing,m="up"===c||"down"===c?"top":"left",_="up"===c||"left"===c,v=0,b=a.queue().length;for(t.effects.createPlaceholder(a),o=a.css(m),u||(u=a["top"===m?"outerHeight":"outerWidth"]()/3),l&&(n={opacity:1},n[m]=o,a.css("opacity",0).css(m,_?2*-u:2*u).animate(n,f,g)),h&&(u/=Math.pow(2,d-1)),n={},n[m]=o;d>v;v++)s={},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g).animate(n,f,g),u=h?2*u:u/2;h&&(s={opacity:0},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g)),a.queue(i),t.effects.unshift(a,b,p+1)}),t.effects.define("clip","hide",function(e,i){var s,n={},o=t(this),a=e.direction||"vertical",r="both"===a,h=r||"horizontal"===a,l=r||"vertical"===a;s=o.cssClip(),n.clip={top:l?(s.bottom-s.top)/2:s.top,right:h?(s.right-s.left)/2:s.right,bottom:l?(s.bottom-s.top)/2:s.bottom,left:h?(s.right-s.left)/2:s.left},t.effects.createPlaceholder(o),"show"===e.mode&&(o.cssClip(n.clip),n.clip=s),o.animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("drop","hide",function(e,i){var s,n=t(this),o=e.mode,a="show"===o,r=e.direction||"left",h="up"===r||"down"===r?"top":"left",l="up"===r||"left"===r?"-=":"+=",c="+="===l?"-=":"+=",u={opacity:0};t.effects.createPlaceholder(n),s=e.distance||n["top"===h?"outerHeight":"outerWidth"](!0)/2,u[h]=l+s,a&&(n.css(u),u[h]=c+s,u.opacity=1),n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("explode","hide",function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),i()}var o,a,r,h,l,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=e.mode,g="show"===f,m=p.show().css("visibility","hidden").offset(),_=Math.ceil(p.outerWidth()/d),v=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(h=m.top+o*v,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*_,l=a-(d-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-a*_,top:-o*v}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:_,height:v,left:r+(g?l*_:0),top:h+(g?c*v:0),opacity:g?0:1}).animate({left:r+(g?0:l*_),top:h+(g?0:c*v),opacity:g?1:0},e.duration||500,e.easing,s)}),t.effects.define("fade","toggle",function(e,i){var s="show"===e.mode;t(this).css("opacity",s?0:1).animate({opacity:s?1:0},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("fold","hide",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=e.size||15,h=/([0-9]+)%/.exec(r),l=!!e.horizFirst,c=l?["right","bottom"]:["bottom","right"],u=e.duration/2,d=t.effects.createPlaceholder(s),p=s.cssClip(),f={clip:t.extend({},p)},g={clip:t.extend({},p)},m=[p[c[0]],p[c[1]]],_=s.queue().length;h&&(r=parseInt(h[1],10)/100*m[a?0:1]),f.clip[c[0]]=r,g.clip[c[0]]=r,g.clip[c[1]]=0,o&&(s.cssClip(g.clip),d&&d.css(t.effects.clipToBox(g)),g.clip=p),s.queue(function(i){d&&d.animate(t.effects.clipToBox(f),u,e.easing).animate(t.effects.clipToBox(g),u,e.easing),i()}).animate(f,u,e.easing).animate(g,u,e.easing).queue(i),t.effects.unshift(s,_,4)}),t.effects.define("highlight","show",function(e,i){var s=t(this),n={backgroundColor:s.css("backgroundColor")};"hide"===e.mode&&(n.opacity=0),t.effects.saveStyle(s),s.css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("size",function(e,i){var s,n,o,a=t(this),r=["fontSize"],h=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],l=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],c=e.mode,u="effect"!==c,d=e.scale||"both",p=e.origin||["middle","center"],f=a.css("position"),g=a.position(),m=t.effects.scaledDimensions(a),_=e.from||m,v=e.to||t.effects.scaledDimensions(a,0);t.effects.createPlaceholder(a),"show"===c&&(o=_,_=v,v=o),n={from:{y:_.height/m.height,x:_.width/m.width},to:{y:v.height/m.height,x:v.width/m.width}},("box"===d||"both"===d)&&(n.from.y!==n.to.y&&(_=t.effects.setTransition(a,h,n.from.y,_),v=t.effects.setTransition(a,h,n.to.y,v)),n.from.x!==n.to.x&&(_=t.effects.setTransition(a,l,n.from.x,_),v=t.effects.setTransition(a,l,n.to.x,v))),("content"===d||"both"===d)&&n.from.y!==n.to.y&&(_=t.effects.setTransition(a,r,n.from.y,_),v=t.effects.setTransition(a,r,n.to.y,v)),p&&(s=t.effects.getBaseline(p,m),_.top=(m.outerHeight-_.outerHeight)*s.y+g.top,_.left=(m.outerWidth-_.outerWidth)*s.x+g.left,v.top=(m.outerHeight-v.outerHeight)*s.y+g.top,v.left=(m.outerWidth-v.outerWidth)*s.x+g.left),a.css(_),("content"===d||"both"===d)&&(h=h.concat(["marginTop","marginBottom"]).concat(r),l=l.concat(["marginLeft","marginRight"]),a.find("*[width]").each(function(){var i=t(this),s=t.effects.scaledDimensions(i),o={height:s.height*n.from.y,width:s.width*n.from.x,outerHeight:s.outerHeight*n.from.y,outerWidth:s.outerWidth*n.from.x},a={height:s.height*n.to.y,width:s.width*n.to.x,outerHeight:s.height*n.to.y,outerWidth:s.width*n.to.x};n.from.y!==n.to.y&&(o=t.effects.setTransition(i,h,n.from.y,o),a=t.effects.setTransition(i,h,n.to.y,a)),n.from.x!==n.to.x&&(o=t.effects.setTransition(i,l,n.from.x,o),a=t.effects.setTransition(i,l,n.to.x,a)),u&&t.effects.saveStyle(i),i.css(o),i.animate(a,e.duration,e.easing,function(){u&&t.effects.restoreStyle(i)})})),a.animate(v,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){var e=a.offset();0===v.opacity&&a.css("opacity",_.opacity),u||(a.css("position","static"===f?"relative":f).offset(e),t.effects.saveStyle(a)),i()}})}),t.effects.define("scale",function(e,i){var s=t(this),n=e.mode,o=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"effect"!==n?0:100),a=t.extend(!0,{from:t.effects.scaledDimensions(s),to:t.effects.scaledDimensions(s,o,e.direction||"both"),origin:e.origin||["middle","center"]},e);e.fade&&(a.from.opacity=1,a.to.opacity=0),t.effects.effect.size.call(this,a,i)}),t.effects.define("puff","hide",function(e,i){var s=t.extend(!0,{},e,{fade:!0,percent:parseInt(e.percent,10)||150});t.effects.effect.scale.call(this,s,i)}),t.effects.define("pulsate","show",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=o||a,h=2*(e.times||5)+(r?1:0),l=e.duration/h,c=0,u=1,d=s.queue().length;for((o||!s.is(":visible"))&&(s.css("opacity",0).show(),c=1);h>u;u++)s.animate({opacity:c},l,e.easing),c=1-c;s.animate({opacity:c},l,e.easing),s.queue(i),t.effects.unshift(s,d,h+1)}),t.effects.define("shake",function(e,i){var s=1,n=t(this),o=e.direction||"left",a=e.distance||20,r=e.times||3,h=2*r+1,l=Math.round(e.duration/h),c="up"===o||"down"===o?"top":"left",u="up"===o||"left"===o,d={},p={},f={},g=n.queue().length;for(t.effects.createPlaceholder(n),d[c]=(u?"-=":"+=")+a,p[c]=(u?"+=":"-=")+2*a,f[c]=(u?"-=":"+=")+2*a,n.animate(d,l,e.easing);r>s;s++)n.animate(p,l,e.easing).animate(f,l,e.easing);n.animate(p,l,e.easing).animate(d,l/2,e.easing).queue(i),t.effects.unshift(n,g,h+1)}),t.effects.define("slide","show",function(e,i){var s,n,o=t(this),a={up:["bottom","top"],down:["top","bottom"],left:["right","left"],right:["left","right"]},r=e.mode,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h,u=e.distance||o["top"===l?"outerHeight":"outerWidth"](!0),d={};t.effects.createPlaceholder(o),s=o.cssClip(),n=o.position()[l],d[l]=(c?-1:1)*u+n,d.clip=o.cssClip(),d.clip[a[h][1]]=d.clip[a[h][0]],"show"===r&&(o.cssClip(d.clip),o.css(l,d[l]),d.clip=s,d[l]=n),o.animate(d,{queue:!1,duration:e.duration,easing:e.easing,complete:i})});var f;t.uiBackCompat!==!1&&(f=t.effects.define("transfer",function(e,i){t(this).transfer(e,i)})),t.ui.focusable=function(i,s){var n,o,a,r,h,l=i.nodeName.toLowerCase();return"area"===l?(n=i.parentNode,o=n.name,i.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap='#"+o+"']"),a.length>0&&a.is(":visible")):!1):(/^(input|select|textarea|button|object)$/.test(l)?(r=!i.disabled,r&&(h=t(i).closest("fieldset")[0],h&&(r=!h.disabled))):r="a"===l?i.href||s:s,r&&t(i).is(":visible")&&e(t(i)))},t.extend(t.expr[":"],{focusable:function(e){return t.ui.focusable(e,null!=t.attr(e,"tabindex"))}}),t.ui.focusable,t.fn.form=function(){return"string"==typeof this[0].form?this.closest("form"):t(this[0].form)},t.ui.formResetMixin={_formResetHandler:function(){var e=t(this);setTimeout(function(){var i=e.data("ui-form-reset-instances");t.each(i,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element.form(),this.form.length){var t=this.form.data("ui-form-reset-instances")||[];t.length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t)}},_unbindFormResetHandler:function(){if(this.form.length){var e=this.form.data("ui-form-reset-instances");e.splice(t.inArray(this,e),1),e.length?this.form.data("ui-form-reset-instances",e):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}},"1.7"===t.fn.jquery.substring(0,3)&&(t.each(["Width","Height"],function(e,i){function s(e,i,s,o){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),o&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,s(this,e,!0,n)+"px")})}}),t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.escapeSelector=function(){var t=/([!"#$%&'()*+,.\/:;<=>?@[\]^`{|}~])/g;return function(e){return e.replace(t,"\\$1")}}(),t.fn.labels=function(){var e,i,s,n,o;return this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(n=this.eq(0).parents("label"),s=this.attr("id"),s&&(e=this.eq(0).parents().last(),o=e.add(e.length?e.siblings():this.siblings()),i="label[for='"+t.ui.escapeSelector(s)+"']",n=n.add(o.find(i).addBack(i))),this.pushStack(n))},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.extend(t.expr[":"],{tabbable:function(e){var i=t.attr(e,"tabindex"),s=null!=i;return(!s||i>=0)&&t.ui.focusable(e,s)}}),t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.widget("ui.accordion",{version:"1.12.1",options:{active:0,animate:{},classes:{"ui-accordion-header":"ui-corner-top","ui-accordion-header-collapsed":"ui-corner-all","ui-accordion-content":"ui-corner-bottom"},collapsible:!1,event:"click",header:"> li > :first-child, > :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t()}},_createIcons:function(){var e,i,s=this.options.icons;s&&(e=t("<span>"),this._addClass(e,"ui-accordion-header-icon","ui-icon "+s.header),e.prependTo(this.headers),i=this.active.children(".ui-accordion-header-icon"),this._removeClass(i,s.header)._addClass(i,null,s.activeHeader)._addClass(this.headers,"ui-accordion-icons"))},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),void 0)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!t)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),t(o).trigger("focus"),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().trigger("focus")},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var e,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var e=t(this),i=e.uniqueId().attr("id"),s=e.next(),n=s.uniqueId().attr("id");e.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(e=n.height(),this.element.siblings(":visible").each(function(){var i=t(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(e-=i.outerHeight(!0))}),this.headers.each(function(){e-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,e-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===s&&(e=0,this.headers.next().each(function(){var i=t(this).is(":visible");i||t(this).show(),e=Math.max(e,t(this).css("height","").height()),i||t(this).hide()}).height(e))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i,s,n=this.options,o=this.active,a=t(e.currentTarget),r=a[0]===o[0],h=r&&n.collapsible,l=h?t():a.next(),c=o.next(),u={oldHeader:o,oldPanel:c,newHeader:h?t():a,newPanel:l};e.preventDefault(),r&&!n.collapsible||this._trigger("beforeActivate",e,u)===!1||(n.active=h?!1:this.headers.index(a),this.active=r?t():a,this._toggle(u),this._removeClass(o,"ui-accordion-header-active","ui-state-active"),n.icons&&(i=o.children(".ui-accordion-header-icon"),this._removeClass(i,null,n.icons.activeHeader)._addClass(i,null,n.icons.header)),r||(this._removeClass(a,"ui-accordion-header-collapsed")._addClass(a,"ui-accordion-header-active","ui-state-active"),n.icons&&(s=a.children(".ui-accordion-header-icon"),this._removeClass(s,null,n.icons.header)._addClass(s,null,n.icons.activeHeader)),this._addClass(a.next(),"ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(t(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,e,i){var s,n,o,a=this,r=0,h=t.css("box-sizing"),l=t.length&&(!e.length||t.index()<e.index()),c=this.options.animate||{},u=l&&c.down||c,d=function(){a._toggleComplete(i)};return"number"==typeof u&&(o=u),"string"==typeof u&&(n=u),n=n||u.easing||c.easing,o=o||u.duration||c.duration,e.length?t.length?(s=t.show().outerHeight(),e.animate(this.hideProps,{duration:o,easing:n,step:function(t,e){e.now=Math.round(t)}}),t.hide().animate(this.showProps,{duration:o,easing:n,complete:d,step:function(t,i){i.now=Math.round(t),"height"!==i.prop?"content-box"===h&&(r+=i.now):"content"!==a.options.heightStyle&&(i.now=Math.round(s-e.outerHeight()-r),r=0)}}),void 0):e.animate(this.hideProps,o,n,d):t.animate(this.showProps,o,n,d)},_toggleComplete:function(t){var e=t.oldPanel,i=e.prev();this._removeClass(e,"ui-accordion-content-active"),this._removeClass(i,"ui-accordion-header-active")._addClass(i,"ui-accordion-header-collapsed"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}}),t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.widget("ui.menu",{version:"1.12.1",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault()},"click .ui-menu-item":function(e){var i=t(e.target),s=t(t.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&s.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){if(!this.previousFilter){var i=t(e.target).closest(".ui-menu-item"),s=t(e.currentTarget);i[0]===s[0]&&(this._removeClass(s.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(e,s))}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.find(this.options.items).eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){var i=!t.contains(this.element[0],t.ui.safeActiveElement(this.document[0]));i&&this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){var e=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),i=e.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),i.children().each(function(){var e=t(this);e.data("ui-menu-submenu-caret")&&e.remove()})},_keydown:function(e){var i,s,n,o,a=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:a=!1,s=this.previousFilter||"",o=!1,n=e.keyCode>=96&&105>=e.keyCode?""+(e.keyCode-96):String.fromCharCode(e.keyCode),clearTimeout(this.filterTimer),n===s?o=!0:n=s+n,i=this._filterMenuItems(n),i=o&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(e.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(e,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}a&&e.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i,s,n,o,a=this,r=this.options.icons.submenu,h=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),s=h.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),i=e.prev(),s=t("<span>").data("ui-menu-submenu-caret",!0);a._addClass(s,"ui-menu-icon","ui-icon "+r),i.attr("aria-haspopup","true").prepend(s),e.attr("aria-labelledby",i.attr("id"))}),this._addClass(s,"ui-menu","ui-widget ui-widget-content ui-front"),e=h.add(this.element),i=e.find(this.options.items),i.not(".ui-menu-item").each(function(){var e=t(this);a._isDivider(e)&&a._addClass(e,"ui-menu-divider","ui-widget-content")}),n=i.not(".ui-menu-item, .ui-menu-divider"),o=n.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(n,"ui-menu-item")._addClass(o,"ui-menu-item-wrapper"),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){if("icons"===t){var i=this.element.find(".ui-menu-icon");this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)}this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t+""),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i,s,n;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children(".ui-menu-item-wrapper"),this._addClass(s,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),n=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(n,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.outerHeight(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this._removeClass(s.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(e){return!t(e.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(e),void 0)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items).first())),void 0):(this.next(e),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)},_filterMenuItems:function(e){var i=e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(t.trim(t(this).children(".ui-menu-item-wrapper").text()))})}}),t.widget("ui.autocomplete",{version:"1.12.1",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;
+this.isMultiLine=o||!a&&this._isContentEditable(this.element),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,void 0;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),void 0):(this._searchTimeout(t),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(t),this._change(t),void 0)}}),this._initSource(),this.menu=t("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,this.element[0]!==t.ui.safeActiveElement(this.document[0])&&this.element.trigger("focus")})},menufocus:function(e,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",e,{item:n})&&e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&t.trim(s).length&&(this.liveRegion.children().hide(),t("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,i){var s=i.item.data("ui-autocomplete-item"),n=this.previous;this.element[0]!==t.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=n,this._delay(function(){this.previous=n,this.selectedItem=s})),!1!==this._trigger("select",e,{item:s})&&this._value(s.value),this.term=this._value(),this.close(e),this.selectedItem=s}}),this.liveRegion=t("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(e){var i=this.menu.element[0];return e.target===this.element[0]||e.target===i||t.contains(i,e.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){var e=this.term===this._value(),i=this.menu.element.is(":visible"),s=t.altKey||t.ctrlKey||t.metaKey||t.shiftKey;(!e||e&&!i&&!s)&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return t.proxy(function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")},this)},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({},e,{label:e.label||e.value,value:e.value||e.label})})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<div>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[t](e),void 0):(this.search(null,e),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=e&&e.length?this.options.messages.results(e.length):this.options.messages.noResults,this.liveRegion.children().hide(),t("<div>").text(i).appendTo(this.liveRegion))}}),t.ui.autocomplete;var g=/ui-corner-([a-z]){2,6}/g;t.widget("ui.controlgroup",{version:"1.12.1",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var e=this,i=[];t.each(this.options.items,function(s,n){var o,a={};return n?"controlgroupLabel"===s?(o=e.element.find(n),o.each(function(){var e=t(this);e.children(".ui-controlgroup-label-contents").length||e.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),e._addClass(o,null,"ui-widget ui-widget-content ui-state-default"),i=i.concat(o.get()),void 0):(t.fn[s]&&(a=e["_"+s+"Options"]?e["_"+s+"Options"]("middle"):{classes:{}},e.element.find(n).each(function(){var n=t(this),o=n[s]("instance"),r=t.widget.extend({},a);if("button"!==s||!n.parent(".ui-spinner").length){o||(o=n[s]()[s]("instance")),o&&(r.classes=e._resolveClassesValues(r.classes,o)),n[s](r);var h=n[s]("widget");t.data(h[0],"ui-controlgroup-data",o?o:n[s]("instance")),i.push(h[0])}})),void 0):void 0}),this.childWidgets=t(t.unique(i)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(e){this.childWidgets.each(function(){var i=t(this),s=i.data("ui-controlgroup-data");s&&s[e]&&s[e]()})},_updateCornerClass:function(t,e){var i="ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all",s=this._buildSimpleOptions(e,"label").classes.label;this._removeClass(t,null,i),this._addClass(t,null,s)},_buildSimpleOptions:function(t,e){var i="vertical"===this.options.direction,s={classes:{}};return s.classes[e]={middle:"",first:"ui-corner-"+(i?"top":"left"),last:"ui-corner-"+(i?"bottom":"right"),only:"ui-corner-all"}[t],s},_spinnerOptions:function(t){var e=this._buildSimpleOptions(t,"ui-spinner");return e.classes["ui-spinner-up"]="",e.classes["ui-spinner-down"]="",e},_buttonOptions:function(t){return this._buildSimpleOptions(t,"ui-button")},_checkboxradioOptions:function(t){return this._buildSimpleOptions(t,"ui-checkboxradio-label")},_selectmenuOptions:function(t){var e="vertical"===this.options.direction;return{width:e?"auto":!1,classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(e?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(e?"top":"left")},last:{"ui-selectmenu-button-open":e?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(e?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[t]}},_resolveClassesValues:function(e,i){var s={};return t.each(e,function(n){var o=i.options.classes[n]||"";o=t.trim(o.replace(g,"")),s[n]=(o+" "+e[n]).replace(/\s+/g," ")}),s},_setOption:function(t,e){return"direction"===t&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(t,e),"disabled"===t?(this._callChildMethod(e?"disable":"enable"),void 0):(this.refresh(),void 0)},refresh:function(){var e,i=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),"horizontal"===this.options.direction&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),e=this.childWidgets,this.options.onlyVisible&&(e=e.filter(":visible")),e.length&&(t.each(["first","last"],function(t,s){var n=e[s]().data("ui-controlgroup-data");if(n&&i["_"+n.widgetName+"Options"]){var o=i["_"+n.widgetName+"Options"](1===e.length?"only":s);o.classes=i._resolveClassesValues(o.classes,n),n.element[n.widgetName](o)}else i._updateCornerClass(e[s](),s)}),this._callChildMethod("refresh"))}}),t.widget("ui.checkboxradio",[t.ui.formResetMixin,{version:"1.12.1",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var e,i,s=this,n=this._super()||{};return this._readType(),i=this.element.labels(),this.label=t(i[i.length-1]),this.label.length||t.error("No label found for checkboxradio widget"),this.originalLabel="",this.label.contents().not(this.element[0]).each(function(){s.originalLabel+=3===this.nodeType?t(this).text():this.outerHTML}),this.originalLabel&&(n.label=this.originalLabel),e=this.element[0].disabled,null!=e&&(n.disabled=e),n},_create:function(){var t=this.element[0].checked;this._bindFormResetHandler(),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),"radio"===this.type&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),t&&(this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this.icon&&this._addClass(this.icon,null,"ui-state-hover")),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var e=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,"input"===e&&/radio|checkbox/.test(this.type)||t.error("Can't create checkboxradio on element.nodeName="+e+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var e,i=this.element[0].name,s="input[name='"+t.ui.escapeSelector(i)+"']";return i?(e=this.form.length?t(this.form[0].elements).filter(s):t(s).filter(function(){return 0===t(this).form().length}),e.not(this.element)):t([])},_toggleClasses:function(){var e=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",e),this.options.icon&&"checkbox"===this.type&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",e)._toggleClass(this.icon,null,"ui-icon-blank",!e),"radio"===this.type&&this._getRadioGroup().each(function(){var e=t(this).checkboxradio("instance");e&&e._removeClass(e.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(t,e){return"label"!==t||e?(this._super(t,e),"disabled"===t?(this._toggleClass(this.label,null,"ui-state-disabled",e),this.element[0].disabled=e,void 0):(this.refresh(),void 0)):void 0},_updateIcon:function(e){var i="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=t("<span>"),this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),"checkbox"===this.type?(i+=e?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,e?"ui-icon-blank":"ui-icon-check")):i+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",i),e||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):void 0!==this.icon&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)},_updateLabel:function(){var t=this.label.contents().not(this.element[0]);this.icon&&(t=t.not(this.icon[0])),this.iconSpace&&(t=t.not(this.iconSpace[0])),t.remove(),this.label.append(this.options.label)},refresh:function(){var t=this.element[0].checked,e=this.element[0].disabled;this._updateIcon(t),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),null!==this.options.label&&this._updateLabel(),e!==this.options.disabled&&this._setOptions({disabled:e})}}]),t.ui.checkboxradio,t.widget("ui.button",{version:"1.12.1",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var t,e=this._super()||{};return this.isInput=this.element.is("input"),t=this.element[0].disabled,null!=t&&(e.disabled=t),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(e.label=this.originalLabel),e},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(e){e.keyCode===t.ui.keyCode.SPACE&&(e.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),this.options.showLabel||this.title||this.element.attr("title",this.options.label)},_updateIcon:function(e,i){var s="iconPosition"!==e,n=s?this.options.iconPosition:i,o="top"===n||"bottom"===n;this.icon?s&&this._removeClass(this.icon,null,this.options.icon):(this.icon=t("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),s&&this._addClass(this.icon,null,i),this._attachIcon(n),o?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(n))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(t){this.icon[/^(?:end|bottom)/.test(t)?"before":"after"](this.iconSpace)},_attachIcon:function(t){this.element[/^(?:end|bottom)/.test(t)?"append":"prepend"](this.icon)},_setOptions:function(t){var e=void 0===t.showLabel?this.options.showLabel:t.showLabel,i=void 0===t.icon?this.options.icon:t.icon;e||i||(t.showLabel=!0),this._super(t)},_setOption:function(t,e){"icon"===t&&(e?this._updateIcon(t,e):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),"iconPosition"===t&&this._updateIcon(t,e),"showLabel"===t&&(this._toggleClass("ui-button-icon-only",null,!e),this._updateTooltip()),"label"===t&&(this.isInput?this.element.val(e):(this.element.html(e),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(t,e),"disabled"===t&&(this._toggleClass(null,"ui-state-disabled",e),this.element[0].disabled=e,e&&this.element.blur())},refresh:function(){var t=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOptions({disabled:t}),this._updateTooltip()}}),t.uiBackCompat!==!1&&(t.widget("ui.button",t.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),this.options.icon||!this.options.icons.primary&&!this.options.icons.secondary?this.options.icon&&(this.options.icons.primary=this.options.icon):this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"),this._super()},_setOption:function(t,e){return"text"===t?(this._super("showLabel",e),void 0):("showLabel"===t&&(this.options.text=e),"icon"===t&&(this.options.icons.primary=e),"icons"===t&&(e.primary?(this._super("icon",e.primary),this._super("iconPosition","beginning")):e.secondary&&(this._super("icon",e.secondary),this._super("iconPosition","end"))),this._superApply(arguments),void 0)}}),t.fn.button=function(e){return function(){return!this.length||this.length&&"INPUT"!==this[0].tagName||this.length&&"INPUT"===this[0].tagName&&"checkbox"!==this.attr("type")&&"radio"!==this.attr("type")?e.apply(this,arguments):(t.ui.checkboxradio||t.error("Checkboxradio widget missing"),0===arguments.length?this.checkboxradio({icon:!1}):this.checkboxradio.apply(this,arguments))}}(t.fn.button),t.fn.buttonset=function(){return t.ui.controlgroup||t.error("Controlgroup widget missing"),"option"===arguments[0]&&"items"===arguments[1]&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):"option"===arguments[0]&&"items"===arguments[1]?this.controlgroup.apply(this,[arguments[0],"items.button"]):("object"==typeof arguments[0]&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))}),t.ui.button,t.extend(t.ui,{datepicker:{version:"1.12.1"}});var m;t.extend(s.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return a(this._defaults,t||{}),this},_attachDatepicker:function(e,i){var s,n,o;s=e.nodeName.toLowerCase(),n="div"===s||"span"===s,e.id||(this.uuid+=1,e.id="dp"+this.uuid),o=this._newInst(t(e),n),o.settings=t.extend({},i||{}),"input"===s?this._connectDatepicker(e,o):n&&this._inlineDatepicker(e,o)},_newInst:function(e,i){var s=e[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?n(t("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(e,i){var s=t(e);i.append=t([]),i.trigger=t([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).on("keydown",this._doKeyDown).on("keypress",this._doKeyPress).on("keyup",this._doKeyUp),this._autoSize(i),t.data(e,"datepicker",i),i.settings.disabled&&this._disableDatepicker(e))},_attachments:function(e,i){var s,n,o,a=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),a&&(i.append=t("<span class='"+this._appendClass+"'>"+a+"</span>"),e[r?"before":"after"](i.append)),e.off("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&e.on("focus",this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),o=this._get(i,"buttonImage"),i.trigger=t(this._get(i,"buttonImageOnly")?t("<img/>").addClass(this._triggerClass).attr({src:o,alt:n,title:n}):t("<button type='button'></button>").addClass(this._triggerClass).html(o?t("<img/>").attr({src:o,alt:n,title:n}):n)),e[r?"before":"after"](i.trigger),i.trigger.on("click",function(){return t.datepicker._datepickerShowing&&t.datepicker._lastInput===e[0]?t.datepicker._hideDatepicker():t.datepicker._datepickerShowing&&t.datepicker._lastInput!==e[0]?(t.datepicker._hideDatepicker(),t.datepicker._showDatepicker(e[0])):t.datepicker._showDatepicker(e[0]),!1}))},_autoSize:function(t){if(this._get(t,"autoSize")&&!t.inline){var e,i,s,n,o=new Date(2009,11,20),a=this._get(t,"dateFormat");a.match(/[DM]/)&&(e=function(t){for(i=0,s=0,n=0;t.length>n;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length)}},_inlineDatepicker:function(e,i){var s=t(e);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),t.data(e,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(e),i.dpDiv.css("display","block"))},_dialogDatepicker:function(e,i,s,n,o){var r,h,l,c,u,d=this._dialogInst;return d||(this.uuid+=1,r="dp"+this.uuid,this._dialogInput=t("<input type='text' id='"+r+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.on("keydown",this._doKeyDown),t("body").append(this._dialogInput),d=this._dialogInst=this._newInst(this._dialogInput,!1),d.settings={},t.data(this._dialogInput[0],"datepicker",d)),a(d.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(d,i):i,this._dialogInput.val(i),this._pos=o?o.length?o:[o.pageX,o.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,c=document.documentElement.scrollLeft||document.body.scrollLeft,u=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+c,l/2-150+u]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),d.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),t.blockUI&&t.blockUI(this.dpDiv),t.data(this._dialogInput[0],"datepicker",d),this},_destroyDatepicker:function(e){var i,s=t(e),n=t.data(e,"datepicker");s.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),t.removeData(e,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).off("focus",this._showDatepicker).off("keydown",this._doKeyDown).off("keypress",this._doKeyPress).off("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty(),m===n&&(m=null))},_enableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;this._disabledInputs.length>e;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(e){try{return t.data(e,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(e,i,s){var n,o,r,h,l=this._getInst(e);return 2===arguments.length&&"string"==typeof i?"defaults"===i?t.extend({},t.datepicker._defaults):l?"all"===i?t.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),o=this._getDateDatepicker(e,!0),r=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),a(l.settings,n),null!==r&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,r)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(e):this._enableDatepicker(e)),this._attachments(t(e),l),this._autoSize(l),this._setDate(l,o),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){var e=this._getInst(t);e&&this._updateDatepicker(e)},_setDateDatepicker:function(t,e){var i=this._getInst(t);i&&(this._setDate(i,e),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(t,e){var i=this._getInst(t);return i&&!i.inline&&this._setDateFromField(i,e),i?this._getDate(i):null},_doKeyDown:function(e){var i,s,n,o=t.datepicker._getInst(e.target),a=!0,r=o.dpDiv.is(".ui-datepicker-rtl");if(o._keyEvent=!0,t.datepicker._datepickerShowing)switch(e.keyCode){case 9:t.datepicker._hideDatepicker(),a=!1;break;case 13:return n=t("td."+t.datepicker._dayOverClass+":not(."+t.datepicker._currentClass+")",o.dpDiv),n[0]&&t.datepicker._selectDay(e.target,o.selectedMonth,o.selectedYear,n[0]),i=t.datepicker._get(o,"onSelect"),i?(s=t.datepicker._formatDate(o),i.apply(o.input?o.input[0]:null,[s,o])):t.datepicker._hideDatepicker(),!1;case 27:t.datepicker._hideDatepicker();break;case 33:t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 34:t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 35:(e.ctrlKey||e.metaKey)&&t.datepicker._clearDate(e.target),a=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&t.datepicker._gotoToday(e.target),a=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?1:-1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,-7,"D"),a=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?-1:1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,7,"D"),a=e.ctrlKey||e.metaKey;break;default:a=!1}else 36===e.keyCode&&e.ctrlKey?t.datepicker._showDatepicker(this):a=!1;a&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(e){var i,s,n=t.datepicker._getInst(e.target);return t.datepicker._get(n,"constrainInput")?(i=t.datepicker._possibleChars(t.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),e.ctrlKey||e.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(e){var i,s=t.datepicker._getInst(e.target);if(s.input.val()!==s.lastVal)try{i=t.datepicker.parseDate(t.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,t.datepicker._getFormatConfig(s)),i&&(t.datepicker._setDateFromField(s),t.datepicker._updateAlternate(s),t.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(e){if(e=e.target||e,"input"!==e.nodeName.toLowerCase()&&(e=t("input",e.parentNode)[0]),!t.datepicker._isDisabledDatepicker(e)&&t.datepicker._lastInput!==e){var s,n,o,r,h,l,c;s=t.datepicker._getInst(e),t.datepicker._curInst&&t.datepicker._curInst!==s&&(t.datepicker._curInst.dpDiv.stop(!0,!0),s&&t.datepicker._datepickerShowing&&t.datepicker._hideDatepicker(t.datepicker._curInst.input[0])),n=t.datepicker._get(s,"beforeShow"),o=n?n.apply(e,[e,s]):{},o!==!1&&(a(s.settings,o),s.lastVal=null,t.datepicker._lastInput=e,t.datepicker._setDateFromField(s),t.datepicker._inDialog&&(e.value=""),t.datepicker._pos||(t.datepicker._pos=t.datepicker._findPos(e),t.datepicker._pos[1]+=e.offsetHeight),r=!1,t(e).parents().each(function(){return r|="fixed"===t(this).css("position"),!r}),h={left:t.datepicker._pos[0],top:t.datepicker._pos[1]},t.datepicker._pos=null,s.dpDiv.empty(),s.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),t.datepicker._updateDatepicker(s),h=t.datepicker._checkOffset(s,h,r),s.dpDiv.css({position:t.datepicker._inDialog&&t.blockUI?"static":r?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),s.inline||(l=t.datepicker._get(s,"showAnim"),c=t.datepicker._get(s,"duration"),s.dpDiv.css("z-index",i(t(e))+1),t.datepicker._datepickerShowing=!0,t.effects&&t.effects.effect[l]?s.dpDiv.show(l,t.datepicker._get(s,"showOptions"),c):s.dpDiv[l||"show"](l?c:null),t.datepicker._shouldFocusInput(s)&&s.input.trigger("focus"),t.datepicker._curInst=s))
+}},_updateDatepicker:function(e){this.maxRows=4,m=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e);var i,s=this._getNumberOfMonths(e),n=s[1],a=17,r=e.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&e.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),e.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e===t.datepicker._curInst&&t.datepicker._datepickerShowing&&t.datepicker._shouldFocusInput(e)&&e.input.trigger("focus"),e.yearshtml&&(i=e.yearshtml,setTimeout(function(){i===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),i=e.yearshtml=null},0))},_shouldFocusInput:function(t){return t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&!t.input.is(":focus")},_checkOffset:function(e,i,s){var n=e.dpDiv.outerWidth(),o=e.dpDiv.outerHeight(),a=e.input?e.input.outerWidth():0,r=e.input?e.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:t(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:t(document).scrollTop());return i.left-=this._get(e,"isRTL")?n-a:0,i.left-=s&&i.left===e.input.offset().left?t(document).scrollLeft():0,i.top-=s&&i.top===e.input.offset().top+r?t(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+o>l&&l>o?Math.abs(o+r):0),i},_findPos:function(e){for(var i,s=this._getInst(e),n=this._get(s,"isRTL");e&&("hidden"===e.type||1!==e.nodeType||t.expr.filters.hidden(e));)e=e[n?"previousSibling":"nextSibling"];return i=t(e).offset(),[i.left,i.top]},_hideDatepicker:function(e){var i,s,n,o,a=this._curInst;!a||e&&a!==t.data(e,"datepicker")||this._datepickerShowing&&(i=this._get(a,"showAnim"),s=this._get(a,"duration"),n=function(){t.datepicker._tidyDialog(a)},t.effects&&(t.effects.effect[i]||t.effects[i])?a.dpDiv.hide(i,t.datepicker._get(a,"showOptions"),s,n):a.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,o=this._get(a,"onClose"),o&&o.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),t.blockUI&&(t.unblockUI(),t("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).off(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(t.datepicker._curInst){var i=t(e.target),s=t.datepicker._getInst(i[0]);(i[0].id!==t.datepicker._mainDivId&&0===i.parents("#"+t.datepicker._mainDivId).length&&!i.hasClass(t.datepicker.markerClassName)&&!i.closest("."+t.datepicker._triggerClass).length&&t.datepicker._datepickerShowing&&(!t.datepicker._inDialog||!t.blockUI)||i.hasClass(t.datepicker.markerClassName)&&t.datepicker._curInst!==s)&&t.datepicker._hideDatepicker()}},_adjustDate:function(e,i,s){var n=t(e),o=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(o,i+("M"===s?this._get(o,"showCurrentAtPos"):0),s),this._updateDatepicker(o))},_gotoToday:function(e){var i,s=t(e),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(e,i,s){var n=t(e),o=this._getInst(n[0]);o["selected"+("M"===s?"Month":"Year")]=o["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(o),this._adjustDate(n)},_selectDay:function(e,i,s,n){var o,a=t(e);t(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(a[0])||(o=this._getInst(a[0]),o.selectedDay=o.currentDay=t("a",n).html(),o.selectedMonth=o.currentMonth=i,o.selectedYear=o.currentYear=s,this._selectDate(e,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear)))},_clearDate:function(e){var i=t(e);this._selectDate(i,"")},_selectDate:function(e,i){var s,n=t(e),o=this._getInst(n[0]);i=null!=i?i:this._formatDate(o),o.input&&o.input.val(i),this._updateAlternate(o),s=this._get(o,"onSelect"),s?s.apply(o.input?o.input[0]:null,[i,o]):o.input&&o.input.trigger("change"),o.inline?this._updateDatepicker(o):(this._hideDatepicker(),this._lastInput=o.input[0],"object"!=typeof o.input[0]&&o.input.trigger("focus"),this._lastInput=null)},_updateAlternate:function(e){var i,s,n,o=this._get(e,"altField");o&&(i=this._get(e,"altFormat")||this._get(e,"dateFormat"),s=this._getDate(e),n=this.formatDate(i,s,this._getFormatConfig(e)),t(o).val(n))},noWeekends:function(t){var e=t.getDay();return[e>0&&6>e,""]},iso8601Week:function(t){var e,i=new Date(t.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),e=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((e-i)/864e5)/7)+1},parseDate:function(e,i,s){if(null==e||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,o,a,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,c="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),u=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,d=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,g=-1,m=-1,_=-1,v=-1,b=!1,y=function(t){var i=e.length>n+1&&e.charAt(n+1)===t;return i&&n++,i},w=function(t){var e=y(t),s="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,n="y"===t?s:1,o=RegExp("^\\d{"+n+","+s+"}"),a=i.substring(h).match(o);if(!a)throw"Missing number at position "+h;return h+=a[0].length,parseInt(a[0],10)},k=function(e,s,n){var o=-1,a=t.map(y(e)?n:s,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(t.each(a,function(t,e){var s=e[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(o=e[0],h+=s.length,!1):void 0}),-1!==o)return o+1;throw"Unknown name at position "+h},x=function(){if(i.charAt(h)!==e.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;e.length>n;n++)if(b)"'"!==e.charAt(n)||y("'")?x():b=!1;else switch(e.charAt(n)){case"d":_=w("d");break;case"D":k("D",u,d);break;case"o":v=w("o");break;case"m":m=w("m");break;case"M":m=k("M",p,f);break;case"y":g=w("y");break;case"@":r=new Date(w("@")),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"!":r=new Date((w("!")-this._ticksTo1970)/1e4),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"'":y("'")?x():b=!0;break;default:x()}if(i.length>h&&(a=i.substr(h),!/^\s+/.test(a)))throw"Extra/unparsed characters found in date: "+a;if(-1===g?g=(new Date).getFullYear():100>g&&(g+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c>=g?0:-100)),v>-1)for(m=1,_=v;;){if(o=this._getDaysInMonth(g,m-1),o>=_)break;m++,_-=o}if(r=this._daylightSavingAdjust(new Date(g,m-1,_)),r.getFullYear()!==g||r.getMonth()+1!==m||r.getDate()!==_)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(t,e,i){if(!e)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,o=(i?i.dayNames:null)||this._defaults.dayNames,a=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(e){var i=t.length>s+1&&t.charAt(s+1)===e;return i&&s++,i},l=function(t,e,i){var s=""+e;if(h(t))for(;i>s.length;)s="0"+s;return s},c=function(t,e,i,s){return h(t)?s[e]:i[e]},u="",d=!1;if(e)for(s=0;t.length>s;s++)if(d)"'"!==t.charAt(s)||h("'")?u+=t.charAt(s):d=!1;else switch(t.charAt(s)){case"d":u+=l("d",e.getDate(),2);break;case"D":u+=c("D",e.getDay(),n,o);break;case"o":u+=l("o",Math.round((new Date(e.getFullYear(),e.getMonth(),e.getDate()).getTime()-new Date(e.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=l("m",e.getMonth()+1,2);break;case"M":u+=c("M",e.getMonth(),a,r);break;case"y":u+=h("y")?e.getFullYear():(10>e.getFullYear()%100?"0":"")+e.getFullYear()%100;break;case"@":u+=e.getTime();break;case"!":u+=1e4*e.getTime()+this._ticksTo1970;break;case"'":h("'")?u+="'":d=!0;break;default:u+=t.charAt(s)}return u},_possibleChars:function(t){var e,i="",s=!1,n=function(i){var s=t.length>e+1&&t.charAt(e+1)===i;return s&&e++,s};for(e=0;t.length>e;e++)if(s)"'"!==t.charAt(e)||n("'")?i+=t.charAt(e):s=!1;else switch(t.charAt(e)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=t.charAt(e)}return i},_get:function(t,e){return void 0!==t.settings[e]?t.settings[e]:this._defaults[e]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(r){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(e,i,s){var n=function(t){var e=new Date;return e.setDate(e.getDate()+t),e},o=function(i){try{return t.datepicker.parseDate(t.datepicker._get(e,"dateFormat"),i,t.datepicker._getFormatConfig(e))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?t.datepicker._getDate(e):null)||new Date,o=n.getFullYear(),a=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":a+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a));break;case"y":case"Y":o+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a))}l=h.exec(i)}return new Date(o,a,r)},a=null==i||""===i?s:"string"==typeof i?o(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return a=a&&"Invalid Date"==""+a?s:a,a&&(a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0)),this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(t){return t?(t.setHours(t.getHours()>12?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,a=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=a.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=a.getMonth(),t.drawYear=t.selectedYear=t.currentYear=a.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){var e=!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return e},_attachHandlers:function(e){var i=this._get(e,"stepMonths"),s="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){t.datepicker._adjustDate(s,-i,"M")},next:function(){t.datepicker._adjustDate(s,+i,"M")},hide:function(){t.datepicker._hideDatepicker()},today:function(){t.datepicker._gotoToday(s)},selectDay:function(){return t.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return t.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return t.datepicker._selectMonthYear(s,this,"Y"),!1}};t(this).on(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,h,l,c,u,d,p,f,g,m,_,v,b,y,w,k,x,C,D,I,T,P,M,S,H,z,O,A,N,W,E,F,L,R=new Date,B=this._daylightSavingAdjust(new Date(R.getFullYear(),R.getMonth(),R.getDate())),Y=this._get(t,"isRTL"),j=this._get(t,"showButtonPanel"),q=this._get(t,"hideIfNoPrevNext"),K=this._get(t,"navigationAsDateFormat"),U=this._getNumberOfMonths(t),V=this._get(t,"showCurrentAtPos"),$=this._get(t,"stepMonths"),X=1!==U[0]||1!==U[1],G=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),Q=this._getMinMaxDate(t,"min"),J=this._getMinMaxDate(t,"max"),Z=t.drawMonth-V,te=t.drawYear;if(0>Z&&(Z+=12,te--),J)for(e=this._daylightSavingAdjust(new Date(J.getFullYear(),J.getMonth()-U[0]*U[1]+1,J.getDate())),e=Q&&Q>e?Q:e;this._daylightSavingAdjust(new Date(te,Z,1))>e;)Z--,0>Z&&(Z=11,te--);for(t.drawMonth=Z,t.drawYear=te,i=this._get(t,"prevText"),i=K?this.formatDate(i,this._daylightSavingAdjust(new Date(te,Z-$,1)),this._getFormatConfig(t)):i,s=this._canAdjustMonth(t,-1,te,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":q?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(t,"nextText"),n=K?this.formatDate(n,this._daylightSavingAdjust(new Date(te,Z+$,1)),this._getFormatConfig(t)):n,o=this._canAdjustMonth(t,1,te,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":q?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",a=this._get(t,"currentText"),r=this._get(t,"gotoCurrent")&&t.currentDay?G:B,a=K?this.formatDate(a,r,this._getFormatConfig(t)):a,h=t.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(t,"closeText")+"</button>",l=j?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(t,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+a+"</button>":"")+(Y?"":h)+"</div>":"",c=parseInt(this._get(t,"firstDay"),10),c=isNaN(c)?0:c,u=this._get(t,"showWeek"),d=this._get(t,"dayNames"),p=this._get(t,"dayNamesMin"),f=this._get(t,"monthNames"),g=this._get(t,"monthNamesShort"),m=this._get(t,"beforeShowDay"),_=this._get(t,"showOtherMonths"),v=this._get(t,"selectOtherMonths"),b=this._getDefaultDate(t),y="",k=0;U[0]>k;k++){for(x="",this.maxRows=4,C=0;U[1]>C;C++){if(D=this._daylightSavingAdjust(new Date(te,Z,t.selectedDay)),I=" ui-corner-all",T="",X){if(T+="<div class='ui-datepicker-group",U[1]>1)switch(C){case 0:T+=" ui-datepicker-group-first",I=" ui-corner-"+(Y?"right":"left");break;case U[1]-1:T+=" ui-datepicker-group-last",I=" ui-corner-"+(Y?"left":"right");break;default:T+=" ui-datepicker-group-middle",I=""}T+="'>"}for(T+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+I+"'>"+(/all|left/.test(I)&&0===k?Y?o:s:"")+(/all|right/.test(I)&&0===k?Y?s:o:"")+this._generateMonthYearHeader(t,Z,te,Q,J,k>0||C>0,f,g)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",P=u?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",w=0;7>w;w++)M=(w+c)%7,P+="<th scope='col'"+((w+c+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+d[M]+"'>"+p[M]+"</span></th>";for(T+=P+"</tr></thead><tbody>",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),H=(this._getFirstDayOfMonth(te,Z)-c+7)%7,z=Math.ceil((H+S)/7),O=X?this.maxRows>z?this.maxRows:z:z,this.maxRows=O,A=this._daylightSavingAdjust(new Date(te,Z,1-H)),N=0;O>N;N++){for(T+="<tr>",W=u?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(A)+"</td>":"",w=0;7>w;w++)E=m?m.apply(t.input?t.input[0]:null,[A]):[!0,""],F=A.getMonth()!==Z,L=F&&!v||!E[0]||Q&&Q>A||J&&A>J,W+="<td class='"+((w+c+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(A.getTime()===D.getTime()&&Z===t.selectedMonth&&t._keyEvent||b.getTime()===A.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!_?"":" "+E[1]+(A.getTime()===G.getTime()?" "+this._currentClass:"")+(A.getTime()===B.getTime()?" ui-datepicker-today":""))+"'"+(F&&!_||!E[2]?"":" title='"+E[2].replace(/'/g,"&#39;")+"'")+(L?"":" data-handler='selectDay' data-event='click' data-month='"+A.getMonth()+"' data-year='"+A.getFullYear()+"'")+">"+(F&&!_?"&#xa0;":L?"<span class='ui-state-default'>"+A.getDate()+"</span>":"<a class='ui-state-default"+(A.getTime()===B.getTime()?" ui-state-highlight":"")+(A.getTime()===G.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+A.getDate()+"</a>")+"</td>",A.setDate(A.getDate()+1),A=this._daylightSavingAdjust(A);T+=W+"</tr>"}Z++,Z>11&&(Z=0,te++),T+="</tbody></table>"+(X?"</div>"+(U[0]>0&&C===U[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=T}y+=x}return y+=l,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var h,l,c,u,d,p,f,g,m=this._get(t,"changeMonth"),_=this._get(t,"changeYear"),v=this._get(t,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",y="";if(o||!m)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",c=0;12>c;c++)(!h||c>=s.getMonth())&&(!l||n.getMonth()>=c)&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(v||(b+=y+(!o&&m&&_?"":"&#xa0;")),!t.yearshtml)if(t.yearshtml="",o||!_)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";g>=f;f++)t.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),v&&(b+=(!o&&m&&_?"":"&#xa0;")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.selectedYear+("Y"===i?e:0),n=t.selectedMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,h=this._get(t,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).on("mousedown",t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new s,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.12.1",t.datepicker,t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var _=!1;t(document).on("mouseup",function(){_=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!_){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,s=1===e.which,n="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),_=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,_=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.ui.safeBlur=function(e){e&&"body"!==e.nodeName.toLowerCase()&&t(e).trigger("blur")},t.widget("ui.draggable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(this._blurActiveElement(e),this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(e){this.iframeBlocks=this.document.find(e).map(function(){var e=t(this);return t("<div>").css("position","absolute").appendTo(e.parent()).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(e){var i=t.ui.safeActiveElement(this.document[0]),s=t(e.target);s.closest(i).length||t.ui.safeBlur(i)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===t(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(e),this.originalPosition=this.position=this._generatePosition(e,!1),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(e,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp(new t.Event("mouseup",e)),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1},_mouseUp:function(e){return this._unblockFrames(),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),this.handleElement.is(e.target)&&this.element.trigger("focus"),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new t.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper),n=s?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var e=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}
+},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),h=t.pageX,l=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,h=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(h=this.originalPageX),"x"===a.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,h,l,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)h=s.snapElements[d].left-s.margins.left,l=h+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,h-g>_||m>l+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(h-_),r=g>=Math.abs(l-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(h-m),r=g>=Math.abs(l-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,h=this._change[o];return this._updatePrevProperties(),h?(i=h.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,h=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,h=this.originalPosition.top+this.originalSize.height,l=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&l&&(t.left=r-e.minWidth),s&&l&&(t.left=r-e.maxWidth),a&&c&&(t.top=h-e.minHeight),n&&c&&(t.top=h-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,h=t(this).resizable("instance"),l=h.options,c=h.element,u=l.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(h.containerElement=t(d),/document/.test(u)||u===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=h._num(e.css("padding"+s))}),h.containerOffset=e.offset(),h.containerPosition=e.position(),h.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,o=h.containerSize.width,a=h._hasScroll(d,"left")?d.scrollWidth:o,r=h._hasScroll(d)?d.scrollHeight:n,h.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?h.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-h.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-h.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,c=h[1]||1,u=Math.round((n.width-o.width)/l)*l,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=h,_&&(p+=l),v&&(f+=c),g&&(p-=l),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-l)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-l>0?(i.size.width=p,i.position.left=a.left-u):(p=l-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog
+},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||t.ui.safeBlur(t.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+t(this).css("z-index")}).get(),o=Math.max.apply(null,n);return o>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",o+1),s=!0),s&&!i&&this._trigger("focus",e),s},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=t(t.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var t=this._focusedElement;t||(t=this.element.find("[autofocus]")),t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).trigger("focus")},_keepFocus:function(e){function i(){var e=t.ui.safeActiveElement(this.document[0]),i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),void 0;if(e.keyCode===t.ui.keyCode.TAB&&!e.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(this._delay(function(){n.trigger("focus")}),e.preventDefault()):(this._delay(function(){s.trigger("focus")}),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=t("<button type='button'></button>").button({label:t("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(e,"ui-dialog-title"),this._title(e),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this._removeClass(this.uiDialog,"ui-dialog-buttons"),void 0):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,o={icon:s.icon,iconPosition:s.iconPosition,showLabel:s.showLabel,icons:s.icons,text:s.text},delete s.click,delete s.icon,delete s.iconPosition,delete s.showLabel,delete s.icons,"boolean"==typeof s.text&&delete s.text,t("<button></button>",s).button(o).appendTo(e.uiButtonSet).on("click",function(){n.apply(e.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){i._addClass(t(this),"ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){var a=o.offset.left-i.document.scrollLeft(),r=o.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" "+"top"+(r>=0?"+":"")+r,of:i.window},i._removeClass(t(this),"ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){i._addClass(t(this),"ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){var a=i.uiDialog.offset(),r=a.left-i.document.scrollLeft(),h=a.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},i._removeClass(t(this),"ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_trackFocus:function(){this._on(this.widget(),{focusin:function(e){this._makeFocusTarget(),this._focusedElement=t(e.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var e=this._trackingInstances(),i=t.inArray(this,e);-1!==i&&e.splice(i,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||(t=[],this.document.data("ui-dialog-instances",t)),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(e){var i=this,s=!1,n={};t.each(e,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,i){var s,n,o=this.uiDialog;"disabled"!==e&&(this._super(e,i),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:t("<a>").text(""+this.options.closeText).html()}),"draggable"===e&&(s=o.is(":data(ui-draggable)"),s&&!i&&o.draggable("destroy"),!s&&i&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(n=o.is(":data(ui-resizable)"),n&&!i&&o.resizable("destroy"),n&&"string"==typeof i&&o.resizable("option","handles",i),n||i===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=!0;this._delay(function(){e=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(t){e||this._allowInteraction(t)||(t.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=t("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var t=this.document.data("ui-dialog-overlays")-1;t?this.document.data("ui-dialog-overlays",t):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}}),t.ui.dialog,t.widget("ui.droppable",{version:"1.12.1",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],void 0):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this._addClass("ui-droppable")},_addToManager:function(e){t.ui.ddmanager.droppables[e]=t.ui.ddmanager.droppables[e]||[],t.ui.ddmanager.droppables[e].push(this)},_splice:function(t){for(var e=0;t.length>e;e++)t[e]===this&&t.splice(e,1)},_destroy:function(){var e=t.ui.ddmanager.droppables[this.options.scope];this._splice(e)},_setOption:function(e,i){if("accept"===e)this.accept=t.isFunction(i)?i:function(t){return t.is(i)};else if("scope"===e){var s=t.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(e,i)},_activate:function(e){var i=t.ui.ddmanager.current;this._addActiveClass(),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this._removeActiveClass(),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._addHoverClass(),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._removeHoverClass(),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=t(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&v(s,t.extend(i,{offset:i.element.offset()}),i.options.tolerance,e)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}});var v=t.ui.intersect=function(){function t(t,e,i){return t>=e&&e+i>t}return function(e,i,s,n){if(!i.offset)return!1;var o=(e.positionAbs||e.position.absolute).left+e.margins.left,a=(e.positionAbs||e.position.absolute).top+e.margins.top,r=o+e.helperProportions.width,h=a+e.helperProportions.height,l=i.offset.left,c=i.offset.top,u=l+i.proportions().width,d=c+i.proportions().height;switch(s){case"fit":return o>=l&&u>=r&&a>=c&&d>=h;case"intersect":return o+e.helperProportions.width/2>l&&u>r-e.helperProportions.width/2&&a+e.helperProportions.height/2>c&&d>h-e.helperProportions.height/2;case"pointer":return t(n.pageY,c,i.proportions().height)&&t(n.pageX,l,i.proportions().width);case"touch":return(a>=c&&d>=a||h>=c&&d>=h||c>a&&h>d)&&(o>=l&&u>=o||r>=l&&u>=r||l>o&&r>u);default:return!1}}}();t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&v(e,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").on("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=v(e,this,this.options.tolerance,i),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t(this).droppable("instance").options.scope===n}),o.length&&(s=t(o[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").off("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}},t.uiBackCompat!==!1&&t.widget("ui.droppable",t.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),t.ui.droppable,t.widget("ui.progressbar",{version:"1.12.1",options:{classes:{"ui-progressbar":"ui-corner-all","ui-progressbar-value":"ui-corner-left","ui-progressbar-complete":"ui-corner-right"},max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.attr({role:"progressbar","aria-valuemin":this.min}),this._addClass("ui-progressbar","ui-widget ui-widget-content"),this.valueDiv=t("<div>").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(t){return void 0===t?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),void 0)},_constrainedValue:function(t){return void 0===t&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).width(i.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,e===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div>").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}}),t.widget("ui.selectable",t.ui.mouse,{version:"1.12.1",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e.elementPos=t(e.element[0]).offset(),e.selectees=t(e.options.filter,e.element[0]),e._addClass(e.selectees,"ui-selectee"),e.selectees.each(function(){var i=t(this),s=i.offset(),n={left:s.left-e.elementPos.left,top:s.top-e.elementPos.top};t.data(this,"selectable-item",{element:this,$element:i,left:n.left,top:n.top,right:n.left+i.outerWidth(),bottom:n.top+i.outerHeight(),startselected:!1,selected:i.hasClass("ui-selected"),selecting:i.hasClass("ui-selecting"),unselecting:i.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=t("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.elementPos=t(this.element[0]).offset(),this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(i._removeClass(s.$element,"ui-selected"),s.selected=!1,i._addClass(s.$element,"ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),i._removeClass(n.$element,s?"ui-unselecting":"ui-selected")._addClass(n.$element,s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,h=e.pageY;return o>r&&(i=r,r=o,o=i),a>h&&(i=h,h=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:h-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),l=!1,c={};i&&i.element!==s.element[0]&&(c.left=i.left+s.elementPos.left,c.right=i.right+s.elementPos.left,c.top=i.top+s.elementPos.top,c.bottom=i.bottom+s.elementPos.top,"touch"===n.tolerance?l=!(c.left>r||o>c.right||c.top>h||a>c.bottom):"fit"===n.tolerance&&(l=c.left>o&&r>c.right&&c.top>a&&h>c.bottom),l?(i.selected&&(s._removeClass(i.$element,"ui-selected"),i.selected=!1),i.unselecting&&(s._removeClass(i.$element,"ui-unselecting"),i.unselecting=!1),i.selecting||(s._addClass(i.$element,"ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,s._addClass(i.$element,"ui-selected"),i.selected=!0):(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,i.startselected&&(s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(s._removeClass(i.$element,"ui-selected"),i.selected=!1,s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-selecting")._addClass(s.$element,"ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}}),t.widget("ui.selectmenu",[t.ui.formResetMixin,{version:"1.12.1",defaultElement:"<select>",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=t()},_drawButton:function(){var e,i=this,s=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(t){this.button.focus(),t.preventDefault()}}),this.element.hide(),this.button=t("<span>",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),e=t("<span>").appendTo(this.button),this._addClass(e,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(s).appendTo(this.button),this.options.width!==!1&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){i._rendered||i._refreshMenu()})},_drawMenu:function(){var e=this;this.menu=t("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=t("<div>").append(this.menu),this._addClass(this.menuWrap,"ui-selectmenu-menu","ui-front"),this.menuWrap.appendTo(this._appendTo()),this.menuInstance=this.menu.menu({classes:{"ui-menu":"ui-corner-bottom"},role:"listbox",select:function(t,i){t.preventDefault(),e._setSelection(),e._select(i.item.data("ui-selectmenu-item"),t)},focus:function(t,i){var s=i.item.data("ui-selectmenu-item");null!=e.focusIndex&&s.index!==e.focusIndex&&(e._trigger("focus",t,{item:s}),e.isOpen||e._select(s,t)),e.focusIndex=s.index,e.button.attr("aria-activedescendant",e.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(this._getSelectedItem().data("ui-selectmenu-item")||{})),null===this.options.width&&this._resizeButton()},_refreshMenu:function(){var t,e=this.element.find("option");this.menu.empty(),this._parseOptions(e),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup").find(".ui-menu-item-wrapper"),this._rendered=!0,e.length&&(t=this._getSelectedItem(),this.menuInstance.focus(null,t),this._setAria(t.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(t){this.options.disabled||(this._rendered?(this._removeClass(this.menu.find(".ui-state-active"),null,"ui-state-active"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.menuItems.length&&(this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",t)))},_position:function(){this.menuWrap.position(t.extend({of:this.button},this.options.position))},close:function(t){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",t))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderButtonItem:function(e){var i=t("<span>");return this._setText(i,e.label),this._addClass(i,"ui-selectmenu-text"),i},_renderMenu:function(e,i){var s=this,n="";t.each(i,function(i,o){var a;o.optgroup!==n&&(a=t("<li>",{text:o.optgroup}),s._addClass(a,"ui-selectmenu-optgroup","ui-menu-divider"+(o.element.parent("optgroup").prop("disabled")?" ui-state-disabled":"")),a.appendTo(e),n=o.optgroup),s._renderItemData(e,o)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-selectmenu-item",e)},_renderItem:function(e,i){var s=t("<li>"),n=t("<div>",{title:i.element.attr("title")});return i.disabled&&this._addClass(s,null,"ui-state-disabled"),this._setText(n,i.label),s.append(n).appendTo(e)},_setText:function(t,e){e?t.text(e):t.html("&#160;")},_move:function(t,e){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex).parent("li"):(i=this.menuItems.eq(this.element[0].selectedIndex).parent("li"),n+=":not(.ui-state-disabled)"),s="first"===t||"last"===t?i["first"===t?"prevAll":"nextAll"](n).eq(-1):i[t+"All"](n).eq(0),s.length&&this.menuInstance.focus(e,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex).parent("li")},_toggle:function(t){this[this.isOpen?"close":"open"](t)},_setSelection:function(){var t;this.range&&(window.getSelection?(t=window.getSelection(),t.removeAllRanges(),t.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(e){this.isOpen&&(t(e.target).closest(".ui-selectmenu-menu, #"+t.ui.escapeSelector(this.ids.button)).length||this.close(e))}},_buttonEvents:{mousedown:function(){var t;window.getSelection?(t=window.getSelection(),t.rangeCount&&(this.range=t.getRangeAt(0))):this.range=document.selection.createRange()},click:function(t){this._setSelection(),this._toggle(t)},keydown:function(e){var i=!0;switch(e.keyCode){case t.ui.keyCode.TAB:case t.ui.keyCode.ESCAPE:this.close(e),i=!1;break;case t.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(e);break;case t.ui.keyCode.UP:e.altKey?this._toggle(e):this._move("prev",e);break;case t.ui.keyCode.DOWN:e.altKey?this._toggle(e):this._move("next",e);break;case t.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(e):this._toggle(e);break;case t.ui.keyCode.LEFT:this._move("prev",e);break;case t.ui.keyCode.RIGHT:this._move("next",e);break;case t.ui.keyCode.HOME:case t.ui.keyCode.PAGE_UP:this._move("first",e);break;case t.ui.keyCode.END:case t.ui.keyCode.PAGE_DOWN:this._move("last",e);break;default:this.menu.trigger(e),i=!1}i&&e.preventDefault()}},_selectFocusedItem:function(t){var e=this.menuItems.eq(this.focusIndex).parent("li");e.hasClass("ui-state-disabled")||this._select(e.data("ui-selectmenu-item"),t)},_select:function(t,e){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=t.index,this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(t)),this._setAria(t),this._trigger("select",e,{item:t}),t.index!==i&&this._trigger("change",e,{item:t}),this.close(e)},_setAria:function(t){var e=this.menuItems.eq(t.index).attr("id");this.button.attr({"aria-labelledby":e,"aria-activedescendant":e}),this.menu.attr("aria-activedescendant",e)},_setOption:function(t,e){if("icons"===t){var i=this.button.find("span.ui-icon");this._removeClass(i,null,this.options.icons.button)._addClass(i,null,e.button)}this._super(t,e),"appendTo"===t&&this.menuWrap.appendTo(this._appendTo()),"width"===t&&this._resizeButton()},_setOptionDisabled:function(t){this._super(t),this.menuInstance.option("disabled",t),this.button.attr("aria-disabled",t),this._toggleClass(this.button,null,"ui-state-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_toggleAttr:function(){this.button.attr("aria-expanded",this.isOpen),this._removeClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"closed":"open"))._addClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"open":"closed"))._toggleClass(this.menuWrap,"ui-selectmenu-open",null,this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var t=this.options.width;return t===!1?(this.button.css("width",""),void 0):(null===t&&(t=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(t),void 0)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){var t=this._super();return t.disabled=this.element.prop("disabled"),t},_parseOptions:function(e){var i=this,s=[];e.each(function(e,n){s.push(i._parseOption(t(n),e))}),this.items=s},_parseOption:function(t,e){var i=t.parent("optgroup");return{element:t,index:e,value:t.val(),label:t.text(),optgroup:i.attr("label")||"",disabled:i.prop("disabled")||t.prop("disabled")}},_destroy:function(){this._unbindFormResetHandler(),this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.labels.attr("for",this.ids.element)}}]),t.widget("ui.slider",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1
+},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle"),o="<span tabindex='0'></span>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e).attr("tabIndex",0)})},_createRange:function(){var e=this.options;e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})):(this.range=t("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")),("min"===e.range||"max"===e.range)&&this._addClass(this.range,"ui-slider-range-"+e.range)):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,h,l,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,this._addClass(o,null,"ui-state-active"),o.trigger("focus"),h=o.offset(),l=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:e.pageX-h.left-o.width()/2,top:e.pageY-h.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_uiHash:function(t,e,i){var s={handle:this.handles[t],handleIndex:t,value:void 0!==e?e:this.value()};return this._hasMultipleValues()&&(s.value=void 0!==e?e:this.values(t),s.values=i||this.values()),s},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(t,e){return this._trigger("start",t,this._uiHash(e))},_slide:function(t,e,i){var s,n,o=this.value(),a=this.values();this._hasMultipleValues()&&(n=this.values(e?0:1),o=this.values(e),2===this.options.values.length&&this.options.range===!0&&(i=0===e?Math.min(n,i):Math.max(n,i)),a[e]=i),i!==o&&(s=this._trigger("slide",t,this._uiHash(e,i,a)),s!==!1&&(this._hasMultipleValues()?this.values(e,i):this.value(i)))},_stop:function(t,e){this._trigger("stop",t,this._uiHash(e))},_change:function(t,e){this._keySliding||this._mouseSliding||(this._lastChangedValue=e,this._trigger("change",t,this._uiHash(e)))},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),void 0;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this._hasMultipleValues()?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),this._super(e,i),e){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(i),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=n-1;s>=0;s--)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_setOptionDisabled:function(t){this._super(t),this._toggleClass(null,"ui-state-disabled",!!t)},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this._hasMultipleValues()){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var t=this.options.max,e=this._valueMin(),i=this.options.step,s=Math.round((t-e)/i)*i;t=s+e,t>this.options.max&&(t-=i),this.max=parseFloat(t.toFixed(this._precision()))},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(t){"vertical"===t&&this.range.css({width:"",left:""}),"horizontal"===t&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,c={};this._hasMultipleValues()?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),c["horizontal"===h.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[l?"animate":"css"](c,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:100-i+"%"},r.animate),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:100-i+"%"},r.animate))},_handleEvents:{keydown:function(e){var i,s,n,o,a=t(e.target).data("ui-slider-handle-index");switch(e.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(e.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(t(e.target),null,"ui-state-active"),i=this._start(e,a),i===!1))return}switch(o=this.options.step,s=n=this._hasMultipleValues()?this.values(a):this.value(),e.keyCode){case t.ui.keyCode.HOME:n=this._valueMin();break;case t.ui.keyCode.END:n=this._valueMax();break;case t.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+o);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-o)}this._slide(e,a,n)},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),this._removeClass(t(e.target),null,"ui-state-active"))}}}),t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],h=[],l=this._connectWith();if(l&&e)for(s=l.length-1;s>=0;s--)for(o=t(l[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&h.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(h.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td>&#160;</td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,h,l,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[a],l=!1,e[u]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(e[u]-h)&&(n=Math.abs(e[u]-h),o=this.items[s],this.direction=l?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;
+this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}}),t.widget("ui.spinner",{version:"1.12.1",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e=this._super(),i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);null!=n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var e=this.element[0]===t.ui.safeActiveElement(this.document[0]);e||(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===t.ui.safeActiveElement(this.document[0])?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(.5*this.uiSpinner.height())&&this.uiSpinner.height()>0&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){var i,s,n;return"culture"===t||"numberFormat"===t?(i=this._parse(this.element.val()),this.options[t]=e,this.element.val(this._format(i)),void 0):(("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(s=this.buttons.first().find(".ui-icon"),this._removeClass(s,null,this.options.icons.up),this._addClass(s,null,e.up),n=this.buttons.last().find(".ui-icon"),this._removeClass(n,null,this.options.icons.down),this._addClass(n,null,e.down)),this._super(t,e),void 0)},_setOptionDisabled:function(t){this._super(t),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable")},_setOptions:r(function(t){this._super(t)}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var t=this.value();return null===t?!1:t===this._adjustValue(t)},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:r(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:r(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:r(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:r(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(r(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),t.uiBackCompat!==!1&&t.widget("ui.spinner",t.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}}),t.ui.spinner,t.widget("ui.tabs",{version:"1.12.1",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var t=/#.*$/;return function(e){var i,s;i=e.href.replace(t,""),s=location.href.replace(t,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return e.hash.length>1&&i===s}}(),_create:function(){var e=this,i=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,i.collapsible),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var e=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===e&&(s&&this.tabs.each(function(i,n){return t(n).attr("aria-controls")===s?(e=i,!1):void 0}),null===e&&(e=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===e||-1===e)&&(e=this.tabs.length?0:!1)),e!==!1&&(e=this.tabs.index(this.tabs.eq(e)),-1===e&&(e=i?!1:0)),!i&&e===!1&&this.anchors.length&&(e=0),e},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(e){var i=t(t.ui.safeActiveElement(this.document[0])).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(e)){switch(e.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:s++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:n=!1,s--;break;case t.ui.keyCode.END:s=this.anchors.length-1;break;case t.ui.keyCode.HOME:s=0;break;case t.ui.keyCode.SPACE:return e.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case t.ui.keyCode.ENTER:return e.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}e.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),e.ctrlKey||e.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(e){return e.altKey&&e.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):e.altKey&&e.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).trigger("focus"),t},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):(this._super(t,e),"collapsible"===t&&(this._toggleClass("ui-tabs-collapsible",null,e),e||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(e),"heightStyle"===t&&this._setupHeightStyle(e),void 0)},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).attr({role:"presentation",tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=t(),this.anchors.each(function(i,s){var n,o,a,r=t(s).uniqueId().attr("id"),h=t(s).closest("li"),l=h.attr("aria-controls");e._isLocal(s)?(n=s.hash,a=n.substring(1),o=e.element.find(e._sanitizeSelector(n))):(a=h.attr("aria-controls")||t({}).uniqueId()[0].id,n="#"+a,o=e.element.find(n),o.length||(o=e._createPanel(a),o.insertAfter(e.panels[i-1]||e.tablist)),o.attr("aria-live","polite")),o.length&&(e.panels=e.panels.add(o)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":a,"aria-labelledby":r}),o.attr("aria-labelledby",r)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(e){var i,s,n;for(t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1),n=0;s=this.tabs[n];n++)i=t(s),e===!0||-1!==t.inArray(n,e)?(i.attr("aria-disabled","true"),this._addClass(i,null,"ui-state-disabled")):(i.removeAttr("aria-disabled"),this._removeClass(i,null,"ui-state-disabled"));this.options.disabled=e,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,e===!0)},_setupEvents:function(e){var i={};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(t){t.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){o._addClass(i.newTab.closest("li"),"ui-tabs-active","ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){o._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),n()}):(this._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+t.ui.escapeSelector(e)+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(e){var i=this.options.disabled;i!==!1&&(void 0===e?i=!1:(e=this._getIndex(e),i=t.isArray(i)?t.map(i,function(t){return t!==e?t:null}):t.map(this.tabs,function(t,i){return i!==e?i:null})),this._setOptionDisabled(i))},disable:function(e){var i=this.options.disabled;if(i!==!0){if(void 0===e)i=!0;else{if(e=this._getIndex(e),-1!==t.inArray(e,i))return;i=t.isArray(i)?t.merge([e],i).sort():[e]}this._setOptionDisabled(i)}},load:function(e,i){e=this._getIndex(e);var s=this,n=this.tabs.eq(e),o=n.find(".ui-tabs-anchor"),a=this._getPanelForTab(n),r={tab:n,panel:a},h=function(t,e){"abort"===e&&s.panels.stop(!1,!0),s._removeClass(n,"ui-tabs-loading"),a.removeAttr("aria-busy"),t===s.xhr&&delete s.xhr};this._isLocal(o[0])||(this.xhr=t.ajax(this._ajaxSettings(o,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(this._addClass(n,"ui-tabs-loading"),a.attr("aria-busy","true"),this.xhr.done(function(t,e,n){setTimeout(function(){a.html(t),s._trigger("load",i,r),h(n,e)},1)}).fail(function(t,e){setTimeout(function(){h(t,e)},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href").replace(/#.*$/,""),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),t.uiBackCompat!==!1&&t.widget("ui.tabs",t.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}}),t.ui.tabs,t.widget("ui.tooltip",{version:"1.12.1",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))},_removeDescribedBy:function(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=t("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=t([])},_setOption:function(e,i){var s=this;this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e.element)})},_setOptionDisabled:function(t){this[t?"_disable":"_enable"]()},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s.element[0],e.close(n,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var e=t(this);return e.is("[title]")?e.data("ui-tooltip-title",e.attr("title")).removeAttr("title"):void 0}))},_enable:function(){this.disabledTitles.each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))}),this.disabledTitles=t([])},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(e,s),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s||s.nodeType||s.jquery?this._open(e,t,s):(i=s.call(t[0],function(i){n._delay(function(){t.data("ui-tooltip-open")&&(e&&(e.type=o),this._open(e,t,i))})}),i&&this._open(e,t,i),void 0)},_open:function(e,i,s){function n(t){l.of=t,a.is(":hidden")||a.position(l)}var o,a,r,h,l=t.extend({},this.options.position);if(s){if(o=this._find(i))return o.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(e&&"mouseover"===e.type?i.attr("title",""):i.removeAttr("title")),o=this._tooltip(i),a=o.tooltip,this._addDescribedBy(i,a.attr("id")),a.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),h=t("<div>").html(a.find(".ui-tooltip-content").html()),h.removeAttr("name").find("[name]").removeAttr("name"),h.removeAttr("id").find("[id]").removeAttr("id"),h.appendTo(this.liveRegion),this.options.track&&e&&/^mouse/.test(e.type)?(this._on(this.document,{mousemove:n}),n(e)):a.position(t.extend({of:i},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){a.is(":visible")&&(n(l.of),clearInterval(r))},t.fx.interval)),this._trigger("open",e,{tooltip:a})}},_registerCloseHandlers:function(e,i){var s={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var s=t.Event(e);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),e&&"mouseover"!==e.type||(s.mouseleave="close"),e&&"focusin"!==e.type||(s.focusout="close"),this._on(!0,i,s)},close:function(e){var i,s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);return o?(i=o.tooltip,o.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),o.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),o.closing=!0,this._trigger("close",e,{tooltip:i}),o.hiding||(o.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(e){var i=t("<div>").attr("role","tooltip"),s=t("<div>").appendTo(i),n=i.uniqueId().attr("id");return this._addClass(s,"ui-tooltip-content"),this._addClass(i,"ui-tooltip","ui-widget ui-widget-content"),i.appendTo(this._appendTo(e)),this.tooltips[n]={element:e,tooltip:i}},_find:function(t){var e=t.data("ui-tooltip-id");return e?this.tooltips[e]:null},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_appendTo:function(t){var e=t.closest(".ui-front, dialog");return e.length||(e=this.document[0].body),e},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur"),o=s.element;n.target=n.currentTarget=o[0],e.close(n,!0),t("#"+i).remove(),o.data("ui-tooltip-title")&&(o.attr("title")||o.attr("title",o.data("ui-tooltip-title")),o.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),t.uiBackCompat!==!1&&t.widget("ui.tooltip",t.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var t=this._superApply(arguments);return this.options.tooltipClass&&t.tooltip.addClass(this.options.tooltipClass),t}}),t.ui.tooltip});
\ No newline at end of file
diff --git a/src_old/resources/scripts/jquery-ui-1.8.10.custom.min.js b/src_old/resources/scripts/jquery-ui-1.8.10.custom.min.js
new file mode 100644
index 0000000..a7e1293
--- /dev/null
+++ b/src_old/resources/scripts/jquery-ui-1.8.10.custom.min.js
@@ -0,0 +1,233 @@
+/*!
+ * jQuery UI 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(c,j){function k(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.10",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,
+NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,
+"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");
+if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,l,m){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(l)g-=parseFloat(c.curCSS(f,
+"border"+this+"Width",true))||0;if(m)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,
+d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){var b=a.nodeName.toLowerCase(),d=c.attr(a,"tabindex");if("area"===b){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&k(a)}return(/input|select|textarea|button|object/.test(b)?!a.disabled:"a"==b?a.href||!isNaN(d):!isNaN(d))&&k(a)},tabbable:function(a){var b=c.attr(a,"tabindex");return(isNaN(b)||b>=0)&&c(a).is(":focusable")}});
+c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&
+b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
+;/*!
+ * jQuery UI Widget 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
+a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h;
+e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,
+this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
+widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},
+enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
+;/*!
+ * jQuery UI Mouse 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */
+(function(c){c.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(b){return a._mouseDown(b)}).bind("click."+this.widgetName,function(b){if(true===c.data(b.target,a.widgetName+".preventClickEvent")){c.removeData(b.target,a.widgetName+".preventClickEvent");b.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(a){a.originalEvent=
+a.originalEvent||{};if(!a.originalEvent.mouseHandled){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var b=this,e=a.which==1,f=typeof this.options.cancel=="string"?c(a.target).parents().add(a.target).filter(this.options.cancel).length:false;if(!e||f||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){b.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
+this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}this._mouseMoveDelegate=function(d){return b._mouseMove(d)};this._mouseUpDelegate=function(d){return b._mouseUp(d)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return a.originalEvent.mouseHandled=true}},_mouseMove:function(a){if(c.browser.msie&&!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);
+return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;a.target==this._mouseDownEvent.target&&c.data(a.target,this.widgetName+".preventClickEvent",
+true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
+;/*
+ * jQuery UI Position 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
+left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
+k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
+m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
+d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
+a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
+g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
+;/*
+ * jQuery UI Draggable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
+"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
+this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;return true},_mouseStart:function(a){var b=this.options;this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-
+this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();
+d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);return true},_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||
+this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&
+this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==
+a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone():this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||
+0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],
+this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-
+(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment==
+"parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[(a.containment=="document"?0:d(window).scrollLeft())-this.offset.relative.left-this.offset.parent.left,(a.containment=="document"?0:d(window).scrollTop())-this.offset.relative.top-this.offset.parent.top,(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?
+0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){var b=d(a.containment)[0];if(b){a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),
+10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}}else if(a.containment.constructor==
+Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():
+f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,g=a.pageY;
+if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])e=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])e=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/
+b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;e=this.originalPageX+Math.round((e-this.originalPageX)/b.grid[0])*b.grid[0];e=this.containment?!(e-this.offset.click.left<this.containment[0]||e-this.offset.click.left>this.containment[2])?e:!(e-this.offset.click.left<this.containment[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:g-this.offset.click.top-
+this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=
+this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.10"});
+d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var g=d.data(this,"sortable");if(g&&!g.options.disabled){c.sortables.push({instance:g,shouldRevert:g.options.revert});g._refreshItems();g._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=
+0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=
+c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,
+true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=
+0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=
+a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","iframeFix",{start:function(){var a=d(this).data("draggable").options;d(a.iframeFix===true?"iframe":a.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")})},
+stop:function(){d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)})}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=
+document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!="x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-
+c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-
+(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable",
+"snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,g=b.offset.left,n=g+c.helperProportions.width,m=b.offset.top,o=m+c.helperProportions.height,h=
+c.snapElements.length-1;h>=0;h--){var i=c.snapElements[h].left,k=i+c.snapElements[h].width,j=c.snapElements[h].top,l=j+c.snapElements[h].height;if(i-e<g&&g<k+e&&j-e<m&&m<l+e||i-e<g&&g<k+e&&j-e<o&&o<l+e||i-e<n&&n<k+e&&j-e<m&&m<l+e||i-e<n&&n<k+e&&j-e<o&&o<l+e){if(f.snapMode!="inner"){var p=Math.abs(j-o)<=e,q=Math.abs(l-m)<=e,r=Math.abs(i-n)<=e,s=Math.abs(k-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:j-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",
+{top:l,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k}).left-c.margins.left}var t=p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(j-m)<=e;q=Math.abs(l-o)<=e;r=Math.abs(i-g)<=e;s=Math.abs(k-n)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:j,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:l-c.helperProportions.height,
+left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[h].snapping&&(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=p||q||r||s||t}else{c.snapElements[h].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,
+a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,
+b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
+;/*
+ * jQuery UI Resizable 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
+_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
+top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
+this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
+nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
+String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),k=0;k=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,k);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
+this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){e(this).removeClass("ui-resizable-autohide");b._handles.show()},function(){if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};
+if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),
+d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=
+this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:
+this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",
+b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;
+f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");
+this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateCache:function(b){this.offset=this.helper.offset();if(l(b.left))this.position.left=b.left;if(l(b.top))this.position.top=b.top;if(l(b.height))this.size.height=b.height;if(l(b.width))this.size.width=b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(b.height)b.width=c.height*this.aspectRatio;else if(b.width)b.height=c.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=
+null}if(d=="nw"){b.top=a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this.options,c=this.axis,d=l(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=l(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=l(b.width)&&a.minWidth&&a.minWidth>b.width,h=l(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+
+this.size.height,k=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&k)b.left=i-a.minWidth;if(d&&k)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=
+[c.css("borderTopWidth"),c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=
+this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,
+a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,
+c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,
+originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.10"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=
+b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var k=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:k.parents(a.originalElement[0]).length?["width","height"]:["width",
+"height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(k.css("position"))){c._revertToRelativePosition=true;k.css({position:"absolute",top:"auto",left:"auto"})}k.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};
+if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-
+g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,
+height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=
+e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,
+d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?
+d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=
+a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&
+/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");
+b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/
+(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},l=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
+;/*
+ * jQuery UI Dialog 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *  jquery.ui.button.js
+ *	jquery.ui.draggable.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.position.js
+ *	jquery.ui.resizable.js
+ */
+(function(c,j){var k={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},l={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&
+c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||"&#160;",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",
+-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),h=c('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role",
+"button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);return false}).appendTo(f);(a.uiDialogTitlebarCloseText=c("<span></span>")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("<span></span>").addClass("ui-dialog-title").attr("id",e).html(d).prependTo(f);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=
+b.beforeclose;f.find("*").add(f).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");a.uiDialog.remove();a.originalTitle&&
+a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d,e;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!==b.uiDialog[0]){e=c(this).css("z-index");
+isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.attr("scrollTop"),scrollLeft:d.element.attr("scrollLeft")};c.ui.dialog.maxZ+=1;d.uiDialog.css("z-index",c.ui.dialog.maxZ);
+d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target===f[0]&&e.shiftKey){g.focus(1);return false}}});
+c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,e=c("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("<div></div>").addClass("ui-dialog-buttonset").appendTo(e);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a,function(){return!(d=true)});if(d){c.each(a,function(f,
+h){h=c.isFunction(h)?{click:h,text:f}:h;f=c('<button type="button"></button>').attr(h,true).unbind("click").click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.fn.button&&f.button()});e.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(f){return{position:f.position,offset:f.offset}}var b=this,d=b.options,e=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(f,h){g=
+d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",f,a(h))},drag:function(f,h){b._trigger("drag",f,a(h))},stop:function(f,h){d.position=[h.position.left-e.scrollLeft(),h.position.top-e.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);b._trigger("dragStop",f,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(f){return{originalPosition:f.originalPosition,originalSize:f.originalSize,
+position:f.position,size:f.size}}a=a===j?this.options.resizable:a;var d=this,e=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:a,start:function(f,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",f,b(h))},resize:function(f,h){d._trigger("resize",f,b(h))},stop:function(f,
+h){c(this).removeClass("ui-dialog-resizing");e.height=c(this).height();e.width=c(this).width();d._trigger("resizeStop",f,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(a){var b=[],d=[0,0],e;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "):[a[0],a[1]];if(b.length===
+1)b[1]=b[0];c.each(["left","top"],function(g,f){if(+b[g]===b[g]){d[g]=b[g];b[g]=f}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(e=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(c.extend({of:window},a));e||this.uiDialog.hide()},_setOptions:function(a){var b=this,d={},e=false;c.each(a,function(g,f){b._setOption(g,f);if(g in k)e=true;if(g in
+l)d[g]=f});e&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",d)},_setOption:function(a,b){var d=this,e=d.uiDialog;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":e.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?e.addClass("ui-dialog-disabled"):e.removeClass("ui-dialog-disabled");
+break;case "draggable":var g=e.is(":data(draggable)");g&&!b&&e.draggable("destroy");!g&&b&&d._makeDraggable();break;case "position":d._position(b);break;case "resizable":(g=e.is(":data(resizable)"))&&!b&&e.resizable("destroy");g&&typeof b==="string"&&e.resizable("option","handles",b);!g&&b!==false&&d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||"&#160;"));break}c.Widget.prototype._setOption.apply(d,arguments)},_size:function(){var a=this.options,b,d,e=
+this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();d=Math.max(0,a.minHeight-b);if(a.height==="auto")if(c.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();a=this.element.css("height","auto").height();e||this.uiDialog.hide();this.element.height(Math.max(a,d))}else this.element.height(Math.max(a.height-b,0));this.uiDialog.is(":data(resizable)")&&
+this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.10",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "),create:function(a){if(this.instances.length===
+0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()<c.ui.dialog.overlay.maxZ)return false})},1);c(document).bind("keydown.dialog-overlay",function(d){if(a.options.closeOnEscape&&d.keyCode&&d.keyCode===c.ui.keyCode.ESCAPE){a.close(d);d.preventDefault()}});c(window).bind("resize.dialog-overlay",c.ui.dialog.overlay.resize)}var b=(this.oldInstances.pop()||c("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),
+height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);
+b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a<b?c(window).height()+"px":a+"px"}else return c(document).height()+"px"},width:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);b=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return a<b?c(window).width()+"px":a+"px"}else return c(document).width()+"px"},resize:function(){var a=c([]);c.each(c.ui.dialog.overlay.instances,
+function(){a=a.add(this)});a.css({width:0,height:0}).css({width:c.ui.dialog.overlay.width(),height:c.ui.dialog.overlay.height()})}});c.extend(c.ui.dialog.overlay.prototype,{destroy:function(){c.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
+;/*
+ * jQuery UI Effects 1.8.10
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */
+jQuery.effects||function(f,j){function n(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
+16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return o.transparent;return o[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return n(b)}function p(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
+a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function q(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=
+a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function m(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
+"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=n(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var o={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
+0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
+211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},r=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,
+d){if(f.isFunction(b)){d=b;b=null}return this.queue("fx",function(){var e=f(this),g=e.attr("style")||" ",h=q(p.call(this)),l,v=e.attr("className");f.each(r,function(w,i){c[i]&&e[i+"Class"](c[i])});l=q(p.call(this));e.attr("className",v);e.animate(u(h,l),a,b,function(){f.each(r,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments)});h=f.queue(this);l=h.splice(h.length-1,1)[0];
+h.splice(1,0,l);f.dequeue(this)})};f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,
+a):f.effects.animateClass.apply(this,[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.10",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,
+a){var b;switch(c[0]){case "top":b=0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",
+border:"none",margin:0,padding:0});c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);
+return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(m(c))return this._show.apply(this,arguments);
+else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(m(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(m(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),
+b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,
+a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,
+a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==
+e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=
+g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/
+h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,
+a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
+;
\ No newline at end of file
diff --git a/src_old/resources/scripts/messagecenter.js b/src_old/resources/scripts/messagecenter.js
new file mode 100644
index 0000000..6e7cfc3
--- /dev/null
+++ b/src_old/resources/scripts/messagecenter.js
@@ -0,0 +1,381 @@
+if (typeof console == 'undefined') console = {
+    log: function () { }
+};
+
+// sniff chrome
+var CHROME_5_LOCAL = false;
+var CHROME = false;
+var SAFARI = false;
+var FIREFOX = false;
+var WEBKIT = false;
+var QQ = false;
+var UC = false;
+var OS_MAC = false;
+var IOS = false;
+var ANDROID = false;
+var MOBILE_DEVICE = false;
+var SHARE_APP = false;
+
+var IE = false;
+var IE_10_AND_BELOW = false;  //ie 10 and lower
+var IE_11_AND_ABOVE = false; //ie 11 and above
+var BROWSER_VERSION = 5000;
+(function () {
+    if(!window.$axure) window.$axure = function() {};
+    var useragent = window.navigator.userAgent;
+
+    IOS = useragent.match(/iPhone/i) || useragent.match(/iPad/i) || useragent.match(/iPod/i);
+    ANDROID = useragent.match(/Android/i);
+
+    MOBILE_DEVICE = ANDROID || IOS
+        || navigator.userAgent.match(/webOS/i)
+        || navigator.userAgent.match(/BlackBerry/i)
+        || navigator.userAgent.match(/Tablet PC/i)
+        || navigator.userAgent.match(/Windows Phone/i);
+
+    var edgeRegex = /Edge\/([0-9]+)/g;
+    var edgeMatch = edgeRegex.exec(useragent);
+    $axure.browser = { isEdge: Boolean(edgeMatch) };
+    if ($axure.browser.isEdge) BROWSER_VERSION = Number(edgeMatch[1]);
+
+    if(!$axure.browser.isEdge) {
+        var chromeRegex = /Chrome\/([0-9]+).([0-9]+)/g;
+        var chromeMatch = chromeRegex.exec(useragent);
+        CHROME = Boolean(chromeMatch);
+        CHROME_5_LOCAL = chromeMatch &&
+            Number(chromeMatch[1]) >= 5 &&
+            location.href.indexOf('file://') >= 0 &&
+            !MOBILE_DEVICE; // Otherwise, Android webview will show up as CHROME_5_LOCAL
+        if (CHROME) BROWSER_VERSION = Number(chromeMatch[1]);
+    }
+
+    var safariRegex = /Safari\/([0-9]+)/g;
+    var safariMatch = safariRegex.exec(useragent);
+    SAFARI = Boolean(safariMatch) && !CHROME && !$axure.browser.isEdge; //because chrome also inserts safari string into user agent
+    if (SAFARI) BROWSER_VERSION = Number(safariMatch[1]);
+
+    var webkitRegex = /WebKit\//g ;
+    WEBKIT = Boolean(webkitRegex.exec(useragent));
+
+    var firefoxRegex = /Firefox\/([0-9]+)/g;
+    var firefoxMatch = firefoxRegex.exec(useragent);
+    FIREFOX = useragent.toLowerCase().indexOf('firefox') > -1;
+    if (FIREFOX) BROWSER_VERSION = Number(firefoxMatch[1]);
+
+    QQ = useragent.toLowerCase().indexOf('qqbrowser') > -1;
+    UC = useragent.toLowerCase().indexOf('ucbrowser') > -1 || useragent.toLowerCase().indexOf('ubrowser') > -1;
+
+    SHARE_APP = useragent.toLowerCase().indexOf('shareapp') > -1;
+
+    var macRegex = /Mac/g ;
+    OS_MAC = Boolean(macRegex.exec(window.navigator.platform));
+    
+    if($.browser) {
+        if($.browser.msie) IE_10_AND_BELOW = true;
+        else IE_11_AND_ABOVE = useragent.toLowerCase().indexOf('trident') > -1;
+
+        BROWSER_VERSION = $.browser.version;
+    }
+
+    IE_11_AND_ABOVE = useragent.toLowerCase().indexOf('trident') > -1;
+    IE_10_AND_BELOW = !IE_11_AND_ABOVE && useragent.toLowerCase().indexOf('msie') > -1;
+    IE = IE_10_AND_BELOW || IE_11_AND_ABOVE;
+
+    var _supports = $axure.mobileSupport = {};
+
+    if(MOBILE_DEVICE || navigator.maxTouchPoints || navigator.msMaxTouchPoints) {
+        _supports.touchstart = typeof window.ontouchstart !== 'undefined';
+        _supports.touchmove = typeof window.ontouchmove !== 'undefined';
+        _supports.touchend = typeof window.ontouchend !== 'undefined';
+
+        _supports.pointerdown = typeof window.onpointerdown !== 'undefined';
+        _supports.pointerup = typeof window.onpointerup !== 'undefined';
+        _supports.pointermove = typeof window.onpointermove !== 'undefined';
+    }
+
+    _supports.mobile = _supports.touchstart && _supports.touchend && _supports.touchmove;
+    
+    var _eventNames = $axure.eventNames = {};
+    _eventNames.mouseDownName = _supports.touchstart ? 'touchstart' : _supports.pointerdown ? 'pointerdown' : 'mousedown';
+    _eventNames.mouseUpName = _supports.touchend ? 'touchend' : _supports.pointerup ? 'pointerup' : 'mouseup';
+    _eventNames.mouseMoveName = _supports.touchmove ? 'touchmove' : _supports.pointermove ? 'pointermove' : 'mousemove';
+
+    //Used by sitemap and variables.js getLinkUrl functions so that they know
+    //whether to embed global variables in URL as query string or hash string
+    //_shouldSendVars persists the value for sitemap instead of re-checking every time
+    var _shouldSendVars;
+    var _shouldSendVarsToServer = function(url) {
+        if(typeof _shouldSendVars != 'undefined') {
+            return _shouldSendVars;
+        }
+
+        if(SAFARI || (IE_10_AND_BELOW && BROWSER_VERSION < 10)) {
+            var urlToCheck = typeof url != 'undefined' ? url : window.location.href;
+            var serverRegex = /http:\/\/127\.0\.0\.1:[0-9]{5}/g;
+            var serverMatch = serverRegex.exec(urlToCheck);
+            var previewRegex = /[0-9]{2}\.[0-9]{2}\.[0-9]{2}/g;
+            var previewMatch = previewRegex.exec(urlToCheck);
+            if(Boolean(serverMatch) && Boolean(previewMatch)) {
+                _shouldSendVars = true;
+                return _shouldSendVars;
+            }
+        }
+
+        _shouldSendVars = false;
+        return _shouldSendVars;
+    };
+    $axure.shouldSendVarsToServer = _shouldSendVarsToServer;
+})();
+
+(function () {
+    var matched, browser;
+
+    // Use of jQuery.browser is frowned upon.
+    // More details: http://api.jquery.com/jQuery.browser
+    // jQuery.uaMatch maintained for back-compat
+    jQuery.uaMatch = function (ua) {
+        ua = ua.toLowerCase();
+
+        var match = /(chrome)[ \/]([\w.]+)/.exec(ua) ||
+            /(webkit)[ \/]([\w.]+)/.exec(ua) ||
+            /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) ||
+            /(msie) ([\w.]+)/.exec(ua) ||
+            ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) ||
+            [];
+
+        return {
+            browser: match[1] || "",
+            version: match[2] || "0"
+        };
+    };
+
+    matched = jQuery.uaMatch(navigator.userAgent);
+    browser = {};
+
+    if (matched.browser) {
+        browser[matched.browser] = true;
+        browser.version = matched.version;
+    }
+
+    // Chrome is Webkit, but Webkit is also Safari.
+    if (browser.chrome) {
+        browser.webkit = true;
+    } else if (browser.webkit) {
+        browser.safari = true;
+    }
+
+    jQuery.browser = browser;
+
+    jQuery.sub = function () {
+        function jQuerySub(selector, context) {
+            return new jQuerySub.fn.init(selector, context);
+        }
+        jQuery.extend(true, jQuerySub, this);
+        jQuerySub.superclass = this;
+        jQuerySub.fn = jQuerySub.prototype = this();
+        jQuerySub.fn.constructor = jQuerySub;
+        jQuerySub.sub = this.sub;
+        jQuerySub.fn.init = function init(selector, context) {
+            if (context && context instanceof jQuery && !(context instanceof jQuerySub)) {
+                context = jQuerySub(context);
+            }
+
+            return jQuery.fn.init.call(this, selector, context, rootjQuerySub);
+        };
+        jQuerySub.fn.init.prototype = jQuerySub.fn;
+        var rootjQuerySub = jQuerySub(document);
+        return jQuerySub;
+    };
+
+})();
+
+(function() {
+    var _topMessageCenter;
+    var _messageCenter = {};
+    var _listeners = [];
+    var _stateListeners = [];
+    var _state = {};
+    var _eventObject = null;
+
+    var _queuedMessages = [];
+    var _initialized = false;
+
+    // this is for the non Chrome 5 local scenarios. The "top" message center will dispatch to all the bottom ones
+    var _childrenMessageCenters = [];
+
+    // create $axure if it hasn't been created
+    if(!window.$axure) window.$axure = function() {};
+    $axure.messageCenter = _messageCenter;
+
+    // isolate scope, and initialize _topMessageCenter.
+    (function() {
+        if(!CHROME_5_LOCAL) {
+            var topAxureWindow = window;
+            try {
+                while(topAxureWindow.parent && topAxureWindow.parent !== topAxureWindow && topAxureWindow.parent.$axure)
+                    topAxureWindow = topAxureWindow.parent;
+            } catch(e) {
+            }
+            _topMessageCenter = topAxureWindow.$axure.messageCenter;
+        }
+    })();
+
+    if (CHROME_5_LOCAL) {
+        document.addEventListener("DOMContentLoaded", function () {
+            $('body').append("<div id='axureEventReceiverDiv' style='display:none'></div>" +
+                "<div id='axureEventSenderDiv' style='display:none'></div>");
+
+            _eventObject = window.document.createEvent('Event');
+            _eventObject.initEvent('axureMessageSenderEvent', true, true);
+
+            $('#axureEventReceiverDiv')[0].addEventListener('axureMessageReceiverEvent',
+                function () {
+                    var request = JSON.parse($(this).text());
+                    _handleRequest(request);
+                });
+        });
+    } else {
+        $(window.document).ready(function () {
+            if (_topMessageCenter != _messageCenter) {
+                _topMessageCenter.addChildMessageCenter(_messageCenter);
+                console.log('adding from ' + window.location.toString());
+            }
+        });
+    }
+
+    var _handleRequest = function (request) {
+        // route the request to all the listeners
+        for(var i = 0; i < _listeners.length; i++) _listeners[i](request.message, request.data);
+
+        // now handle the queued messages if we're initializing
+        if (request.message == 'initialize') {
+            _initialized = true;
+            // send all the queued messages and return
+            for (var i = 0; i < _queuedMessages.length; i++) {
+                var qRequest = _queuedMessages[i];
+                _messageCenter.postMessage(qRequest.message, qRequest.data);
+            }
+            _queuedMessages = [];
+        }
+                
+        // and then handle the set state messages, if necessary
+        if (request.message == 'setState') {
+            _state[request.data.key] = request.data.value;
+            for (var i = 0; i < _stateListeners.length; i++) {
+                var keyListener = _stateListeners[i];
+                // if thep passed a null or empty value, always post the message
+                if (!keyListener.key || keyListener.key == request.data.key) {
+                    keyListener.listener(request.data.key, request.data.value);
+                }
+            }
+        }
+
+    };
+
+    // -----------------------------------------------------------------------------------------
+    // This method allows for dispatching messages in the non-chromelocal scenario.
+    // Each child calls this on _topMessageCenter
+    // -----------------------------------------------------------------------------------------
+    _messageCenter.addChildMessageCenter = function(messageCenter) {
+        _childrenMessageCenters[_childrenMessageCenters.length] = messageCenter;
+    };
+
+    // -----------------------------------------------------------------------------------------
+    // This method allows for dispatching messages in the non-chromelocal scenario.
+    // Each child calls this on _topMessageCenter
+    // -----------------------------------------------------------------------------------------
+    _messageCenter.dispatchMessage = function(message, data) {
+        _handleRequest({
+            message: message,
+            data: data
+        });
+    };
+
+    // -----------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------
+    _messageCenter.dispatchMessageRecursively = function(message, data) {
+        console.log("dispatched to " + window.location.toString());
+
+        // dispatch to the top center first
+        _messageCenter.dispatchMessage(message, data);
+
+        $('iframe').each(function(index, frame) {
+            //try,catch to handle permissions error in FF when loading pages from another domain
+            try {
+                if (frame.contentWindow.$axure && frame.contentWindow.$axure.messageCenter) {
+                    frame.contentWindow.$axure.messageCenter.dispatchMessageRecursively(message, data);
+                }
+            }catch(e) {}
+        });
+    };
+
+    var _combineEventMessages = false;
+    var _compositeEventMessageData = [];
+    _messageCenter.startCombineEventMessages = function() {
+        _combineEventMessages = true;
+    }
+
+    _messageCenter.endCombineEventMessages = function () {
+        _messageCenter.sendCompositeEventMessage();
+        _combineEventMessages = false;
+    }
+
+    _messageCenter.sendCompositeEventMessage = function () {
+        _messageCenter.postMessage('axCompositeEventMessage', _compositeEventMessageData);
+        _compositeEventMessageData = [];
+    }
+
+    _messageCenter.postMessage = function (message, data) {
+        if(_combineEventMessages) {
+            if(message == 'axEvent' || message == 'axCase' || message == 'axAction' || message == 'axEventComplete') {
+                _compositeEventMessageData.push({ 'message': message, 'data': data });
+                if(_compositeEventMessageData.length >= 10) _messageCenter.sendCompositeEventMessage();
+                return;
+            }
+        }
+
+        if(!CHROME_5_LOCAL) {
+            _topMessageCenter.dispatchMessageRecursively(message, data);
+        } else {
+            var request = {
+                message: message,
+                data: data
+            };
+
+            if(_initialized) {
+                var senderDiv = window.document.getElementById('axureEventSenderDiv');
+                var messageText = JSON.stringify(request);
+                //                console.log('sending event: ' + messageText);
+                senderDiv.innerText = messageText;
+                senderDiv.dispatchEvent(_eventObject);
+                //                console.log('event sent');
+            } else {
+                _queuedMessages[_queuedMessages.length] = request;
+            }
+        }
+    };
+
+    _messageCenter.setState = function(key, value) {
+        var data = {
+            key: key,
+            value: value
+        };
+        _messageCenter.postMessage('setState', data);
+    };
+
+    _messageCenter.getState = function(key) {
+        return _state[key];
+    };
+
+    _messageCenter.addMessageListener = function(listener) {
+        _listeners[_listeners.length] = listener;
+    };
+
+    _messageCenter.addStateListener = function(key, listener) {
+        _stateListeners[_stateListeners.length] = {
+            key: key,
+            listener: listener
+        };
+    };
+
+})();
diff --git a/src_old/resources/scripts/player/axplayer.js b/src_old/resources/scripts/player/axplayer.js
new file mode 100644
index 0000000..9b7ad43
--- /dev/null
+++ b/src_old/resources/scripts/player/axplayer.js
@@ -0,0 +1,2631 @@
+var PLUGIN_VAR_NAME = 'g';
+var FOOTNOTES_VAR_NAME = 'fn';
+var ADAPTIVE_VIEW_VAR_NAME = 'view';
+var SCALE_VAR_NAME = 'sc';
+var DIM_VAR_NAME = 'dm';
+var ROT_VAR_NAME = 'r';
+var CLOUD_VAR_NAME = 'cl';
+var TRACE_VAR_NAME = 'tr';
+var RP_VERSION = 9;
+var lastLeftPanelWidth = 220;
+var lastRightPanelWidth = 290;
+var lastLeftPanelWidthDefault = 220;
+var lastRightPanelWidthDefault = 290;
+var toolBarOnly = true;
+
+// isolate scope
+(function () {
+
+    if (!window.$axure) window.$axure = function () { };
+    if (typeof console == 'undefined') console = {
+        log: function () { }
+    };
+    if (window._axUtils) $axure.utils = _axUtils;
+
+    setUpController();
+
+    var getHashStringVar = $axure.player.getHashStringVar = function (query) {
+        var qstring = self.location.href.split("#");
+        if (qstring.length < 2) return "";
+        return GetParameter(qstring, query);
+    }
+
+    var isCloud = $axure.player.isCloud = getHashStringVar(CLOUD_VAR_NAME);
+    if (isCloud) {
+        $("#topPanel").css('display', 'none');
+    }else {
+        $("#topPanel").css('display', '');
+    }
+
+    $axure.loadDocument = function (document) {
+        $axure.document = document;
+
+        var configuration = $axure.document.configuration;
+        var _settings = {};
+        _settings.projectId = configuration.prototypeId;
+        _settings.projectName = configuration.projectName;
+        _settings.isAxshare = configuration.isAxshare;
+        _settings.isExpo = configuration.isExpo == null ? false : configuration.isExpo;
+        _settings.loadSitemap = configuration.loadSitemap;
+        _settings.loadFeedbackPlugin = configuration.loadFeedbackPlugin;
+        var cHash = getHashStringVar(SITEMAP_COLLAPSE_VAR_NAME);
+        _settings.startCollapsed = cHash == SITEMAP_COLLAPSE_VALUE;
+        if (cHash == SITEMAP_CLOSE_VALUE) closePlayer();
+        var gHash = getHashStringVar(PLUGIN_VAR_NAME);
+        _settings.startPluginGid = gHash;
+
+        $axure.player.settings = _settings;
+
+        var additionalJs = $axure.document.additionalJs;
+        if (additionalJs != null) {
+            var total = additionalJs.length;
+            if (total > 0) $.holdReady(true);            
+            $.each(additionalJs, function (index, value) {
+                var script = window.document.createElement("script");
+                script.type = "text/javascript";
+                script.src = value;
+                script.async = false;
+                script.onload = script.onreadystatechange = function (e) {
+                    if (!script.readyState || /loaded|complete/.test(script.readyState)) {
+                        script.onload = script.onreadystatechange = null;
+                        script = undefined;
+                    }
+                    if (--total == 0) $.holdReady(false);
+                }
+                window.document.head.appendChild(script);
+            });
+        }
+
+        var additionalCss = $axure.document.additionalCss;
+        if(additionalCss != null) {
+            $.each(additionalCss, function(index, value) {
+                var style = window.document.createElement('link');
+                style.type = "text/css";
+                style.rel = "stylesheet";
+                style.href = value;
+                window.document.head.appendChild(style);
+            });
+        }
+
+        if(_settings.isExpo && configuration.isMobile) {
+            initializeDeviceFrame();
+        }
+
+        // Pseudo-indicator that the document has been loaded
+        $axure.document.isLoaded = true;
+    };
+
+    $(window).bind('load', function () {
+        if ((CHROME && BROWSER_VERSION < 64) || // First 2018 release
+            (SAFARI && BROWSER_VERSION < 602) || // Minor version 10
+            (FIREFOX && BROWSER_VERSION < 57) || // Support Quantum 
+            ($axure.browser.isEdge && BROWSER_VERSION < 15) || // 15 for mobile devices (else could go 16, possibly 17)
+            (!$axure.browser.isEdge && IE)) {
+            if (!QQ && !UC) appendOutOfDateNotification();
+        }
+
+        if (CHROME_5_LOCAL && !$('body').attr('pluginDetected')) {
+            window.location = 'resources/chrome/chrome.html';
+        }
+
+        if (FIREFOX && BROWSER_VERSION >= 68 && document.location.href.indexOf('file://') >= 0) { //detecting firefox and local
+            window.location = 'resources/chrome/firefox.html';
+        }
+    });
+    
+    $(window).on('hashchange', function() {
+        window.location.reload();
+    });
+    
+    function appendOutOfDateNotification() {
+        var toAppend = '';
+        toAppend += '<div id="browserOutOfDateNotification">';
+        toAppend += '   <div style="font-size: 24px; text-align: center; color: #FFFFFF;">LOOKS LIKE YOUR BROWSER IS OUT OF DATE</div>';
+        toAppend += '   <div style="font-size: 14px; text-align: center; color: #FFFFFF; margin-bottom: 16px;">This prototype may not look or function correctly until you update your browser</div>';
+        toAppend += '   <div id="supportedBrowsersListContainer">';
+        toAppend += '       <div class="browserContainer">';
+        toAppend += '           <div class="browserName">Google Chrome</div><div class="browserSupportedVersion">v64 and later</div>';
+        toAppend += '       </div>';
+        toAppend += '       <div class="browserContainer">';
+        toAppend += '           <div class="browserName">Mozilla Firefox</div><div class="browserSupportedVersion">v57 and later</div>';
+        toAppend += '       </div>';
+        toAppend += '       <div class="browserContainer">';
+        toAppend += '           <div class="browserName">Microsoft Edge</div><div class="browserSupportedVersion">v15 and later</div>';
+        toAppend += '       </div>';
+        toAppend += '       <div class="browserContainer">';
+        toAppend += '           <div class="browserName">Apple Safari</div><div class="browserSupportedVersion">v10 and later</div>';
+        toAppend += '       </div>';
+        toAppend += '   </div>';
+        toAppend += '   <div id="browserOutOfDateNotificationButtons">'
+        if (!MOBILE_DEVICE) {
+            toAppend += '       <div style="margin-right: 36px"><a href="http://outdatedbrowser.com/en" id="updateBrowserButton">UPDATE BROWSER</a></div>';
+            toAppend += '       <div style="flex: 0 1 45%;"><a id="continueToPrototypeButton">Continue viewing prototype anyway</a></div>';
+        } else {
+            toAppend += '       <div style="width: 100%; text-align:center"><a id="continueToPrototypeButton">Continue viewing prototype anyway</a></div>';
+        }
+        toAppend += '   </div>';
+        toAppend += '</div>';
+
+        $('body').prepend(toAppend);
+
+        $('#continueToPrototypeButton').on('click', function () {
+            var $message = $('#browserOutOfDateNotification');
+            $message.children().hide();
+            $message.css('padding-top', '0px');
+            $message.animate({ 'height': '0px' }, { duration: 400, complete: function () { $message.hide(); } });
+        });
+    }
+
+    $axure.page.bind('load.start', mainFrame_onload);
+    $axure.messageCenter.addMessageListener(messageCenter_message);
+
+    var suppressPluginVarUpdate = false;
+    $(document).on('pluginShown', function (event, data) {
+        if (!suppressPluginVarUpdate) $axure.player.setVarInCurrentUrlHash(PLUGIN_VAR_NAME, data ? data : '');
+    });
+
+    $(document).on('pluginCreated', function (event, data) {
+        if (!$axure.player.isMobileMode() && $axure.player.settings.startPluginGid.indexOf(data) > -1) {
+            suppressPluginVarUpdate = true;
+            $axure.player.showPlugin(data);
+            suppressPluginVarUpdate = false;
+        }
+
+        if (data == '1') {
+            $('#interfaceControlFrame').animate({ opacity: 1 }, 200);
+        }
+
+        if ($axure.player.settings.isExpo) {
+            // TODO: Do this only if expo is a mobile device
+            // TODO: Figure out better way to deal with this issue
+            $axure.messageCenter.postMessage('setDeviceMode', { device: false });
+            $axure.messageCenter.postMessage('setDeviceMode', { device: true });
+            //$axure.player.refreshViewPort();
+        }
+    });
+    
+    function initializeEvents() {
+        $('#interfaceControlFrameMinimizeContainer').on('click', collapse);
+        $('#interfaceControlFrameCloseButton').on('click', closePlayer);
+        $('#interfacePageNameContainer').on($axure.eventNames.mouseDownName, toggleSitemap);
+        $('#interfaceAdaptiveViewsContainer').on($axure.eventNames.mouseDownName, toggleAdaptiveViewsPopup);
+        $('#overflowMenuButton').on($axure.eventNames.mouseDownName, toggleOverflowMenuPopup);
+
+        if (!MOBILE_DEVICE) {
+            $('#maximizePanel').mouseenter(function () {
+                $(this).addClass('maximizePanelOver');
+            });
+            $('#maximizePanel').mouseleave(function () {
+                if ($(this).hasClass('maximizePanelOver')) {
+                    $(this).animate(isMobileMode() ? {
+                            top: '-' + $('#maximizePanel').height() + 'px'
+                        } : {
+                            left: '-' + $('#maximizePanel').width() + 'px'
+                        }, 300);
+                }
+                $(this).removeClass('maximizePanelOver');
+            });
+            $('#maximizePanelOver').mouseenter(function () {
+                $('#maximizePanel').animate(isMobileMode() ? {
+                        top: '0px'
+                    } : {
+                        left: '0px'
+                    }, 100);
+            });
+        }
+
+        $minimizeContainer = $('#interfaceControlFrameMinimizeContainer');
+        $minimizeContainer.mouseenter(function () { $minimizeContainer.addClass('collapseHovered') });
+        $minimizeContainer.mouseleave(function () { $minimizeContainer.removeClass('collapseHovered') });
+        $maximizeContainer = $('#maximizePanelContainer');
+        $maximizeContainer.mouseenter(function () { if(!MOBILE_DEVICE) $minimizeContainer.addClass('expandHovered') });
+        $maximizeContainer.mouseleave(function () { if(!MOBILE_DEVICE) $minimizeContainer.removeClass('expandHovered') });
+
+        $('#maximizePanel').click(function () {
+            $(this).removeClass('maximizePanelOver');
+            $('#maximizePanelContainer').hide();
+            $axure.messageCenter.postMessage('expandFrame');
+        });
+
+        $('#mHideSidebar').on($axure.eventNames.mouseDownName, function (e) { startM(e); });
+        $('#lsplitbar').on($axure.eventNames.mouseDownName, startLeftSplit);
+        $('#rsplitbar').on($axure.eventNames.mouseDownName, startRightSplit);
+
+        if ($axure.mobileSupport.mobile) {
+            var touchCount = 0;
+            var lastTouch = Date.now();
+            $('#mainPanel').on('touchstart',
+                (function (e) {
+                    var now = Date.now();
+                    if (now - lastTouch < 375) {
+                        if (++touchCount === 3) {
+                            if ($axure.player.isMobileMode() || MOBILE_DEVICE) expand();
+                            touchCount = 0;
+                            e.preventDefault();
+                        };
+                    } else {
+                        touchCount = 1;
+                    }
+                    lastTouch = now;
+                }));
+        }
+
+        $(window).resize(function () {
+            $axure.player.resizeContent();
+        });
+
+        $(window).on("orientationchange", function () {
+            // IOS often does not complete updating innerHeight and innerWidth
+            // until after calling orientation changed and resized window
+            // Also, cannot use $(window).height() call since iOS11 needs padding amount
+            if (IOS && isMobileMode()) setTimeout(function () { $axure.player.resizeContent(true); }, 250);
+        });
+
+        $('#mainPanel').scroll(function () {
+            repositionClippingBoundsScroll();
+        });
+    }
+
+    function initializeMainFrame() {
+        var legacyQString = getQueryString("Page");
+        if (legacyQString.length > 0) {
+            location.href = location.href.substring(0, location.href.indexOf("?")) + "#" + PAGE_URL_NAME + "=" + legacyQString;
+            return;
+        }
+
+        var mainFrame = document.getElementById("mainFrame");
+        //if it's local file on safari, test if we can access mainframe after its loaded
+        if (SAFARI && document.location.href.indexOf('file://') >= 0) {
+            $(mainFrame).on('load', function () {
+                var canAccess;
+                try {
+                    var mainFrameWindow = mainFrame.contentWindow || mainFrame.contentDocument;
+                    mainFrameWindow['safari_file_CORS'] = 'Y';
+                    canAccess = mainFrameWindow['safari_file_CORS'] === 'Y';
+                } catch (err) {
+                    canAccess = false;
+                }
+
+                if (!canAccess) window.location = 'resources/chrome/safari.html';
+            });
+        }
+
+        if($axure.player.settings != null && !$axure.player.settings.isExpo) {
+            const linkUrlWithVars = $axure.getLinkUrlWithVars(getInitialUrl());
+            mainFrame.contentWindow.location.href = linkUrlWithVars;
+        }
+    }
+
+    function initializeDeviceFrame() {
+        // TODO: Load device bezel and necessary overlays if applicable
+        // - Need to determine if device has a frame/overlay
+        // - Determine where to store said assets
+        // - Determine sizing, positioning, orientation, and styling for HTML containers
+        // - Verify that it stays consistent for every state (expo)
+
+        var expo = $axure.expo;
+        var project = expo.project;
+        var device = project.Platform.Device;
+
+        // in expo.ts, Web is 12
+        if (device === 12) {
+            // Hide containers
+            $('#deviceFrameContainer').hide();
+            $('#bezelOverlay').hide();
+
+            return;
+        }
+
+        // map devices to their corresponding frame/bezel/overlays
+    }
+    var wasMobile = false;
+    var isMobileMode = $axure.player.isMobileMode = function () { return $axure.utils.isShareApp() || (MOBILE_DEVICE && $(window).width() < 420); }
+    var isMobileTextEntry = false;
+
+    var isViewOverridden = $axure.player.isViewOverridden = function() {
+        return getHashStringVar(ADAPTIVE_VIEW_VAR_NAME).length > 0;
+    }
+
+    function toggleSitemapMobileMode() {
+        var $container = $('#sitemapHost');
+        if (!$container.length) return;
+        var $header = $container.find('.pluginNameHeader');
+        var projectName = $axure.player.getProjectName();
+
+        if (isMobileMode()) {
+            $header.text('PROJECT PAGES');
+            $container.addClass('mobileMode');
+            $container.find('.sitemapPageName').addClass('mobileText');
+            // Give sitemapHost left-margin so it does not collide with projectOptionsHost
+            if (MOBILE_DEVICE) $container.css('margin-left', '13px');
+        } else {
+            $container.removeClass('mobileMode');
+            $header.text(projectName ? projectName : 'Pages');
+            $container.find('.sitemapPageName').removeClass('mobileText');
+            if (MOBILE_DEVICE) $container.css('margin-left', '');
+        }
+    }
+
+    function togglePageNotesMobileMode() {
+        var $container = $('#pageNotesHost');
+        if (!$container.length) return;
+
+        if (isMobileMode()) {
+            $container.addClass('mobileMode');
+            $('#pageNotesSectionHeader').text('PAGE NOTES');
+            $('#widgetNotesSectionHeader').text('WIDGET NOTES');
+            $container.find('.notesPageNameHeader').addClass('mobileSubHeader');
+            $container.find('.pageNote').addClass('mobileText');
+            $container.find('.emptyStateTitle').addClass('mobileSubHeader');
+            $container.find('.emptyStateContent').addClass('mobileText');
+        } else {
+            $container.removeClass('mobileMode');
+            $('#pageNotesSectionHeader').text('Page Notes');
+            $('#widgetNotesSectionHeader').text('Widget Notes');
+            $container.find('.notesPageNameHeader').removeClass('mobileSubHeader');
+            $container.find('.pageNote').removeClass('mobileText');
+            $container.find('.emptyStateTitle').removeClass('mobileSubHeader');
+            $container.find('.emptyStateContent').removeClass('mobileText');
+        }
+    
+    }
+
+    function toggleFeedbackMobileMode() {
+        var $container = $('#feedbackHost');
+        if (!$container.length) return;
+
+        if (isMobileMode()) {
+            $container.addClass('mobileMode');
+        } else {
+            $container.removeClass('mobileMode');
+        }
+    }
+
+    $axure.player.updatePlugins = function updatePlugins() {
+        if (MOBILE_DEVICE && !$axure.utils.isShareApp()) {
+            var hostPanelPadding = isMobileMode() ? '8px 15px 0px 15px' : '';
+            $('.rightPanel .leftPanel .mobileOnlyPanel').css('padding', hostPanelPadding);
+        }
+
+        if (isMobileMode()) {
+            $('body').addClass('mobileMode');
+            if ($('#debugHost').length) $('#debugHost').hide();
+            if ($('#handoffHost').length) $('#handoffHost').hide();
+        } else $('body').removeClass('mobileMode');
+
+        toggleSitemapMobileMode();
+        togglePageNotesMobileMode();
+        toggleFeedbackMobileMode();
+    }
+
+    // TODO: this is done for IOS and Android (check what can be done for Pixel, etc)
+    $axure.player.setIsMobileModeTextEntry = function (isTextEntry) {
+        isMobileTextEntry = isTextEntry;
+        if (IOS && isTextEntry) {
+            activateMobileTextEntry()
+        } else if (IOS) {
+            setTimeout(deactivateMobileTextEntry, 150);
+        }
+    }
+
+    function deactivateMobileTextEntry() {
+        newHeight = window.innerHeight;
+        var newControlHeight = newHeight - (!$axure.utils.isShareApp() ? 140 : IOS ? 157 : 138);
+
+        if (!$('.leftPanel').hasClass('popup')) {
+            $('.leftPanel').height(newControlHeight);
+        }
+        $('.rightPanel').height(newControlHeight);
+        $('.mobileOnlyPanel').height(newControlHeight);
+        $('#mobileControlFrameContainer').show();
+    }
+
+    function activateMobileTextEntry() {
+        $('#mobileControlFrameContainer').hide();
+
+        newHeight = window.innerHeight;
+        var newControlHeight = newHeight - (!$axure.utils.isShareApp() ? 140 : IOS ? 157 : 138);
+        newControlHeight = newControlHeight + (!$axure.utils.isShareApp() ? 61 : IOS ? 72 : 60);
+
+        if (!$('.leftPanel').hasClass('popup')) {
+            $('.leftPanel').height(newControlHeight);
+        }
+        $('.rightPanel').height(newControlHeight);
+        $('.mobileOnlyPanel').height(newControlHeight);
+    }
+
+    function setAdaptiveView() {
+        if (typeof noViewport == 'undefined') {
+            // Block during animation -- end of animation will call resizeContent once completed with isAnimating equal to false
+            if (!isViewOverridden() && !isAnimating) $axure.messageCenter.postMessage('setAdaptiveViewForSize', { 'width': $('#mainPanel').width(), 'height': $('#mainPanel').height() });
+            //if (!isViewOverridden()) $axure.messageCenter.postMessage('setAdaptiveViewForSize', { 'width': $('#mainPanel').width(), 'height': $('#mainPanel').height() });
+            $axure.player.refreshViewPort();
+            if ($axure.player.updateAdaptiveViewHeader != null) $axure.player.updateAdaptiveViewHeader();
+        }
+    }
+
+    $axure.player.resizeContent = function (noViewport) {
+        var isMobile = isMobileMode();
+
+        if (wasMobile && !isMobile) {
+            $('#clippingBoundsScrollContainer').show();
+            $('#outerContainer').prepend($('.leftPanel'));
+            $('#outerContainer').append($('.rightPanel'));
+
+            $axure.player.updatePlugins();
+
+            $('#mHideSidebar').hide();
+            $('#mobileBrowserControlFrame').hide();
+            $('#nativeAppControlFrame').hide();
+
+            if ($('#topPanel').is(':visible')) {
+                $('#maximizePanelContainer').hide();
+                $axure.player.restorePlugins();
+            } else {
+                $('.leftPanel').hide();
+                $('.rightPanel').hide();
+                if (!MOBILE_DEVICE) $('#maximizePanelContainer').show();
+            }
+
+            $('.leftPanel').css({ 'top': '', 'left': '' });
+            $('.rightPanel').css({ 'top': '', 'left': '' });
+
+        } else if (!wasMobile && isMobile) {
+            $('#clippingBoundsScrollContainer').hide();
+            $axure.player.closePopup();
+
+            $('#lsplitbar').hide();
+            $('#rsplitbar').hide();
+
+            $('.leftPanel').show();
+            $('.rightPanel').show();
+
+            $axure.player.updatePlugins();
+            $('#mHideSidebar').append($('.leftPanel'));
+            $('#mHideSidebar').append($('.rightPanel'));
+            if (MOBILE_DEVICE) $('#maximizePanelContainer').hide();
+
+            $axure.messageCenter.postMessage('collapseFrameOnLoad');
+        }
+
+
+        var newHeight = 0;
+        var newWidth = 0;
+        if (IOS && $axure.utils.isShareApp()) {
+            // Hack for Iphone X
+            newHeight = iosInnerHeight();
+            newWidth = $(window).width();
+        } else {
+            // innerHeight includes padding for window -- needed in iOS 11 to have prototype stretch to bottom of screen (could put in -- if (iOS) -- block if needed)
+            //var newHeight = $(window).height() - ((!isMobile && $('#topPanel').is(':visible'))? $('#topPanel').height() : 0);
+            newHeight = window.innerHeight - ((!isMobile && $('#topPanel').is(':visible')) ? $('#topPanel').height() : 0);
+            newWidth = $(window).width();
+        }
+
+        $('#outerContainer').height(newHeight).width(newWidth);
+        $('#mainPanel').height(newHeight);
+        $('#clippingBounds').height(newHeight);
+
+        if (isMobile) {
+            $('#mobileControlFrameContainer').height(newHeight);
+            $('#mobileControlFrameContainer').width(newWidth);
+            var newControlHeight = newHeight - (!MOBILE_DEVICE ? 112 : !$axure.utils.isShareApp() ? 140 : IOS ? 157 : 138);
+            // Screen resize is only way through browser to catch mobile device keyboard expand and collapse
+            if ($('#mHideSidebar').is(':visible') && !$('#mobileControlFrameContainer').is(':visible')) {
+                $('#mobileControlFrameContainer').delay(150).show();
+            } else if (isMobileTextEntry) {
+                newControlHeight = newControlHeight + (!$axure.utils.isShareApp() ? 61 : IOS ? 72 : 60);
+                $('#mobileControlFrameContainer').hide();
+            }
+
+            if(!$('.leftPanel').hasClass('popup')) {
+                $('.leftPanel').height(newControlHeight);
+            }
+            $('.rightPanel').height(newControlHeight);
+            $('.mobileOnlyPanel').height(newControlHeight);
+        } else {
+            if (!$('.leftPanel').hasClass('popup')) {
+                $('.leftPanel').css('height','');
+            }
+            $('.rightPanel').css('height', '');
+            if ($('.rightPanel').is(':visible')) {
+                var lastRightPanelWidthDefaultSub = ($(window).width() - lastRightPanelWidthDefault || 0);
+                var rightPanelWidth = ($('.rightPanel').width() || 0);
+                var leftPanelPanelWidthSub = ($(window).width() - $('.leftPanel').width()) || 0;
+
+                var newWidth = Math.min(lastRightPanelWidthDefaultSub, rightPanelWidth, leftPanelPanelWidthSub);
+                lastRightPanelWidth = Math.max(lastRightPanelWidthDefault, newWidth);
+                $('.rightPanel').width(lastRightPanelWidth ? lastRightPanelWidth : lastRightPanelWidthDefault);
+                $('#rsplitbar').css('left', $(window).width() - $('.rightPanel').width());
+            }
+            if ($('.leftPanel').is(':visible')) {
+                var lastLeftPanelWidthSub = ($(window).width() - lastLeftPanelWidthDefault || 0);
+                var leftPanelWidth = ($('.leftPanel').width() || 0);
+                var rightPanelWidthSub = ($(window).width() - $('.rightPanel').width()) || 0;
+
+                var newWidth = Math.min(lastLeftPanelWidthSub, leftPanelWidth, rightPanelWidthSub);
+
+                lastLeftPanelWidth = Math.max(lastLeftPanelWidthDefault, newWidth);
+                $('.leftPanel').width(lastLeftPanelWidth ? lastLeftPanelWidth : lastLeftPanelWidthDefault);
+                $('#lsplitbar').css('left', $('.leftPanel').width() - 4);
+            }
+        }
+
+        if (isMobile) {
+            var newControlWidth = newWidth - 80;
+            $('.leftPanel').css({ 'width': newControlWidth + 'px' });
+            $('.rightPanel').css({ 'width': newControlWidth + 'px' });
+            $('.mobileOnlyPanel').css({ 'width': newControlWidth + 'px' });
+            adjustM('left');
+        }
+
+        updateClippingBoundsWidth();
+        repositionClippingBoundsScroll();
+        setAdaptiveView();
+
+        wasMobile = isMobile;
+    }
+
+    function contentDocument_onload() {
+        (function setRepositionWhenReady() {
+            var $iframe = $('#mainPanel').find('iframe')[0];
+            if ($($iframe.contentWindow.document.body).length === 0 || $iframe.contentWindow.document.URL === "about:blank") {
+                setTimeout(setRepositionWhenReady, 50);
+            } else {
+                var $iframe = $($('#mainPanel').find('iframe')[0].contentWindow.document);
+                $iframe.scroll(function () {
+                    repositionClippingBoundsScroll();
+                });
+            }
+        })();
+    }
+
+    // This is the full width and height of the prototype (beyond the window width and height)
+    var determineIframeDimensions = function () {
+        var $iframe = $($('#mainPanel').find('iframe')[0].contentWindow);
+
+        return {
+            width: $iframe.width(),
+            height: $iframe.height()
+        };
+    };
+
+    // Position of this (upper left hand corner) should match the existingPinPanel position
+    var determineIframePosition = function () {
+        var dimensions = determineIframeDimensions();
+        var $iframe = $($('#mainPanel').find('iframe')[0].contentWindow);
+
+        var $body = $($iframe[0].document.body);
+        var bodyWidth = $body.offset().left !== 0 ? $body.width() : dimensions.width;
+
+        if (FIREFOX) {
+            var left = $body[0].getBoundingClientRect().left;
+            bodyWidth = left !== 0 ? $body.width() : dimensions.width;
+        }
+
+        return {
+            top: 0,// Math.max(0, (dimensions.height - $($iframe[0].document.body).height()) / 2),
+            left: Math.max(0, (dimensions.width - bodyWidth) / 2)
+        };
+    };
+
+    // Return iframe scroll top and scroll left
+    var determineIframeScroll = function () {
+        var $iframe = $($('#mainPanel').find('iframe')[0].contentWindow);
+
+        return {
+            scrollTop: $iframe.scrollTop(),
+            scrollLeft: $iframe.scrollLeft()
+        };
+    };
+
+    function calculateClippingBoundsWidth(panelSize, isLeftPanel) {
+        var $leftPanel = $('.leftPanel:visible');
+        var leftPanelOffset = (!isMobileMode() && $leftPanel.length > 0 && !$leftPanel.hasClass('popup')) ? $leftPanel.width() : 0;
+
+        var $rightPanel = $('.rightPanel:visible');
+        var rightPanelOffset = (!isMobileMode() && $rightPanel.length > 0) ? $rightPanel.width() : 0;
+
+        // Replace current panel size with panel size after animation for expand or collapse completes
+        if (typeof panelSize !== 'undefined') {
+            if (isLeftPanel) leftPanelOffset = panelSize;
+            else rightPanelOffset = panelSize;
+        }
+
+        return $(window).width() - rightPanelOffset - leftPanelOffset;
+    }
+
+    var updateClippingBoundsWidth = $axure.player.updateClippingBoundsWidth = function () {
+        if ($('.leftPanel').is(':visible')) $('#clippingBounds').css('left', $('.leftPanel').width());
+        else $('#clippingBounds').css('left', '0px');
+        $('#clippingBounds').width(calculateClippingBoundsWidth());
+    }
+
+    var contentLeftOfOriginOffset = 0;
+    function calculateClippingBoundsScrollPosition() {
+        // Adjust for mainPanelContainer scaling (scale should be "none" for scaleVal == 0 or scaleVal == 1)
+        var $iframe = $($('#mainPanel').find('iframe')[0].contentWindow);
+        var selectedScale = $('.vpScaleOption').find('.selectedRadioButton');
+        var scaleVal = $(selectedScale).parent().attr('val');
+
+        var dimStr = $('.currentAdaptiveView').attr('data-dim');
+        var dim = dimStr ? dimStr.split('x') : { w: '0', h: '0' };
+        var isDevice = dim[1] != '0' ? true : false;
+        // This line is necessary for right handling DEFAULT SCALE
+        // Because default scale relates to scale-to-fit item for device projects
+        if (scaleVal == '0' && isDevice) scaleVal = 2;
+
+        var scale = $('#mainPanelContainer').css('transform');;
+        scale = (scale == "none") ? 1 : Number(scale.substring(scale.indexOf('(') + 1, scale.indexOf(',')));
+
+        // Iframe and Main Panel Positioning
+        var iframeScroll = determineIframeScroll();
+        var iframePos = determineIframePosition();
+        var viewablePanelLeftMargin = parseInt($('#mainPanelContainer').css('margin-left'));
+        var viewablePanelTop = parseInt($('#mainPanelContainer').css('top'));
+        if (isNaN(viewablePanelTop)) viewablePanelTop = 0;
+        if (scaleVal == 2) {
+            // Scale to Fit (account for main panel container scale) -- needed for device mode in Scale to Fit
+            viewablePanelLeftMargin = ($('#mainPanel').width() - ($('#mainPanelContainer').width() * scale)) / 2
+            viewablePanelTop = ($('#mainPanel').height() - ($('#mainPanelContainer').height() * scale)) / 2
+        }
+
+        // left and top positioning
+        var leftPos = viewablePanelLeftMargin + (iframePos.left - iframeScroll.scrollLeft) * scale;
+        var topPos = viewablePanelTop - iframeScroll.scrollTop * scale;
+
+        // Special cases for Centered Page
+        var isCentered = $($iframe[0].document.body).css('position') == 'relative';
+        if (isCentered && scaleVal == 1) leftPos = 0;
+        else if (isCentered && scaleVal == 2) leftPos = $('#mainPanelContainer').width() * scale / 2.0 - contentLeftOfOriginOffset;
+
+        // Include clipFrameScroll offset in mainPanelContainer
+        topPos += (parseFloat($('#clipFrameScroll').css("top")) || 0) * scale;
+
+        return {
+            left: leftPos,
+            top: topPos
+        }
+    }
+
+    function repositionClippingBoundsScroll() {
+        if (!$axure.player.settings.isAxshare) return; 
+
+        (function repositionWhenReady() {
+            if ($($('#mainPanel').find('iframe')[0].contentWindow.document.body).length === 0) {
+                setTimeout(repositionWhenReady, 50);
+            } else {
+                var position = calculateClippingBoundsScrollPosition();
+
+                // Adding mainPanel scroll here, since it does not work well with calculating animation left position
+                position.left = position.left - $('#mainPanel').scrollLeft() - $('#clipFrameScroll').scrollLeft();
+                position.top = position.top - $('#mainPanel').scrollTop() - $('#clipFrameScroll').scrollTop();
+
+                $('#clippingBoundsScrollContainer').css('left', position.left + 'px');
+                $('#clippingBoundsScrollContainer').css('top', position.top + 'px');
+            }
+        })();
+    }
+
+    function calculateScrollLeftWithOffset(offset, isLeftPanel) {
+        if (!$axure.player.settings.isAxshare) return;
+        if ($($('#mainPanel').find('iframe')[0].contentWindow.document.body).length === 0) return;
+        var scaleVal = $('.vpScaleOption').find('.selectedRadioButton').parent().attr('val');
+        if (scaleVal == 2) return;
+
+        var $iframe = $($('#mainPanel').find('iframe')[0].contentWindow);
+        var $body = $($iframe[0].document.body);
+
+        var dimStr = $('.currentAdaptiveView').attr('data-dim');
+        var hasFrame = (!dimStr ? false : dimStr.split('x')[1] != '0') && !$axure.player.noFrame;
+        var isCentered = $body.css('position') == 'relative'; //body position is always static while page is still loading (thus false, if called on intial load)
+        var isCollapsing = offset > 0; //offset is positive when collapsing since we are gaining offset more space for content viewing
+
+        // Base case left positioning
+        var leftPos = calculateClippingBoundsScrollPosition().left;
+
+        // If maintaining view options requires a left adjustment not equivalent to panel size (which has already being added in leftPos above)
+        var viewAdjustment = 0;
+
+        // Mobile Frame adjustment
+        if (hasFrame) {
+            var viewablePanelLeftMargin = parseInt($('#mainPanelContainer').css('margin-left'));
+            var viewablePanelRightMargin = parseInt($('#mainPanelContainer').css('margin-right'));
+
+            // Cases
+            // 0) Adaptive view frame doesn't fit in viewable bounds (viewablePanelLeftMargin is zero) -- use entire offset of panel (no adjustment needed)
+            // 1) Adaptive view frame fits in bounds -- then half of incoming panel will be split left and half right (offset / 2)
+            // 2) and 3) View Frame either fits in bounds before animation and no longer will after, or vice versa. Mix of previous two cases
+            if (isCollapsing) {
+                if (viewablePanelLeftMargin != 0) {
+                    viewAdjustment = offset / 2;
+                } else if (-viewablePanelRightMargin < offset) {
+                    viewAdjustment = ((offset + viewablePanelRightMargin) / 2);
+                }
+            } else if (viewablePanelLeftMargin != 0) {
+                viewAdjustment = Math.max(offset / 2, -viewablePanelLeftMargin)
+            }
+        }
+
+        // Centered Page adjustment
+        if (isCentered) {
+            // Width of content not able to fit inside current viewable frame
+            var clippedContentWidth = $body.width() - calculateClippingBoundsWidth(Math.abs(offset), isLeftPanel);
+
+            // Cases
+            // 0) Content never fits in bounds -- then entire offset of panel will move content left value (no adjustment needed as already handled)
+            // 1) Content fits in bounds -- then half of incoming panel offset will be split left and half right (offset / 2)
+            // 2) and 3) Content either fits in bounds before animation and no longer will after, or vice versa. Mix of previous two cases
+            if (clippedContentWidth <= 0) {
+                viewAdjustment = offset / 2;
+            } else if (isCollapsing && clippedContentWidth < offset) {
+                viewAdjustment = (offset - clippedContentWidth) / 2;
+            } else if (!isCollapsing && clippedContentWidth < -offset) {
+                viewAdjustment = (clippedContentWidth + offset) / 2;
+            }
+        }
+
+        return leftPos + viewAdjustment;
+    }
+
+    // Set to true when left panel or right panel are being expanded/collapsed
+    // returns to false when lsplitbar (switched to clippingBounds) finishes animation (thus panels will be fully expanded or retracted at this point)
+    var isAnimating = $axure.player.isAnimating = false;
+
+    $axure.player.collapseToBar = function (context, hostId) {
+        lastLeftPanelWidth = $('.leftPanel').width();
+        lastRightPanelWidth = $('.rightPanel').width();
+        if (context === 'project' || context === 'all') {
+
+            if(!isMobileMode()) {
+                isAnimating = true;
+                var newWidth = lastLeftPanelWidth != 0 ? lastLeftPanelWidth : lastLeftPanelWidthDefault;
+                var clippingWidth = calculateClippingBoundsWidth(0, true);
+                var newLeft = calculateScrollLeftWithOffset(newWidth, true);
+
+                $('.leftPanel').animate({ 'margin-left': -newWidth + 'px' },
+                    { duration: 200, complete: function() { $('.leftPanel').width(0).hide().css({ 'margin-left': '' }); } });
+                $('#lsplitbar').animate({ left: '-4px' },
+                    { duration: 200, complete: function() { $('#lsplitbar').hide(); } });
+
+                $('#clippingBounds').animate({ left: '', width: clippingWidth + 'px' }, { duration: 200 });
+                $('#clippingBoundsScrollContainer').animate({ left: newLeft + 'px' },
+                    { duration: 200, complete: function () {
+                        isAnimating = false;
+                        $axure.player.resizeContent();
+                        $axure.player.pluginVisibleChanged(hostId, false);
+                    }});
+            } else {
+                $('.leftPanel').width(0);
+                $('#lsplitbar').hide();
+            }
+        }
+        if (context === 'inspect' || context === 'all') {
+            if (!isMobileMode()) {
+                isAnimating = true;
+                var newWidth = lastRightPanelWidth != 0 ? lastRightPanelWidth : lastRightPanelWidthDefault;
+                var clippingWidth = calculateClippingBoundsWidth(0, false); 
+                var newLeft = calculateScrollLeftWithOffset(newWidth, false);
+
+                $('.rightPanel').animate({ 'margin-right': -newWidth + 'px' },
+                    { duration: 200, complete: function () { $('.rightPanel').width(0).hide().css({ 'margin-right': '' }); } });
+                $('#rsplitbar').animate({ left: $(window).width() + 'px' },
+                    { duration: 200, complete: function () { $('#rsplitbar').hide(); } });
+
+                $('#clippingBounds').animate({ width: clippingWidth + 'px' }, { duration: 200 });
+                $('#clippingBoundsScrollContainer').animate({ left: newLeft + 'px' },
+                    { duration: 200, complete: function () {
+                        isAnimating = false;
+                        $axure.player.resizeContent();
+                        $axure.player.pluginVisibleChanged(hostId, false);
+                    }});
+            } else {
+                $('.rightPanel').width(0);
+                $('#rsplitbar').hide();
+            }
+        }
+
+        $(window).resize();
+        toolBarOnly = true;
+    }
+
+    $axure.player.expandFromBar = function (hostId, context, isFinalPluginToRestore) {
+
+        if (context === 'project') {
+            if ($('#lsplitbar').is(':visible')) return;
+            $('.leftPanel').removeClass('popup');
+            if(!isMobileMode()) {
+                isAnimating = true;
+                var newWidth = (lastLeftPanelWidth ? lastLeftPanelWidth : lastLeftPanelWidthDefault);
+                var clippingWidth = calculateClippingBoundsWidth(newWidth, true);
+                var newLeft = calculateScrollLeftWithOffset(-newWidth, true);
+
+                $('.leftPanel').width(newWidth);
+                $('.leftPanel').css('margin-left', -newWidth + 'px').show();
+                $('.leftPanel').animate({ 'margin-left': '0px' }, { duration: 200, complete: function () { $('.leftPanel').css({ 'margin-left': '' }); } });
+
+                $('#lsplitbar').css('left', '-4px');
+                $('#lsplitbar').show();
+                $('#lsplitbar').animate({ left: newWidth - 4 + 'px' }, { duration: 200 });
+
+                $('#clippingBounds').animate({ left: newWidth + 'px', width: clippingWidth + 'px' }, { duration: 200 });
+                $('#clippingBoundsScrollContainer').animate({ left: newLeft + 'px' },
+                    { duration: 200, complete: function () {
+                        isAnimating = false;
+                        $axure.player.resizeContent();
+                        if (isFinalPluginToRestore) $('#clippingBoundsScrollContainer').show();
+                        $axure.player.pluginVisibleChanged(hostId, true);
+                    }});
+            }
+        } else {
+            if ($('#rsplitbar').is(':visible')) {
+                // update width of rightPanel plugin
+                var newWidth = lastRightPanelWidth ? lastRightPanelWidth : lastRightPanelWidthDefault;
+                $('#' + hostId).width(newWidth);
+                $('#' + hostId).show();
+                $axure.player.pluginVisibleChanged(hostId, true);
+                return;
+            }
+            if (!isMobileMode()) {
+                isAnimating = true;
+                var newWidth = lastRightPanelWidth ? lastRightPanelWidth : lastRightPanelWidthDefault;
+                var clippingWidth = calculateClippingBoundsWidth(newWidth, false);
+                var newLeft = calculateScrollLeftWithOffset(-newWidth, false);
+
+                $('.rightPanel').width(newWidth);
+                $('.rightPanel').css('margin-right', -newWidth + 'px');
+                $('#' + hostId).show();
+                $('.rightPanel').animate({ 'margin-right': '0px' }, { duration: 200, complete: function () { $('.rightPanel').css({ 'margin-right': '' }); } });
+
+                $('#rsplitbar').css('left', $(window).width());
+                $('#rsplitbar').show();
+                $('#rsplitbar').animate({ left: $(window).width() - $('.rightPanel').width() + 'px' }, { duration: 200 });
+
+                $('#clippingBounds').animate({ width: clippingWidth + 'px' }, { duration: 200 });
+                $('#clippingBoundsScrollContainer').animate({ left: newLeft + 'px' },
+                    { duration: 200, complete: function () {
+                        isAnimating = false;
+                        $axure.player.resizeContent();
+                        if (isFinalPluginToRestore) $('#clippingBoundsScrollContainer').show();
+                        $axure.player.pluginVisibleChanged(hostId, true);
+                    }});
+            }
+        }
+        $(window).resize();
+        toolBarOnly = false;
+
+        if (isMobileMode()) {
+            $('#mHideSidebar').show();
+            $('#nativeAppControlFrame').show();
+        }
+    }
+
+    var suspendRefreshViewPort = $axure.player.suspendRefreshViewPort = false;
+    $axure.player.refreshViewPort = function () {
+        if (suspendRefreshViewPort) return;
+
+        var dimStr = $('.currentAdaptiveView').attr('data-dim');
+        var dim = dimStr ? dimStr.split('x') : { w: '0', h: '0' };
+        var w = dim[0] != '0' ? dim[0] : '';
+        var h = dim[1] != '0' ? dim[1] : '';
+
+        var scaleVal = $('.vpScaleOption').find('.selectedRadioButton').parent().attr('val');
+        var selectedScaleValue = scaleVal;
+        $axure.player.noFrame = false;
+        if (h && scaleVal == 1) $axure.player.noFrame = true;
+
+        $('#mainPanelContainer').attr({
+            "data-scale-n": scaleVal,
+            "data-page-dimensions-type": h ? "device" : w ? "web" : "auto",
+            "data-scale-shift-x": null,
+            "data-scale-shift-y": null,
+        });
+
+        var clipToView = h && !$axure.player.noFrame;
+        var isDevice = h;
+
+        var mainPanelWidth = $('#mainPanel').width();
+        var mainPanelHeight = $('#mainPanel').height();
+        
+        if (!w || !clipToView) w = mainPanelWidth;
+        if (!h || !clipToView) h = mainPanelHeight;
+        if (MOBILE_DEVICE && h > mainPanelHeight) h = mainPanelHeight;
+        if (MOBILE_DEVICE && w > mainPanelWidth) w = mainPanelWidth;
+        
+        if (clipToView) {
+            if (!MOBILE_DEVICE && scaleVal == '0') scaleVal = 2;
+
+            w = Number(w);
+            h = Number(h);
+
+            $('#mainFrame').width(w);
+            $('#clipFrameScroll').width(w);
+            $('#mainFrame').height(h);
+            $('#clipFrameScroll').height(h);
+
+            var topPadding = MOBILE_DEVICE ? 0 : 10;
+            var leftPadding = 0;
+            var rightPadding = 0;
+            var bottomPadding = MOBILE_DEVICE ? 0 : 10;
+
+            w = w + leftPadding + rightPadding;
+            h = h + topPadding + bottomPadding;
+
+            var x = (mainPanelWidth - w) / 2;
+            var y = (mainPanelHeight - h) / 2 - 1;
+
+            if (scaleVal != 2) {
+                x = Math.max(0, x);
+                y = Math.max(0, y);
+            }
+            
+            $('#mainPanelContainer').attr({
+                "data-scale-shift-x": x,
+                "data-scale-shift-y": y,
+            });
+
+            $('#mainPanelContainer').css({
+                'margin': 'auto',
+                'top': y + 'px',
+                'left': (x < 0 ? x + 'px' : 'auto')
+            });
+
+            $('#clipFrameScroll').css({
+                'left': leftPadding + 'px',
+                'top': topPadding + 'px'
+            });
+
+            $('#mainPanelContainer').width(w);
+            $('#mainPanelContainer').height(h);
+        } else {
+            $('#mainFrame').width('100%');
+            $('#mainFrame').height(h);
+
+            $('#clipFrameScroll').width('100%');
+            $('#clipFrameScroll').height(h);
+            $('#clipFrameScroll').css({ 'left': '', 'top': '' });
+
+            $('#mainPanelContainer').width('100%');
+            $('#mainPanelContainer').height(h);
+            $('#mainPanelContainer').css({
+                'left': '',
+                'margin': '',
+                'top': ''
+            });
+        }
+        $axure.messageCenter.postMessage('setDeviceMode', { device: isDevice, width: w, scaleToWidth: (scaleVal == "1") });
+
+        $(".vpScaleOption").show();
+        var prevScaleN = $('#mainPanelContainer').css('transform');
+        prevScaleN = (prevScaleN == "none") ? 1 : Number(prevScaleN.substring(prevScaleN.indexOf('(') + 1, prevScaleN.indexOf(',')));
+        var newScaleN = 1;
+
+        $('#mainPanelContainer').css({
+            'transform': '',
+            'transform-origin': ''
+        });
+
+        var $leftPanel = $('.leftPanel:visible');
+        var leftPanelOffset = (!isMobileMode() && $leftPanel.length > 0) ? $leftPanel.width() : 0;
+        var $rightPanel = $('.rightPanel:visible');
+        var rightPanelOffset = (!isMobileMode() && $rightPanel.length > 0) ? $rightPanel.width() : 0;
+
+        var vpScaleData = {
+            scale: scaleVal,
+            prevScaleN: prevScaleN,
+            viewportHeight: h,
+            viewportWidth: w,
+            panelWidthOffset: leftPanelOffset + rightPanelOffset,
+            clipToView: clipToView
+        };
+        $axure.messageCenter.postMessage('getScale', vpScaleData);
+        $axure.messageCenter.postMessage('cloud_ScaleValueChanged', {
+            scale: selectedScaleValue,
+        });
+        if (scaleVal == '0' && clipToView) $('#mainPanel').css('overflow', 'auto');
+        else $('#mainPanel').css('overflow', '');
+    }
+
+    $axure.player.getProjectName = function getProjectName() {
+        if (typeof PREVIEW_INFO !== 'undefined') {
+            return PREVIEW_INFO.fileName;
+        } else if(typeof $axure.player.settings.projectName !== 'undefined') {
+            return $axure.player.settings.projectName;
+        } else return false;
+    }
+
+    function initializeLogo() {
+
+        if(typeof PREVIEW_INFO !== 'undefined') {
+            $('#previewNotice').show();
+        }
+
+        //if (typeof PREVIEW_INFO !== 'undefined') {
+        //    $('#interfaceControlFrameLogoCaptionContainer').html(PREVIEW_INFO.fileName);
+        //} else if (typeof $axure.player.settings.projectName !== 'undefined') {
+        //    $('#interfaceControlFrameLogoCaptionContainer').html($axure.player.settings.projectName);
+        //} else {
+        //    $('#interfaceControlFrameLogoCaptionContainer').hide();
+        //}
+
+        //if ($axure.document.configuration.logoImagePath) {
+        //    var image = new Image();
+        //    //image.onload = function () {
+        //    //    //$('#logoImage').css('max-width', this.width + 'px');
+        //    //    $('#interfaceControlFrameContainer').css('margin-left', '-' + $('#logoImage').width() / 2 + 'px');
+        //    //    //$axure.player.resizeContent();
+        //    //};
+        //    image.src = $axure.document.configuration.logoImagePath;
+
+        //    $('#interfaceControlFrameLogoImageContainer').html('<img id="logoImage" src="" />');
+        //    $('#logoImage').attr('src', $axure.document.configuration.logoImagePath);//.on('load', function () { $axure.player.resizeContent(); });
+        //} else $('#interfaceControlFrameLogoImageContainer').hide();
+
+        //if ($axure.document.configuration.logoImageCaption) {
+        //    $('#interfaceControlFrameLogoCaptionContainer').html($axure.document.configuration.logoImageCaption);
+        //} else $('#interfaceControlFrameLogoCaptionContainer').hide();
+
+        //if(!$('#interfaceControlFrameLogoImageContainer').is(':visible') && !$('#interfaceControlFrameLogoCaptionContainer').is(':visible')) {
+        //    $('#interfaceControlFrameLogoContainer').hide();
+        //}
+    }
+    
+    function initializePreview() {
+        if (typeof PREVIEW_INFO !== 'undefined') {
+            $('#separatorContainer').addClass('hasLeft');
+            $('#overflowMadeWith').addClass('preview');
+            
+            var callback = undefined;
+            $('#publishButton').click(function () {
+                $.ajax({
+                    type: 'GET',
+                    url: 'publish',
+                    data: {},
+                    success: function (response) {
+                        if (callback) callback(response);
+                    },
+                    error: function (response) {
+                        if (callback) callback(response);
+                    },
+                    dataType: 'jsonp'
+                });
+            });
+        }
+    }
+
+    var userAcct = {
+        userId: '',
+        userName: '',
+        userEmail: '',
+        userProfileImg: '',
+        isUsingAxureAcct: false,
+    }
+
+    var authCookieValue = null;
+    var userCookieValue = null;
+    var isSubInstance = false;
+    //var readOnlyMode = false;
+    //var readOnlyMessage = '';
+
+    // Watermark hints
+    // NOTE: The trailing characters serve to be a distinguishing element in case the user actually does use text similar to the hint.
+    var emailHint = "Email               ";
+    var passHint = "Password             ";
+
+    var feedbackServiceUrl = (window.AXSHARE_HOST_SECURE_URL || 'https://share.axure.com') + '/issue';
+    // Look at creating a new location to have GetShareStatus(FbEnabled replacement) and SafariAuth since they are more general calls that are not solely for feedback now
+    //var prototypeControlUrl = (window.AXSHARE_HOST_SECURE_URL || 'https://share.axure.com') + '/prototype';
+
+    // Checks if the browser is Safari 3.0+
+    // https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser
+    function isSafari() {
+        // Safari 3.0+ "[object HTMLElementConstructor]" 
+        var liveSafari = /constructor/i.test(window.HTMLElement) || (function (p) { return p.toString() === "[object SafariRemoteNotification]"; })(!window['safari'] || (typeof safari !== 'undefined' && safari.pushNotification));
+        return liveSafari || SAFARI || (IOS && $axure.utils.isShareApp());
+    };
+
+    var iosInnerHeight = (function () {
+        if (!navigator.userAgent.match(/iphone|ipod|ipad/i)) {
+            /**
+             * Avoids conditional logic in the implementation
+             * @return {number} - window's innerHeight measurement in pixels
+             */
+            return function () {
+                return window.innerHeight;
+            };
+        }
+
+        // Store initial orientation
+        var axis = Math.abs(window.orientation);
+        // And hoist cached dimensions
+        var dims = { w: 0, h: 0 };
+
+        /**
+         * Creates an element with a height of 100vh since iOS accurately
+         * reports vp height (but not window.innerHeight). Then destroy it.
+         */
+        var createRuler = function () {
+            var ruler = document.createElement('div');
+
+            ruler.style.position = 'fixed';
+            ruler.style.height = '100vh';
+            ruler.style.width = 0;
+            ruler.style.top = 0;
+
+            document.documentElement.appendChild(ruler);
+
+            // Set cache conscientious of device orientation
+            dims.w = axis === 90 ? ruler.offsetHeight : window.innerWidth;
+            dims.h = axis === 90 ? window.innerWidth : ruler.offsetHeight;
+
+            // Clean up after ourselves
+            document.documentElement.removeChild(ruler);
+            ruler = null;
+        };
+
+        // Measure once
+        createRuler();
+
+        /**
+         * Returns window's cached innerHeight measurement
+         * based on viewport height and device orientation
+         * @return {number} - window's innerHeight measurement in pixels
+         */
+        return function () {
+            if (Math.abs(window.orientation) !== 90) {
+                return dims.h;
+            }
+
+            return dims.w;
+        };
+    }());
+
+    function includeTokens(ajaxData, excludeUser) {
+        //If the authCookieValue is set (a password-protected local prototype), then send the
+        //token as well (because cookies don't always get sent to external domains)
+        if (authCookieValue) {
+            $.extend(ajaxData, { token: authCookieValue });
+        }
+        if (!excludeUser && userCookieValue) {
+            $.extend(ajaxData, { utoken: userCookieValue });
+        }
+    }
+
+    function setUserLoggedInStatus(response, safariAuthResponseProfile) {
+        if (!response.success) {
+            userAcct.isUsingAxureAcct = false;
+        } else {
+            if (safariAuthResponseProfile) response = safariAuthResponseProfile;
+            userAcct.userId = response.userId;
+            if (safariAuthResponseProfile) 
+                userAcct.userName = response.username == null || response.username.trim() === '' ? response.userEmail : response.username.trim();
+            else
+                userAcct.userName = response.nickname == null || response.nickname.trim() === '' ? response.userEmail : response.nickname.trim();
+            userAcct.userEmail = response.userEmail;
+            userAcct.userProfileImg = response.profileImageUrl;
+            userAcct.isUsingAxureAcct = true;
+
+            if (response.authToken != null) {
+                $axshare.setAuthCookie(response.authToken);
+                userCookieValue = response.authToken;
+            }
+        }
+
+        // If feedback is loaded, update feedback with new account information
+        if (typeof feedback !== 'undefined') feedback.updateUserAccountInfo(userAcct, authCookieValue, userCookieValue);
+    }
+
+    // TODO: for on prem, we need to use an ajax call directly to share instead of accounts
+    // Verify authentication against axure accounts
+    $axure.player.axureAuth = function axureAuth(callback) {
+        if (window.$axshare != null) {
+            $axshare.auth(function (response) {
+                if (response.success) {
+                    setUserLoggedInStatus(response);
+                } else {
+                    if (isSafari()) {
+                        var ajaxData = {
+                            userId: userAcct.isUsingAxureAcct ? userAcct.userId : ""
+                        };
+                        includeTokens(ajaxData);
+
+                        $.ajax({
+                            type: 'GET',
+                            url: feedbackServiceUrl + '/safariAuth',
+                            data: ajaxData,
+                            success: function (response) {
+                                if (!response.success) {
+                                    setUserLoggedInStatus(response);
+                                } else {
+                                    setUserLoggedInStatus(response, response.data.profile[userAcct.userId]);
+
+                                    if (callback != null) {
+                                        callback(response);
+                                    }
+                                }
+                            },
+                            dataType: 'jsonp'
+                        });
+                    } else {
+                        setUserLoggedInStatus(response);
+                    }
+                }
+
+                if (callback != null) {
+                    callback(response);
+                }
+
+            });
+        }
+    }
+
+    // TODO: for on prem, we need to use an ajax call directly to share instead of accounts
+    // Log into axure accounts
+    $axure.player.axureLogin = function axureLogin(email, password, success, failure, saml) {
+        if (window.$axshare != null) {
+            password = password === passHint ? "" : password;
+            $axshare.login(email, password, false, function (response) {
+                if (response.redirecturl !== "" && response.redirecturl != null) {
+                    saml(response);
+                    return;
+                }
+
+                if (response.success && (response.verified || isSubInstance)) {
+                    if (isSafari()) setUserLoggedInStatus(response);
+                    $axure.player.axureAuth(success);
+                } else {
+                    failure(response);
+                }
+            }, window.ON_PREM_LDAP_ENABLED);
+        } else {
+            failure();
+        }
+    }
+
+    function playerLogout() {
+        userAcct.isUsingAxureAcct = false;
+        userAcct.userId = '';
+        userAcct.userProfileImg = '';
+
+        // If feedback is loaded, update feedback with new account information
+        if (typeof feedback !== 'undefined') feedback.updateUserAccountInfo(userAcct);
+    }
+
+    $axure.player.logout = function (feedbackLogout) {
+        var completeLogout = playerLogout;
+        if (feedbackLogout) {
+            completeLogout = function () {
+                feedbackLogout();
+                playerLogout();
+            }
+        }
+        if (window.$axshare != null) {
+            $axshare.logout(completeLogout);
+        } else {
+            completeLogout();
+        }
+    }
+
+    /*
+    * TODO: Start of Login/Account Mgmt UI, which will need to be updated (currenly uses feedback9.css often)
+    */
+    function buildAccountLoginPopup() {
+        return [
+            '<div class="axClearMsgBubble_Player axureLoginBubble_Player">',
+            '   <div class="axureLoginBubbleContainer_Player">',
+            '       <span style="font-weight: bold; font-size: 10px;">Login into your Axure Cloud account</span>',
+            '       <input type="text" autocapitalize="none" name="email" class="axureEmail" style="margin-top: 7px;"/>',
+            '       <input name="password" autocapitalize="none" class="axurePassword" />',
+            '       <div class="feedbackGreenBtn_Player">LOG IN</div>',
+            '       <div class="errorMessage"></div>',
+            '       <div id="playerSignUpLink" style="text-align: right; margin-top: 5px; font-size: 10px;">',
+            '           <span>No account? <a class="axureSignUpLink" href="', window.AXSHARE_HOST_SECURE_URL, '" target="_blank">Sign Up</a></span>',
+            '       </div>',
+            '   </div>',
+            '</div>'
+        ].join("");
+    }
+
+    // Bind events to axure login speech bubble (watermark, login, errors, click outside)
+    function bindAxureLoginContainerEvent() {
+        var $container = $("#accountLoginContainer");
+        $container.find('input[name="email"]').addClass("watermark").val(emailHint).focus(function () {
+            if ($(this).val() === emailHint) {
+                $(this).removeClass("watermark").val("");
+            }
+        }).blur(function () {
+            if ($(this).val() === "") {
+                $(this).addClass("watermark").val(emailHint);
+            }
+
+            $container.find('.errorMessage').text('');
+            $container.find('.errorMessage').hide();
+        }).keyup(function (event) {
+            if (event.keyCode == 13) {
+                $container.find('.feedbackGreenBtn').click();
+            }
+        });
+        $container.find('input[name="password"]').addClass("watermark").val(passHint).focus(function () {
+            if ($(this).val() === passHint) {
+                $(this).removeClass("watermark").val("");
+                //$(this).removeClass("watermark").val("").attr("type", "password");
+
+                // Note: this might be an issue since jquery doesn't like it. Test in IE
+                $(this)[0].setAttribute('type', 'password');
+            }
+        }).blur(function () {
+            if ($(this).val() === "") {
+                $(this).val(passHint).addClass("watermark");
+                //$(this).val(passHint).addClass("watermark").removeAttr("type");
+
+                // Note: this might be an issue since jquery doesn't like it. Test in IE
+                $(this)[0].setAttribute('type', 'text');
+            }
+
+            $container.find('.errorMessage').text('');
+            $container.find('.errorMessage').hide();
+        }).keyup(function (event) {
+            if (event.keyCode == 13) {
+                $container.find('.feedbackGreenBtn_Player').click();
+            }
+        });
+
+        // Login Submit Event
+        $container.find('.feedbackGreenBtn_Player').click(function (e) {
+            var email = $container.find('.axureEmail').val();
+            var password = $container.find('.axurePassword').val();
+
+            $axure.player.axureLogin(email, password, function (response) {
+                // Success
+                // Clear out fields
+                $container.find('.axureEmail').val(emailHint).addClass("watermark");
+                $container.find('.axurePassword').val(passHint).addClass("watermark");
+                $container.find('.axurePassword')[0].setAttribute('type', 'text');
+
+                closePopup();
+            }, function (response) {
+                // Failure
+                $container.find('.errorMessage').text(response != null && response.message ? response.message : "There was an error connecting to the server, please try again later.");
+                $container.find('.errorMessage').show();
+            }, function (response) {
+                // SAML User
+                $container.find('.errorMessage').empty();
+                $container.find('.errorMessage').append("Please <a class='refreshLink' style='text-decoration: underline;'>refresh</a> this page after logging in via your identity provider.");
+                $container.find('.errorMessage').show();
+
+                window.open(response.redirecturl, '_blank');
+
+                $container.find('.errorMessage').find('.refreshLink').click(function () {
+                    location.reload(true);
+                });
+            });
+        });
+    };
+
+    function initializeSignIn() {
+        if (typeof PREVIEW_INFO === 'undefined' && $axure.player.settings.isAxshare) {
+            (function finishInit() {
+                if (window.$axshare == null || $axshare.auth == null || $axshare.login == null) {
+                    setTimeout(finishInit, 50);
+                } else {
+                    // Call to set readOnlyMode, readOnlyMessage, and isSubinstance (readOnlyMode/Message currently only used for feedback9)
+                    $.ajax({
+                        type: 'GET',
+                        url: feedbackServiceUrl + '/GetShareStatus',
+                        data: {},
+                        success: function (response) {
+                            //readOnlyMode = response.readOnlyMode;
+                            //readOnlyMessage = response.readOnlyMessage;
+                            isSubInstance = response.isSubInstance;
+                            if (isSubInstance) $('#accountLoginContainer').find("#playerSignUpLink").hide();
+
+                            // For now, calling methods to set these values in feedback on start (could later make a general method to retrieve these values from player)
+                            if (typeof feedback !== 'undefined') {
+                                feedback.setReadOnlyModeAndMessage(response.readOnlyMode, response.readOnlyMessage);
+                                feedback.setIsSubInstance(isSubInstance);
+                            }
+                        },
+                        dataType: 'jsonp'
+                    });
+
+                    // Login container
+                    $("#accountLoginContainer").append(buildAccountLoginPopup());
+                    bindAxureLoginContainerEvent();
+
+                    // Attempt to auth and acquire account information, then update top panel
+                    $axure.player.axureAuth();
+                }
+            })();
+        }
+    }
+
+    function overflowIsHidden(node) {
+        var style = getComputedStyle(node);
+        return style.overflow === 'hidden' || style.overflowX === 'hidden' || style.overflowY === 'hidden';
+    }
+
+    function findNearestScrollableParent(firstNode) {
+        var node = firstNode;
+        var scrollable = null;
+        while (!scrollable && node) {
+            if (node.scrollWidth > node.clientWidth || node.scrollHeight > node.clientHeight) {
+                if (!overflowIsHidden(node) || $(node).css('-webkit-overflow-scrolling') === 'touch') {
+                    scrollable = node;
+                }
+            }
+            node = node.parentNode;
+        }
+        return scrollable;
+    }
+
+    function getScrollOwner(target) {
+        var owner = findNearestScrollableParent(target);
+        if (!owner || owner === document.documentElement || owner === document.body || $(owner).parents('#topPanel').length || owner == document.getElementById('forwardSlash')) {
+            return null;
+        }
+
+        return owner;
+    }
+
+    function removeElasticScrollFromIframe() {
+        var $iframe = $($('#mainPanel').find('iframe')[0].contentWindow);
+        $iframe[0].document.body.addEventListener('touchmove', function (event) {
+            if (!getScrollOwner(event.target)) {
+                event.preventDefault();
+            }
+        }, { passive: false });
+    }
+
+    $(document).ready(function () {
+        (function finishPlayerInit() {
+            if ($axure.player.settings.isAxshare) {
+                $axure.page.bind('load.start', contentDocument_onload);
+                if ($axure.player.settings.loadFeedbackPlugin) {
+                    $axure.utils.loadJS('/Scripts/plugins/feedback/feedback9.js');
+
+                    /******* DEBUG: Allows for debugging/viewing feedback9.js in browser inspect mode ******/
+                    //var hdr = document.createElement('script');
+                    //hdr.type = "text/javascript"
+                    //hdr.src = '/Scripts/plugins/feedback/feedback9.js';
+                    //document.head.appendChild(hdr);
+                }
+            }
+
+            initializeEvents();
+            initializeMainFrame();
+
+            $('.leftPanel').width(0);
+
+            $('#maximizePanelContainer').hide();
+
+            if ($axure.player.settings.startCollapsed) {
+                collapse();
+                $('.leftPanel').width(0);
+
+                var maxPanelWidth = $('#maximizePanel').width();
+                setTimeout(function() {
+                    $('#maximizePanel').animate({
+                        left:'-' + maxPanelWidth + 'px'
+                    }, 300);
+                }, 2000);
+            }
+
+            if (MOBILE_DEVICE) {
+                $('body').removeClass('hashover');
+
+                if (SAFARI) {
+                    // Stop pinch zoom (stopping all gestures for now)
+                    // Gesturestart is only supported in Safari
+                    document.addEventListener("gesturestart", function (e) {
+                        e.preventDefault();
+                    });
+                }
+
+                if (IOS) {
+                    // Attempt at removing elastic scroll while in mobile menu
+                    var touching = false;
+                    var pageYStart = 0;
+                    var pageYOffset = 0;
+                    document.body.addEventListener('touchend', function (event) {
+                        if (getScrollOwner(event.target)) {
+                            touching = false;
+                        }
+                    }, { passive: false });
+
+                    document.body.addEventListener('touchmove', function (event) {
+                        var owner = getScrollOwner(event.target)
+                        if (!owner) {
+                            event.preventDefault();
+                        } else {
+                            if ($(owner).scrollTop() == 0) {
+                                if (touching) {
+                                    if (event.pageY >= pageYStart) {
+                                        event.preventDefault();
+                                    } 
+                                }
+                            }
+                            if ($(owner).scrollTop() + $(owner).height() == owner.scrollHeight) {
+                                if (touching) {
+                                    if (event.pageY <= pageYStart) {
+                                        event.preventDefault();
+                                    } 
+                                }
+                            }
+                        }
+                    }, { passive: false });
+
+                    document.body.addEventListener('touchstart', function (event) {
+                        var owner = getScrollOwner(event.target);
+                        if (owner) {
+                            if ($(owner).scrollTop() == 0) {
+                                touching = true;
+                                pageYStart = event.pageY;
+                                pageYOffset = event.pageY;
+                            }
+                            if ($(owner).scrollTop() + $(owner).height() == owner.scrollHeight) {
+                                touching = true;
+                                pageYStart = event.pageY;
+                                pageYOffset = event.pageY;
+                            }
+                        }
+                    }, { passive: false });
+
+                    removeElasticScrollFromIframe();
+
+                    $('html').css('-webkit-tap-highlight-color', 'transparent');
+
+                    // Stop iOS from automatically scaling parts of the mobile player
+                    // Could stop automatic scaling on Ipads as well that we actually want, but for now, seems fine
+                    $('body').css('-webkit-text-size-adjust', '100%');
+
+                    window.addEventListener("orientationchange", function () {
+                        var viewport = document.querySelector("meta[name=viewport]");
+                        //so iOS doesn't zoom when switching back to portrait
+                        if (IOS) {
+                            viewport.setAttribute('content', 'width=device-width, initial-scale=1.0, maximum-scale=1.0, viewport-fit=cover');
+                            viewport.setAttribute('content', 'width=device-width, initial-scale=1.0, viewport-fit=cover');
+                        } else {
+                            viewport.setAttribute('content', 'width=device-width, initial-scale=1.0, maximum-scale=1.0');
+                            viewport.setAttribute('content', 'width=device-width, initial-scale=1.0');
+                        }
+                        $axure.player.resizeContent();
+                    }, false);
+
+                    $axure.page.bind('load.start', function () {
+                        $axure.player.resizeContent();
+                    });
+
+                }
+
+                // Always append both mobile browser menu and native menu, as app might not have returned value signifying native at this point
+                appendNativePrototypeControlFrame();
+                appendMobileBrowserControlFrame();
+                appendProjectOptions();
+            }
+
+            initializeLogo();
+            initializePreview();
+
+            $axure.player.resizeContent(true);
+
+            // Has timeout to keep waiting to build sign in controls while axAccount is still loading
+            initializeSignIn();
+        })();
+    });
+
+    function appendProjectOptions() {
+        var toAppend = '';
+        toAppend += '<div id="projectOptionsHost" class="mobileOnlyPanel mobileMode">';
+        toAppend += '    <div class="pluginNameHeader">PROJECT OPTIONS</div>';
+        toAppend += '    <div id="projectOptionsScrollContainer">';
+        toAppend += '       <div class="mobileSubHeader">Hotspots</div>';
+        toAppend += '       <div id="projectOptionsShowHotspots" class="mobileText projectOptionsHotspotsRow" style="border-bottom: solid 1px #c7c7c7">';
+        toAppend += '           <div id="projectOptionsHotspotsCheckbox"></div>';
+        toAppend += '       Show Hotspots</div> ';
+        toAppend += '       <div class="mobileSubHeader" style="margin-top: 16px">Scale</div>';
+        toAppend += '       <div id="projectOptionsScaleContainer" class="mobileText"></div>';
+        toAppend += '       <div id="projectOptionsAdaptiveViewsHeader" class="mobileSubHeader" style="margin-top: 16px">Adaptive Views</div>';
+        toAppend += '       <div id="projectOptionsAdaptiveViewsContainer" class="mobileText"></div>'
+        toAppend += '    </div>'
+        toAppend += '</div>';
+
+        $('#mHideSidebar').prepend(toAppend);
+        $(('#projectOptionsHost')).click(function (e) { e.stopPropagation(); });
+
+        if (isMobileMode()) $axure.player.resizeContent();
+    }
+
+    function appendMobileBrowserControlFrame() {
+        var toAppend = "";
+        
+        toAppend += '<div id="mobileBrowserControlFrame" class="mobilePrototypeControlFrame">';
+        toAppend += '    <div id="return" style="width:100%; position:relative; top:-15px; float:left">';
+        toAppend += '        <div id="closeBackground" class="circleBackground">';
+        toAppend += '           <div id="forwardSlash" class="closeIconSlash"><div id="backwardSlash" class="closeIconSlash"></div></div>';
+        toAppend += '        </div>';
+        toAppend += '    </div>';
+        toAppend += '</div>';
+
+        $('#mobileControlFrameContainer').append(toAppend);
+
+        $('#closeBackground').click(collapse);
+
+        // iOS will do incorrect click position / content bounds calculation which results in scroll getting reset to (0, 0)
+        if (IOS) $('#mobileControlFrameContainer').on($axure.eventNames.mouseDownName, function (e) { e.stopPropagation(); });
+    }
+
+    function appendNativePrototypeControlFrame() {
+        var toAppend = "";
+        toAppend += '<div id="nativeAppControlFrame" class="mobilePrototypeControlFrame">';
+        toAppend += '    <ul id="nativeMenuBlueBackground">';
+        toAppend += '        <li style="width:30%; float:left;">';
+        toAppend += '           <div id="exit" class="nativePrototypeButton" >';
+        toAppend += '               <div>';
+        toAppend += '                   <div id="exitIcon"></div>';
+        toAppend += '                   <div id="exitText" class="nativeMenuText">Exit</div>';
+        toAppend += '               </div>';
+        toAppend += '           </div>';
+        toAppend += '        </li>';
+        toAppend += '        <li id="return" style="width:40%; position:relative; top:-15px; float:left">';
+        toAppend += '            <div id="returnBackground" class="circleBackground">';
+        toAppend += '                <div id="returnIcon"></div>';
+        toAppend += '            </div>';
+        toAppend += '            <div id="returnText" class="nativeMenuText">Return to Prototype</div>';
+        toAppend += '        </li>';
+        toAppend += '        <li style="width:30%; float:right;">';
+        toAppend += '           <div id="refresh" class="nativePrototypeButton" >';
+        toAppend += '               <div>';
+        toAppend += '                   <div id="refreshIcon"></div>';
+        toAppend += '                   <div id="refreshText" class="nativeMenuText">Refresh</div>';
+        toAppend += '               </div>';
+        toAppend += '           </div>';
+        toAppend += '        </li>';
+        toAppend += '    </ul>';
+        toAppend += '</div>';
+
+        $('#mobileControlFrameContainer').append(toAppend);
+
+        var barHeight = IOS ? '72px' : '60px';
+        var returnIconDisplacement = IOS ? '-15px': '-20px';
+        var iconTopMargin = IOS ? '14px': '7px';
+        var returnTextTopMargin = IOS ? '9px': '7px';
+
+        document.getElementById('nativeAppControlFrame').style.height = barHeight;
+        document.getElementById('nativeMenuBlueBackground').style.height = barHeight;
+        document.getElementById('return').style.top = returnIconDisplacement;
+        document.getElementById('returnText').style.marginTop = returnTextTopMargin;
+        document.getElementById('refreshIcon').style.marginTop = iconTopMargin;
+        document.getElementById('exitIcon').style.marginTop = iconTopMargin;
+        
+        addAppButtonClickListener("exit");
+        addAppButtonClickListener("refresh");
+
+        $('#returnBackground').click(collapse);
+        $('#nativeAppControlFrame').on('touchmove', function (e) {
+            e.stopPropagation();
+        }, false);
+    }
+
+    function addAppButtonClickListener(id) {
+        var func = function () { IOS ? window.webkit.messageHandlers.prototypeMenuButtonClick.postMessage(id) : ShareApp.PrototypeMenuButtonClick(id); };
+        document.getElementById(id).addEventListener("click", func, false);
+    }
+
+    function toggleSitemap() {
+        $axure.player.showPlugin(1);
+    }
+
+    function closePopup() {
+        var $container = $('.popup');
+        var isLeftPanel = $container.hasClass('leftPanel');
+        $container.removeClass('popup');
+        $('#overflowMenuButton').removeClass('selected');
+        $('#interfaceAdaptiveViewsContainer').removeClass('selected');
+        $container.hide();
+
+        $('div.splitterMask').unbind($axure.eventNames.mouseDownName, closePopup);
+        $('div.splitterMask').remove();
+    }
+
+    $axure.player.closePopup = closePopup;
+
+    function showPopup($container) {
+        if ($('#browserOutOfDateNotification').is(":visible")) return;
+        $container.addClass('popup');
+        $container.show();
+
+        $('<div class="splitterMask"></div>').insertAfter($container);
+        $('div.splitterMask').bind($axure.eventNames.mouseDownName, closePopup);
+    }
+
+    $axure.player.showPopup = showPopup;
+
+    function toggleAdaptiveViewsPopup() {
+        if (($('#interfaceAdaptiveViewsListContainer').hasClass('popup'))) {
+            closePopup();
+        } else {
+            $('#interfaceAdaptiveViewsContainer').addClass('selected');
+            showPopup($('#interfaceAdaptiveViewsListContainer'));
+        }
+    }
+
+    function toggleOverflowMenuPopup() {
+        if (($('#overflowMenuContainer').hasClass('popup'))) {
+            closePopup();
+        } else {
+            $('#overflowMenuButton').addClass('selected');
+            showPopup($('#overflowMenuContainer'));
+        }
+    }
+
+
+    var startSplitX;
+    var startSplitWidth;
+    function startLeftSplit() {
+        startSplitX = window.event.pageX;
+        startSplitWidth = lastLeftPanelWidth;
+        var $left = $('#lsplitbar');
+        $left.addClass('active');
+        $('<div class="splitterMask"></div>').insertAfter($left);
+        $(document).bind($axure.eventNames.mouseMoveName, doLeftSplitMove).bind($axure.eventNames.mouseUpName, endLeftSplitMove);
+    }
+
+    function startRightSplit() {
+        startSplitX = window.event.pageX;
+        startSplitWidth = lastRightPanelWidth;
+        var $left = $('#rsplitbar');
+        $left.addClass('active');
+        $('<div class="splitterMask"></div>').insertAfter($left);
+        $(document).bind($axure.eventNames.mouseMoveName, doRightSplitMove).bind($axure.eventNames.mouseUpName, endRightSplitMove);
+    }
+
+    function doLeftSplitMove() {
+        var currentX = window.event.pageX;
+        var newWidth = Math.min(startSplitWidth + currentX - startSplitX, $(window).width() - $('.rightPanel').width(), $(window).width() - lastRightPanelWidthDefault);
+        lastLeftPanelWidth = Math.max(lastLeftPanelWidthDefault, newWidth);
+        $('.leftPanel').width(lastLeftPanelWidth ? lastLeftPanelWidth : lastLeftPanelWidthDefault);
+        $('#lsplitbar').css('left', $('.leftPanel').width() - 4);
+        $axure.player.updateClippingBoundsWidth();
+        $axure.player.refreshViewPort();
+    }
+
+    function doRightSplitMove() {
+        var currentX = window.event.pageX;
+        var newWidth = Math.min(startSplitWidth - currentX + startSplitX, $(window).width() - $('.leftPanel').width(), $(window).width() - lastLeftPanelWidthDefault);
+        lastRightPanelWidth = Math.max(lastRightPanelWidthDefault, newWidth);
+        $('.rightPanel').width(lastRightPanelWidth ? lastRightPanelWidth : lastRightPanelWidthDefault);
+        $('#rsplitbar').css('left', $(window).width() - $('.rightPanel').width());
+        $axure.player.updateClippingBoundsWidth();
+        $axure.player.refreshViewPort();
+    }
+
+    function endLeftSplitMove() {
+        $('div.splitterMask').remove();
+        var $left = $('#lsplitbar');
+        $left.removeClass('active');
+        $(document).unbind($axure.eventNames.mouseMoveName, doLeftSplitMove).unbind($axure.eventNames.mouseUpName, endLeftSplitMove);
+        setAdaptiveView()
+    }
+
+    function endRightSplitMove() {
+        $('div.splitterMask').remove();
+        var $left = $('#rsplitbar');
+        $left.removeClass('active');
+        $(document).unbind($axure.eventNames.mouseMoveName, doRightSplitMove).unbind($axure.eventNames.mouseUpName, endRightSplitMove);
+        setAdaptiveView()
+    }
+
+
+    var startMX;
+    var startMLeft;
+    var startMElement;
+    var maxMLeft;
+    var getMaxMLeft = function () {
+        if ($('.rightPanel.mobileMode').length == 0) return $('.leftPanel.mobileMode').last().position().left + 100;
+        return $('.rightPanel.mobileMode').last().position().left + 100;
+    }
+
+    function startM(e) {
+        // Android touch event does not define pageX directly
+        if(window.event.pageX) {
+            startMX = window.event.pageX;
+        } else {
+            startMX = window.event.touches[0].pageX;
+        }
+
+        startMElement = window.event.target.id;
+        var $m = $('#mHideSidebar');
+        startMLeft = Number($m.css('left').replace('px', ''));
+        $(document).bind($axure.eventNames.mouseMoveName, doMMove).bind($axure.eventNames.mouseUpName, endMMove);
+
+        // Must stop propagation on iOS; otherwise scroll position of content will be reset to (0, 0)
+        // (likely due to position of click being calculated as out of bounds for outerContainer -- iOS is not adding scroll offset to bounds)
+        if (IOS) { e.stopPropagation() };
+    }
+
+    function doMMove() {
+        var $m = $('#mHideSidebar');
+        if(window.event.pageX) {
+            currentX = window.event.pageX;
+        } else {
+            currentX = window.event.touches[0].pageX;
+        }
+
+        var deltaX = currentX - startMX;
+        if (Math.abs(deltaX) > 0 && $('.splitterMask').length == 0) {
+            $('<div class="splitterMask"></div>').insertAfter($m);
+        }
+        var newLeft = startMLeft + deltaX;
+        newLeft = Math.min(0, newLeft);
+        newLeft = Math.max(-getMaxMLeft(), newLeft);
+        $m.css('left', newLeft + 'px');
+    }
+
+    function endMMove(e) {
+        $('div.splitterMask').remove();
+        $(document).unbind($axure.eventNames.mouseMoveName, doMMove).unbind($axure.eventNames.mouseUpName, endMMove);
+        e.stopPropagation();
+
+        var $m = $('#mHideSidebar');
+        if(window.event.pageX) {
+            currentX = window.event.pageX;
+        } else {
+            currentX = window.event.changedTouches[0].pageX;
+        }
+        var deltaX = currentX - startMX;
+        if (deltaX != 0 || startMElement != 'mHideSidebar') {
+            adjustM(currentX < startMX ? 'left' : 'right', true);
+        }
+    }
+
+    function adjustM(direction, animate) {
+        var $m = $('#mHideSidebar');
+        var duration = animate ? 100 : 0;
+        var newLeft = Number($m.css('left').replace('px', ''));
+        if (!$m.is(':visible') || newLeft > -100) {
+            $m.animate({ 'left': '-60px' }, duration);
+        } else if (newLeft < -getMaxMLeft() + 100) {
+            $m.animate({ 'left': (-getMaxMLeft() + 125) + 'px' }, duration);
+        } else if (direction == 'left') {
+            var handled = false;
+            var $panels = $('.rightPanel.mobileMode, .leftPanel.mobileMode');
+            $panels.each(function () {
+                var panelX = $(this).position().left;
+                if (panelX > -newLeft) {
+                    $m.animate({ 'left': (-panelX + 25) + 'px' }, duration);
+                    handled = true;
+                    return false;
+                }
+            });
+            if (!handled) {
+                $m.animate({ 'left': (-$panels.last().position().left + 25) + 'px' }, duration);
+            }
+        } else if (direction == 'right') {
+            var handled = false;
+            var $panels = $('.rightPanel.mobileMode, .leftPanel.mobileMode');
+            $($panels.get().reverse()).each(function () {
+                var panelRight = $(this).position().left + $(this).width();
+                if (panelRight < -newLeft + $(window).width()) {
+                    $m.animate({ 'left': (-$(this).position().left + 25) + 'px' }, duration);
+                    handled = true;
+                    return false;
+                }
+            });
+            if (!handled) {
+                $m.animate({ 'left': '-60px' }, duration);
+            }
+        }
+    }
+
+    function repositionPinsOnScaleChange(data) {
+        var $pins = $('#existingPinsOverlay').children();
+        for (var i = 0; i < $pins.length; i++) {
+            // calculate new position of pin
+            const left = parseFloat($($pins[i]).attr('data-x'));
+            const top = parseFloat($($pins[i]).attr('data-y'));
+            const width = $($pins[i]).width();
+            const height = $($pins[i]).height();
+
+            // Get current scale of mainPanelContainer
+            // MainPanelContainer scaled without setContentScale message
+            var scale = $('#mainPanelContainer').css('transform');
+            scale = (scale == "none") ? 1 : Number(scale.substring(scale.indexOf('(') + 1, scale.indexOf(',')));
+            const scaledLeft = (left * scale) - (width / 2);
+            const scaledTop = (top * scale) - (height / 2);
+
+
+            $($pins[i]).css('left', scaledLeft + 'px');
+            $($pins[i]).css('top', scaledTop + 'px');
+        }
+
+        // Distance from left of project content to origin (used for pins positioning when on a centered page in Scale to Fit mode)
+        if (typeof data.contentOriginOffset !== "undefined") contentLeftOfOriginOffset = data.contentOriginOffset;
+    }
+
+    function messageCenter_message(message, data) {
+        if (message == 'expandFrame') expand();
+        else if (message == 'getCollapseFrameOnLoad' && $axure.player.settings.startCollapsed && !MOBILE_DEVICE) $axure.messageCenter.postMessage('collapseFrameOnLoad');
+        else if (message == 'tripleClick') {
+            if ($axure.player.isMobileMode() || MOBILE_DEVICE) expand();
+        } else if (message == 'setContentScale') {
+            if (data.clipToView) {
+                var scaleVal = $('.vpScaleOption').find('.selectedRadioButton').parent().attr('val');
+                if (scaleVal == '2' || (!MOBILE_DEVICE && scaleVal == '0')) {
+                    var scaleN = newScaleN = $('#mainPanel').width() / data.viewportWidth;
+                    var hScaleN = ($('#mainPanel').height()) / data.viewportHeight;
+                    if (hScaleN < scaleN) scaleN = newScaleN = hScaleN;
+                    if(scaleVal == '0') scaleN = Math.min(1, scaleN);
+                    var scale = 'scale(' + scaleN + ')';
+                    $('#mainPanelContainer').css({
+                        'transform': scale,
+                        'transform-origin': ''
+                    });
+                }
+            } else {
+                if (data.scaleN != 1) {
+                    var scale = 'scale(' + data.scaleN + ')';
+                    var width = 100 / data.scaleN + '%';
+                    var height = Number($('#mainPanelContainer').css('height').replace('px', '')) / data.scaleN + 'px';
+                    $('#mainPanelContainer').css({
+                        'transform': scale,
+                        'transform-origin': '0px 0px',
+                        'width': width,
+                        'height': height
+                    });
+                    //$('#clipFrameScroll').css('height' , height + 'px');
+                    //$('#mainFrame').css('height' , height + 'px');
+                    $('#clipFrameScroll').height(height);
+                    $('#mainFrame').height(height);
+                }
+            }
+            
+            repositionPinsOnScaleChange(data);
+            repositionClippingBoundsScroll();
+            // Fix for edge not redrawing content after scale change
+            if ($axure.browser.isEdge) {
+                newHeight = window.innerHeight - ((!isMobileMode() && $('#topPanel').is(':visible')) ? $('#topPanel').height() : 0);
+                newWidth = $(window).width();
+                $('#outerContainer').height(newHeight).width(newWidth);
+                $('#mainPanel').height(newHeight);
+                $('#clippingBounds').height(newHeight);
+            }
+        }
+    }
+
+    function loadVariablesFromUrl(removeVarFromUrl) {
+        let originalHashValues = window.location.href.substr(window.location.href.indexOf('#')) || '';
+        let variables = {};
+        const query = (originalHashValues.split(GLOBAL_VAR_NAME)[1] || '');
+        
+        if(query.length > 0) {
+            $axure.utils.parseGlobalVars(query, function(varName, varValue) {
+                variables[varName] = varValue;
+            });
+            
+            if(removeVarFromUrl) {
+                originalHashValues = originalHashValues.replace(GLOBAL_VAR_NAME, "").replace(query, "");
+                replaceHash(originalHashValues);
+            }
+        }
+
+        return variables;
+    }
+    
+    function getInitialUrl() {
+        var shortId = getHashStringVar(PAGE_ID_NAME);
+        var foundById = [];
+        if (shortId.length > 0) {
+            getPageUrlsById(shortId, foundById, undefined);
+            if (foundById.length == 1) return foundById[0];
+        }
+
+        var pageName = getHashStringVar(PAGE_URL_NAME);
+        if (pageName.length > 0) return pageName + ".html";
+        else {
+            if (foundById.length > 0) return foundById[0];
+            var url = getFirstPageUrl($axure.document.sitemap.rootNodes);
+            return (url ? url : "about:blank");
+        }
+    }
+
+    var getPageUrlsById = $axure.player.getPageUrlsById = function (packageId, foundById, nodes) {
+        if (!nodes) nodes = $axure.document.sitemap.rootNodes;
+        for (var i = 0; i < nodes.length; i++) {
+            var node = nodes[i];
+            if (node.id == packageId) foundById.push(node.url);
+            var hasChildren = (node.children && node.children.length > 0);
+            if (hasChildren) {
+                getPageUrlsById(packageId, foundById, node.children);
+            }
+        }
+    }
+
+    var getPageIdByUrl = $axure.player.getPageIdByUrl = function(url, nodes) {
+        if (!nodes) nodes = $axure.document.sitemap.rootNodes;
+        for (var i = 0; i < nodes.length; i++) {
+            var node = nodes[i];
+            if (node.url == url) return node.id;
+            else {
+                var hasChildren = (node.children && node.children.length > 0);
+                if (hasChildren) {
+                    var id = getPageIdByUrl(url, node.children);
+                    if (id) return id;
+                }
+            }
+        }
+        return null;
+    }
+
+    function getFirstPageUrl(nodes) {
+        for (var i = 0; i < nodes.length; i++) {
+            var node = nodes[i];
+            if (node.url) return node.url;
+            else {
+                var hasChildren = (node.children && node.children.length > 0);
+                if (hasChildren) {
+                    var url = getFirstPageUrl(node.children);
+                    if (url) return url;
+                }
+            }
+        }
+        return null;
+    }
+
+    function closePlayer() {
+        if ($axure.page.location) window.location.href = $axure.page.location;
+        else {
+            var pageFile = getInitialUrl();
+            var currentLocation = window.location.toString();
+            window.location.href = currentLocation.substr(0, currentLocation.lastIndexOf("/") + 1) + pageFile;
+        }
+    }
+
+    function replaceHash(newHash) {
+        var currentLocWithoutHash = window.location.toString().split('#')[0];
+
+        //We use replace so that every hash change doesn't get appended to the history stack.
+        //We use replaceState in browsers that support it, else replace the location
+        if (typeof window.history.replaceState != 'undefined') {
+            try {
+                //Chrome 45 (Version 45.0.2454.85 m) started throwing an error here when generated locally (this only happens with sitemap open) which broke all interactions.
+                //try catch breaks the url adjusting nicely when the sitemap is open, but all interactions and forward and back buttons work.
+                //Uncaught SecurityError: Failed to execute 'replaceState' on 'History': A history state object with URL 'file:///C:/Users/Ian/Documents/Axure/HTML/Untitled/start.html#p=home' cannot be created in a document with origin 'null'.
+                window.history.replaceState(null, null, currentLocWithoutHash + newHash);
+            } catch (ex) { }
+        } else {
+            window.location.replace(currentLocWithoutHash + newHash);
+        }
+    }
+
+    function collapse() {
+        if (IOS) {
+            $('body').off('touchstart');
+            $('body').off('touchend');
+        }
+
+        if ($axure.player.isMobileMode()) {
+            $('#mHideSidebar').hide();
+            $('#nativeAppControlFrame').hide();
+            $('#mobileBrowserControlFrame').hide();
+        } else {
+            $axure.player.deleteVarFromCurrentUrlHash('g');
+            $axure.player.setVarInCurrentUrlHash('c', 1);
+            if (!MOBILE_DEVICE) $('#maximizePanelContainer').show();
+            lastLeftPanelWidth = $('.leftPanel').width();
+            lastRightPanelWidth = $('.rightPanel').width();
+
+            $('.leftPanel').hide();
+            $('.rightPanel').hide();
+            $('#topPanel').hide();
+
+            $('.splitbar').hide();
+            $('#mainPanel').width($(window).width());
+            $('#clippingBounds').width($(window).width());
+            $('#clippingBounds').css('left', '0px');
+            $(window).resize();
+
+            $(document).trigger('sidebarCollapse');
+            $('#maximizeButton').addClass('rotated');
+        }
+    }
+
+    function expand() {
+        if ($axure.player.isMobileMode()) {
+            $('#mHideSidebar').show();
+            $('#mobileControlFrameContainer').show();
+            $axure.utils.isShareApp() ? $('#nativeAppControlFrame').show() : $('#mobileBrowserControlFrame').show();
+        } else {
+            $minimizeContainer = $('#interfaceControlFrameMinimizeContainer');
+            $minimizeContainer.removeClass('collapseHovered');
+            $axure.player.deleteVarFromCurrentUrlHash('c');
+            $('#maximizeButton').removeClass('rotated');
+            $('#maximizePanelContainer').hide();
+            $axure.player.restorePlugins();
+            $('#topPanel').show();
+            $(window).resize();
+
+            $(document).trigger('sidebarExpanded');
+        }
+    }
+
+
+    function mainFrame_onload() {
+        if ($axure.page.pageName) document.title = $axure.page.pageName;
+    }
+
+    function getQueryString(query) {
+        var qstring = self.location.href.split("?");
+        if (qstring.length < 2) return "";
+        return GetParameter(qstring, query);
+    }
+
+    function GetParameter(qstring, query) {
+        var prms = qstring[1].split("&");
+        var frmelements = new Array();
+        var currprmeter, querystr = "";
+
+        for (var i = 0; i < prms.length; i++) {
+            currprmeter = prms[i].split("=");
+            frmelements[i] = new Array();
+            frmelements[i][0] = currprmeter[0];
+            frmelements[i][1] = currprmeter[1];
+        }
+
+        for (j = 0; j < frmelements.length; j++) {
+            if (frmelements[j][0].toLowerCase() == query.toLowerCase()) {
+                querystr = frmelements[j][1];
+                break;
+            }
+        }
+        return querystr;
+    }
+    
+    $axure.player.setVarInCurrentUrlHash = function(varName, varVal) {
+        var newHash = $axure.utils.setHashStringVar(window.location.hash, varName, varVal);
+
+        if (newHash != null) {
+            replaceHash(newHash);
+        }
+    }
+
+    function deleteHashStringVar(currentHash, varName) {
+        var varWithEqual = varName + '=';
+
+        var pageIndex = currentHash.indexOf('#' + varWithEqual);
+        if (pageIndex == -1) pageIndex = currentHash.indexOf('&' + varWithEqual);
+        if (pageIndex != -1) {
+            var newHash = currentHash.substring(0, pageIndex);
+
+            var ampIndex = currentHash.indexOf('&', pageIndex + 1);
+
+            //IF begin of string....if none blank, ELSE # instead of & and rest
+            //IF in string....prefix + if none blank, ELSE &-rest
+            if (newHash == '') { //beginning of string
+                newHash = ampIndex != -1 ? '#' + currentHash.substring(ampIndex + 1) : '';
+            } else { //somewhere in the middle
+                newHash = newHash + (ampIndex != -1 ? currentHash.substring(ampIndex) : '');
+            }
+
+            return newHash;
+        }
+
+        return null;
+    }
+
+    $axure.player.deleteVarFromCurrentUrlHash = function(varName) {
+        var newHash = deleteHashStringVar(window.location.hash, varName);
+
+        if (newHash != null) {
+            replaceHash(newHash);
+        }
+    };
+
+    function setUpController() {
+
+        //$axure.utils = _axUtils;
+
+        var _page = {};
+        $axure.page = _page;
+
+        $axure.utils.makeBindable(_page, ['load']);
+
+        var _player = function () {
+        };
+        $axure.player = _player;
+
+        //-----------------------------------------
+        //Global Var array, getLinkUrl function and setGlobalVar listener are
+        //for use in setting global vars in page url string when clicking a 
+        //page in the sitemap
+        //NEW: this is now also used when navigating to a new window/popup,
+        //if there are global variables on the urls
+        //-----------------------------------------
+        var _globalVars = loadVariablesFromUrl(true);
+
+        //-----------------------------------------
+        //Used by getLinkUrl below to check if local server is running 
+        //in order to send back the global variables as a query string
+        //in the page url
+        //-----------------------------------------
+        var _shouldSendVarsToServer = function () {
+            //If exception occurs (due to page in content frame being from a different domain, etc)
+            //then run the check without the url (which will end up checking against sitemap url)
+            try {
+                var mainFrame = document.getElementById("mainFrame");
+                return $axure.shouldSendVarsToServer(mainFrame.contentWindow.location.href);
+            } catch (e) {
+                return $axure.shouldSendVarsToServer();
+            }
+        };
+
+        var _getLinkUrl = function (baseUrl) {
+            var toAdd = '';
+            for (var globalVarName in _globalVars) {
+                var val = _globalVars[globalVarName];
+                if (val != null) {
+                    if (toAdd.length > 0) toAdd += '&';
+                    toAdd += globalVarName + '=' + encodeURIComponent(val);
+                }
+            }
+            return toAdd.length > 0 ? baseUrl + (_shouldSendVarsToServer() ? '?' : '#') + toAdd + "&CSUM=1" : baseUrl;
+        };
+        $axure.getLinkUrlWithVars = _getLinkUrl;
+
+        $axure.messageCenter.addMessageListener(function (message, data) {
+            if (message == 'setGlobalVar') {
+                _globalVars[data.globalVarName] = data.globalVarValue;
+            }
+        });
+
+        $axure.messageCenter.addStateListener('page.data', function (key, value) {
+            for (var subKey in value) {
+                _page[subKey] = value[subKey];
+            }
+            $axure.page.triggerEvent('load');
+        });
+
+        // ---------------------------------------------
+        // Navigates the main frame (setting the currently visible page). If the link is relative,
+        // this method should test if it is actually a axure rp page being loaded and properly set
+        // up all the controller for the page if it is
+        // ---------------------------------------------
+        _page.navigate = function (url, includeVariables) {
+            var mainFrame = document.getElementById("mainFrame");
+            //var mainFrame = window.parent.mainFrame;
+            // if this is a relative url...
+            var urlToLoad;
+            if (url.indexOf(':') < 0 || url[0] == '/') {
+                var winHref = window.location.href;
+                var page = winHref.substring(0, winHref.lastIndexOf('/') + 1) + url;
+                urlToLoad = page;
+            } else {
+                urlToLoad = url;
+            }
+            if (!includeVariables) {
+                mainFrame.contentWindow.location.href = urlToLoad;
+                return;
+            }
+            var urlWithVars = $axure.getLinkUrlWithVars(urlToLoad);
+            var currentData = $axure.messageCenter.getState('page.data');
+            var currentUrl = currentData && currentData.location;
+            if (currentUrl && currentUrl.indexOf('#') != -1) currentUrl = currentUrl.substring(0, currentUrl.indexOf('#'))
+
+            // this is so we can make sure the current frame reloads if the variables have changed
+            // by default, if the location is the same but the hash code is different, the browser will not
+            // trigger a reload
+            mainFrame.contentWindow.location.href =
+                currentUrl && urlToLoad.toLowerCase() != currentUrl.toLowerCase()
+                    ? urlWithVars
+                    : 'resources/reload.html#' + encodeURI(urlWithVars);
+
+        };
+
+        var pluginIds = [];
+        var plugins = {};
+        var currentVisibleHostId = {};
+        // ---------------------------------------------
+        // Adds a tool box frame from a url to the interface. This is useful for loading plugins
+        // settings is an object that supports the following properties:
+        //    - id : the id of the element for the plugin
+        //    - context : the context to create the plugin host for
+        //    - title : the user-visible caption for the plugin
+        // ---------------------------------------------
+        _player.createPluginHost = function (settings) {
+            if (!settings.context || !(settings.context === 'project' || settings.context === 'inspect')) {
+                //throw ('unknown context type');
+                return false;
+            }
+
+            if (settings.id == 'feedbackHost')
+                $('#overflowMenuContainer').prepend('<div id="showCommentsOption" class="showOption" style="order: 2"><div class="overflowOptionCheckbox"></div>Show Comments</div>');
+
+            if (!settings.id) throw ('each plugin host needs an id');
+
+            if (typeof PREVIEW_INFO === 'undefined') {
+                //  Share-Hosted Prototype
+                if (settings.id == 'debugHost') { return false; }
+                if (settings.id == 'handoffHost') { $('#handoffControlFrameHeaderContainer').show(); }
+            } else {
+                // Preview Mode
+                if (settings.id == 'handoffHost') { return false; }
+            }
+
+            pluginIds[pluginIds.length] = settings.id;
+            plugins[settings.id] = settings;
+
+            var hostContainerId = settings.context + 'ControlFrameHostContainer';
+            hostContainerId = _player.isMobileMode() ? 'mHideSidebar' : 'outerContainer';
+            var panelClass = 'rightPanel';
+            var host;
+            if (settings.context == 'project') {
+                panelClass = 'leftPanel';
+                if (_player.isMobileMode() && $('#' + hostContainerId).find('#projectOptionsHost').length > 0) {
+                    host = $('<div id="' + settings.id + '" class="' + panelClass + '"></div>')
+                        .insertAfter('#projectOptionsHost');
+                } else {
+                    host = $('<div id="' + settings.id + '" class="' + panelClass + '"></div>')
+                        .prependTo('#' + hostContainerId);
+                }
+            } else {
+                if (!$('#separatorContainer').hasClass('hasLeft')) $('#separatorContainer').addClass('hasLeft');
+                host = $('<div id="' + settings.id + '" class="' + panelClass + '"></div>')
+                    .appendTo('#' + hostContainerId);
+            }
+
+            $(('#' + settings.id)).click(function (e) { e.stopPropagation(); });
+
+            var controlContainerId = getControlContainerId(settings.id);
+
+
+            if (!_player.isMobileMode()) host.hide();
+            else _player.updatePlugins();
+
+            // TODO: border radius in ie and edge causes image to be blurry (for now, just remove border-radius)
+            var style = (IE || $axure.browser.isEdge) ? '" style="border-radius: 0': '';
+            var headerLink = $('<a pluginId="' + settings.id + '" title="' + settings.title + style + '" >' + (settings.context === 'inspect' ? ('<span>' + '</span>'): '&nbsp;') + '</a>');
+            headerLink.mousedown($axure.utils.curry(interfaceControlHeaderButton_click, settings.id)).wrap('<li id="' + settings.id + 'Btn"' + (settings.id == "handoffHost" ? ' style="display: none"' : '') + '>');
+
+            headerLink.parent().appendTo('#' + controlContainerId);
+
+            if (_player.isMobileMode()) $axure.player.resizeContent();
+
+            $(document).trigger('pluginCreated', [settings.gid]);
+        };
+
+        var getControlContainerId = function (id) {
+            return plugins[id].context + 'ControlFrameHeader';
+        }
+
+        var getVisiblePlugins = function () {
+            var ids = '';
+            for (var id in plugins) {
+                var context = plugins[id].context;
+                if (currentVisibleHostId[context] == id) {
+                    ids += plugins[id].gid;
+                }
+            }
+            return ids;
+        }
+
+        _player.pluginVisibleChanged = function(hostId, visible) {
+            if (plugins[hostId]) {
+                $axure.messageCenter.postMessage('pluginVisibleChanged', { id: hostId, gid: plugins[hostId].gid, visible: visible });
+            }
+        }
+
+        var interfaceControlHeaderButton_click = function (id) {
+            if (_player.isAnimating) { return; }
+            $axure.player.closePopup();
+
+            var controlContainerId = getControlContainerId(id);
+            var context = plugins[id].context;
+
+            var clickedPlugin = $('#' + controlContainerId + ' a[pluginId=' + id + ']');
+            if (currentVisibleHostId[context] == id) {
+                clickedPlugin.removeClass('selected');
+                if (id == "sitemapHost") { $('#sitemapControlFrameContainer').removeClass('selected'); }
+                currentVisibleHostId[context] = -1;
+                _player.collapseToBar(context, id);
+                
+                $(document).trigger('pluginShown', [getVisiblePlugins()]);
+            } else {
+                $('#' + controlContainerId + ' a').removeClass('selected');
+                clickedPlugin.addClass('selected');
+                if (id == "sitemapHost") { $('#sitemapControlFrameContainer').addClass('selected'); }
+
+                $('#' + currentVisibleHostId[context]).hide();
+                $axure.player.pluginVisibleChanged(currentVisibleHostId[context], false);
+                currentVisibleHostId[context] = id;
+                _player.expandFromBar(id, context);
+
+                $(document).trigger('pluginShown', [getVisiblePlugins()]);
+            }
+        };
+
+        _player.pluginClose = function (id) {
+            var controlContainerId = getControlContainerId(id);
+            var context = plugins[id].context;
+
+            var clickedPlugin = $('#' + controlContainerId + ' a[pluginId=' + id + ']');
+            if (!clickedPlugin.hasClass('selected')) { return; }
+            clickedPlugin.removeClass('selected');
+            currentVisibleHostId[context] = -1;
+            _player.collapseToBar(context, id);
+
+            $(document).trigger('pluginShown', [getVisiblePlugins()]);
+        };
+
+        _player.showPlugin = function (gid) {
+            for (var id in plugins) {
+                if (plugins[id].gid == gid) {
+                    interfaceControlHeaderButton_click(id);
+                    break;
+                }
+            }
+        };
+
+        _player.restorePlugins = function () {
+            var selectedPluginsCount = 0;
+            for (var id in plugins) {
+                var clickedPlugin = $('#' + getControlContainerId(id) + ' a[pluginId=' + id + ']');
+                if (clickedPlugin.hasClass('selected')) selectedPluginsCount++;
+            }
+            if ($axure.player.settings.isAxshare && selectedPluginsCount != 0) $('#clippingBoundsScrollContainer').hide();
+
+            var selectedPluginsSeen = 0;
+            for (var id in plugins) {
+                var controlContainerId = getControlContainerId(id);
+                var context = plugins[id].context;
+                var clickedPlugin = $('#' + controlContainerId + ' a[pluginId=' + id + ']');
+                if (clickedPlugin.hasClass('selected')) {
+                    //_player.showPlugin(id);
+                    // TODO: handoffHost would need center inspect icon highlighted and rightFrameIcon set to visible
+                    //if (id == 'handoffHost') { } 
+                    //$('#' + id).show();
+                    selectedPluginsSeen++;
+                    _player.expandFromBar(id, context, selectedPluginsCount == selectedPluginsSeen);
+                } else {
+                    $('#' + id).hide();
+                }
+            }
+            $(document).trigger('pluginShown', [getVisiblePlugins()]);
+        };
+
+        _player.navigateToIssue = function (issueId) {
+            if (typeof feedback !== 'undefined') {
+                feedback.navigateToIssue(issueId);
+            }
+        };
+    }
+
+
+    $axure.player.hideAllPlayerControllers = function(isVisible) {
+        // TOOD: Verify that the containers are set to the right state after re-enabling them
+        if(isVisible) {
+            $('#topPanel').css('display', '');
+            $('#popupContainer').css('display', '');
+            $('#maximizePanelContainer').css('display', '');        
+            $('#mobileControlFrameContainer').css('display', '');
+        } else {
+            $('#topPanel').hide();
+            $('#popupContainer').hide();
+            $('#maximizePanelContainer').hide();        // TODO: This needs to have a function where it prevents itself from showing up externally
+            $('#mobileControlFrameContainer').hide();
+        }
+    }
+
+
+    // TODO: General function to add bezels/overlays if applicable
+    $axure.player.addDeviceFraming = function (project, isEdit) {
+        // Temporary
+        var devices = {
+            iPhone8: 0,
+            iPhone8Plus: 1,
+            iPhoneSE: 2,
+            iPhoneX: 3,
+            iPad4: 4,
+            GalaxyS8: 5,
+            Pixel2: 6,
+            Pixel2XL: 7,
+            Mobile: 8,
+            Tablet9: 9,
+            Tablet7: 10,
+            Custom: 11,
+            Web: 12
+        };
+
+        // TODO: Need to bring over some platform functionality -> function might not be present
+        if (!$axure.player.settings.isExpo || project.Platform.Device === 12) { return; }
+
+        // TODO: Generate html for overlay and bezel containers
+        // TODO: Determine if preview player or full prototype player to establish where containers will be stored
+        var currDevice = project.Platform.Device;
+        var rootPath = '../../Scripts/Expo/StaticContent/resources/images/mobile/';
+        var framePath, overlayPath;
+
+        var $overlayParent = $(window.parent.parent.document).find('#previewPlayerDiv');
+        $overlayParent = isEdit && $overlayParent.length !== 0 ? $overlayParent : $('#mainPanelContainer');
+
+        $overlayParent.css('overflow', 'visible');
+
+        // TODO: Import enum of Device types -> import via TS definitions. WILL NEED TO REMEMBER THAT WE NEED TO SYNC SERVER AND CLIENT SIDE
+        // TODO: Create mapping of required images to device type
+        // images will be stored in ../../images/mobile
+        // TODO: Manage resizing
+        // TODO: Manage pointer clicks
+        // TODO: Status bar -> Default or via settings
+
+
+        // TODO: Establish img paths
+        switch (currDevice) {
+            case devices.iPhone8:
+            case devices.iPhone8Plus:
+                framePath = rootPath + 'iphone.svg';
+                overlayPath = "";
+                break;
+            case devices.iPhoneSE:
+                break;
+            case devices.iPhoneX:
+                framePath = "";
+                overlayPath = "";
+                break;
+            case devices.iPad4:
+                break;
+            case devices.Pixel2:
+                break;
+            case devices.Pixel2XL:
+                break;
+            case devices.GalaxyS8:
+                break;
+            case devices.Mobile:
+            case devices.Tablet7:
+            case devices.Tablet9:
+            case devices.Custom:
+            default:
+                break;
+        }
+
+        // TODO: Append images
+        // TODO: Position and initial dimensions
+        // TODO: Add resize handlers (?)
+        // TODO: Add pointer event handers (?)
+        if (framePath != undefined) {
+            $overlayParent.prepend(genFrameContainer());
+
+            var $fContainer = $overlayParent.find('#deviceFrameContainer');
+            var $frame = $fContainer.find('#deviceFrame');
+
+            $frame.css('background-image', "url('" + framePath + "')");
+            $frame.css('height', '');
+            $frame.css('width', '');
+            $frame.css('top', '');
+            $frame.css('left', '');
+
+            if(isEdit) {
+                $fContainer.css('z-index', -1);
+            }
+        }
+
+        if (overlayPath != undefined) {
+            // TODO: Update for edit mode
+            // $overlayParent.append(genOverlayContainer());
+
+            var $oContainer = $overlayParent.find('#deviceOverlayContainer');
+            var $overlay = $oContainer.find('#deviceOverlay');
+
+            $overlay.css('background-image', "url('" + overlayPath + "')");
+        }
+    }
+
+    function genFrameContainer(bezelPath) {
+        var container = [
+            '<div id="deviceFrameContainer">',
+            '   <div id="deviceFrame">',
+            '   </div>',
+            '</div>'
+        ].join("");
+
+        return container;
+    }
+
+})();
diff --git a/src_old/resources/scripts/player/init.js b/src_old/resources/scripts/player/init.js
new file mode 100644
index 0000000..0f9fcd5
--- /dev/null
+++ b/src_old/resources/scripts/player/init.js
@@ -0,0 +1,18 @@
+(function () {
+    $.holdReady(true);
+
+    var script = window.document.createElement("script");
+    script.type = "text/javascript";
+    script.async = true;
+    script.onload = script.onreadystatechange = function (e, isAbort) {
+        if (isAbort || !script.readyState || /loaded|complete/.test(script.readyState)) {
+            script.onload = script.onreadystatechange = null;
+            script = undefined;
+        }
+
+        if (!isAbort) { $.holdReady(false); }
+    }
+
+    script.src = "data/document.js";
+    window.document.head.appendChild(script);
+})();
\ No newline at end of file
diff --git a/src_old/resources/scripts/player/splitter.js b/src_old/resources/scripts/player/splitter.js
new file mode 100644
index 0000000..068eead
--- /dev/null
+++ b/src_old/resources/scripts/player/splitter.js
@@ -0,0 +1,219 @@
+/*
+* jQuery.splitter.js - two-pane splitter window plugin
+*
+* version 1.51 (2009/01/09)
+*
+* Dual licensed under the MIT and GPL licenses:
+*   http://www.opensource.org/licenses/mit-license.php
+*   http://www.gnu.org/licenses/gpl.html
+*/
+
+/**
+* The splitter() plugin implements a two-pane resizable splitter window.
+* The selected elements in the jQuery object are converted to a splitter;
+* each selected element should have two child elements, used for the panes
+* of the splitter. The plugin adds a third child element for the splitbar.
+*
+* For more details see: http://methvin.com/splitter/
+*
+*
+* @example $('#MySplitter').splitter();
+* @desc Create a vertical splitter with default settings
+*
+* @example $('#MySplitter').splitter({type: 'h', accessKey: 'M'});
+* @desc Create a horizontal splitter resizable via Alt+Shift+M
+*
+* @name splitter
+* @type jQuery
+* @param Object options Options for the splitter (not required)
+* @cat Plugins/Splitter
+* @return jQuery
+* @author Dave Methvin (dave.methvin@gmail.com)
+*/
+;(function($){
+
+$.fn.splitter = function(args){
+   args = args || {};
+   return this.each(function() {
+      var zombie;      // left-behind splitbar for outline resizes
+      function startSplitMouse(evt) {
+         if ( opts.outline )
+            zombie = zombie || bar.clone(false).insertAfter(A);
+         panes.css("-webkit-user-select", "none");   // Safari selects A/B text on a move
+         bar.addClass(opts.activeClass);
+         $('<div class="splitterMask"></div>').insertAfter(bar);
+         A._posSplit = A[0][opts.pxSplit] - evt[opts.eventPos];
+         $(document)
+            .bind("mousemove", doSplitMouse)
+            .bind("mouseup", endSplitMouse);
+      }
+      function doSplitMouse(evt) {
+         var newPos = A._posSplit+evt[opts.eventPos];
+         if ( opts.outline ) {
+            newPos = Math.max(0, Math.min(newPos, splitter._DA - bar._DA));
+            bar.css(opts.origin, newPos);
+         } else
+            resplit(newPos);
+      }
+      function endSplitMouse(evt) {
+         $('div.splitterMask').remove();
+         bar.removeClass(opts.activeClass);
+         var newPos = A._posSplit+evt[opts.eventPos];
+         if ( opts.outline ) {
+            zombie.remove(); zombie = null;
+            resplit(newPos);
+         }
+         panes.css("-webkit-user-select", "text");   // let Safari select text again
+         $(document)
+            .unbind("mousemove", doSplitMouse)
+            .unbind("mouseup", endSplitMouse);
+      }
+      function resplit(newPos) {
+         // Constrain new splitbar position to fit pane size limits
+         newPos = Math.max(A._min, splitter._DA - B._max,
+               Math.min(newPos, A._max, splitter._DA - bar._DA - B._min));
+         // Resize/position the two panes
+         bar._DA = bar[0][opts.pxSplit];      // bar size may change during dock
+
+         var posOffset = bar.is(':visible') ? bar._DA - 1 : 0;
+
+         bar.css(opts.origin, newPos - posOffset).css(opts.fixed, splitter._DF);
+         A.css(opts.origin, 0).css(opts.split, newPos).css(opts.fixed,  splitter._DF);
+         B.css(opts.origin, newPos + bar._DA - posOffset)
+            .css(opts.split, splitter._DA-bar._DA-newPos).css(opts.fixed,  splitter._DF);
+         // IE fires resize for us; all others pay cash
+         if ( !IE_10_AND_BELOW )
+            panes.trigger("resize");
+      }
+      function dimSum(jq, dims) {
+         // Opera returns -1 for missing min/max width, turn into 0
+         var sum = 0;
+         for ( var i=1; i < arguments.length; i++ )
+            sum += Math.max(parseInt(jq.css(arguments[i])) || 0, 0);
+         return sum;
+      }
+
+      // Determine settings based on incoming opts, element classes, and defaults
+      var vh = (args.splitHorizontal? 'h' : args.splitVertical? 'v' : args.type) || 'v';
+      var opts = $.extend({
+         activeClass: 'active',   // class name for active splitter
+         pxPerKey: 8,         // splitter px moved per keypress
+         tabIndex: 0,         // tab order indicator
+         accessKey: ''         // accessKey for splitbar
+      },{
+         v: {               // Vertical splitters:
+            keyLeft: 39, keyRight: 37, cursor: "col-resize",
+            splitbarClass: "vsplitbar", outlineClass: "voutline",
+            type: 'v', eventPos: "pageX", origin: "left",
+            split: "width",  pxSplit: "offsetWidth",  side1: "Left", side2: "Right",
+            fixed: "height", pxFixed: "offsetHeight", side3: "Top",  side4: "Bottom"
+         },
+         h: {               // Horizontal splitters:
+            keyTop: 40, keyBottom: 38,  cursor: "row-resize",
+            splitbarClass: "hsplitbar", outlineClass: "houtline",
+            type: 'h', eventPos: "pageY", origin: "top",
+            split: "height", pxSplit: "offsetHeight", side1: "Top",  side2: "Bottom",
+            fixed: "width",  pxFixed: "offsetWidth",  side3: "Left", side4: "Right"
+         }
+      }[vh], args);
+
+      // Create jQuery object closures for splitter and both panes
+      var splitter = $(this).css({position: "relative"});
+      var panes = $(">*", splitter[0]).css({
+         position: "absolute",          // positioned inside splitter container
+         "z-index": "1",               // splitbar is positioned above
+         "-moz-outline-style": "none"   // don't show dotted outline
+      });
+      var A = $(panes[0]);      // left  or top
+      var B = $(panes[1]);      // right or bottom
+
+      // Focuser element, provides keyboard support; title is shown by Opera accessKeys
+      var focuser = $('<a href="javascript:void(0)"></a>')
+         .attr({accessKey: opts.accessKey, tabIndex: opts.tabIndex, title: opts.splitbarClass})
+         //.bind($.browser.opera?"click":"focus", function(){ this.focus(); bar.addClass(opts.activeClass) })
+         .bind("focus", function () { this.focus(); bar.addClass(opts.activeClass) })
+         .bind("keydown", function(e){
+            var key = e.which || e.keyCode;
+            var dir = key==opts["key"+opts.side1]? 1 : key==opts["key"+opts.side2]? -1 : 0;
+            if ( dir )
+               resplit(A[0][opts.pxSplit]+dir*opts.pxPerKey, false);
+         })
+         .bind("blur", function(){ bar.removeClass(opts.activeClass) });
+
+      // Splitbar element, can be already in the doc or we create one
+      var bar = $(panes[2] || '<div></div>')
+         .insertAfter(A).css("z-index", "100").append(focuser)
+         .attr({"class": opts.splitbarClass, unselectable: "on"})
+         .css({position: "absolute",   "user-select": "none", "-webkit-user-select": "none",
+            "-khtml-user-select": "none", "-moz-user-select": "none", "top": "0px"})
+         .bind("mousedown", startSplitMouse);
+      // Use our cursor unless the style specifies a non-default cursor
+      if ( /^(auto|default|)$/.test(bar.css("cursor")) )
+         bar.css("cursor", opts.cursor);
+
+      // Cache several dimensions for speed, rather than re-querying constantly
+      bar._DA = bar[0][opts.pxSplit];
+      splitter._PBF = $.boxModel? dimSum(splitter, "border"+opts.side3+"Width", "border"+opts.side4+"Width") : 0;
+      splitter._PBA = $.boxModel? dimSum(splitter, "border"+opts.side1+"Width", "border"+opts.side2+"Width") : 0;
+      A._pane = opts.side1;
+      B._pane = opts.side2;
+      $.each([A,B], function(){
+         this._min = opts["min"+this._pane] || dimSum(this, "min-"+opts.split);
+         this._max = opts["max"+this._pane] || dimSum(this, "max-"+opts.split) || 9999;
+         this._init = opts["size"+this._pane]===true ?
+            parseInt($.curCSS(this[0],opts.split)) : opts["size"+this._pane];
+      });
+
+      // Determine initial position, get from cookie if specified
+      var initPos = A._init;
+      if ( !isNaN(B._init) )   // recalc initial B size as an offset from the top or left side
+         initPos = splitter[0][opts.pxSplit] - splitter._PBA - B._init - bar._DA;
+      if ( opts.cookie ) {
+         if ( !$.cookie )
+            alert('jQuery.splitter(): jQuery cookie plugin required');
+         var ckpos = parseInt($.cookie(opts.cookie));
+         if ( !isNaN(ckpos) )
+            initPos = ckpos;
+         $(window).bind("unload", function(){
+            var state = String(bar.css(opts.origin));   // current location of splitbar
+            $.cookie(opts.cookie, state, {expires: opts.cookieExpires || 365,
+               path: opts.cookiePath || document.location.pathname});
+         });
+      }
+      if ( isNaN(initPos) )   // King Solomon's algorithm
+         initPos = Math.round((splitter[0][opts.pxSplit] - splitter._PBA - bar._DA)/2);
+
+      // Resize event propagation and splitter sizing
+      if ( opts.anchorToWindow ) {
+         // Account for margin or border on the splitter container and enforce min height
+         splitter._hadjust = dimSum(splitter, "borderTopWidth", "borderBottomWidth", "marginBottom");
+         splitter._hmin = Math.max(dimSum(splitter, "minHeight"), 20);
+         $(window).bind("resize", function(){
+            var top = splitter.offset().top;
+            var wh = $(window).height();
+            splitter.css("height", Math.max(wh-top-splitter._hadjust, splitter._hmin)+"px");
+            if ( !IE_10_AND_BELOW ) splitter.trigger("resize");
+         }).trigger("resize");
+      }
+      else if ( opts.resizeToWidth && !IE_10_AND_BELOW )
+         $(window).bind("resize", function(){
+            splitter.trigger("resize");
+         });
+
+      // Resize event handler; triggered immediately to set initial position
+      splitter.bind("resize", function(e, size){
+         // Custom events bubble in jQuery 1.3; don't Yo Dawg
+         if ( e.target != this ) return;
+         // Determine new width/height of splitter container
+         splitter._DF = splitter[0][opts.pxFixed] - splitter._PBF;
+         splitter._DA = splitter[0][opts.pxSplit] - splitter._PBA;
+         // Bail if splitter isn't visible or content isn't there yet
+         if ( splitter._DF <= 0 || splitter._DA <= 0 ) return;
+         // Re-divvy the adjustable dimension; maintain size of the preferred pane
+         resplit(!isNaN(size)? size : (!(opts.sizeRight||opts.sizeBottom)? A[0][opts.pxSplit] :
+            splitter._DA-B[0][opts.pxSplit]-bar._DA));
+      }).trigger("resize" , [initPos]);
+   });
+};
+
+})(jQuery);
\ No newline at end of file
diff --git a/src_old/router/index.js b/src_old/router/index.js
new file mode 100644
index 0000000..ab85589
--- /dev/null
+++ b/src_old/router/index.js
@@ -0,0 +1,198 @@
+import Vue from 'vue'
+import VueRouter from 'vue-router'
+// import 首页 from '../views/首页.vue'
+// import 市场主体分析 from '../views/市场主体分析.vue'
+// import 市场风险分析 from '../views/市场风险分析.vue'
+// import 行情分析 from '../views/行情分析.vue'
+// import 事件分析 from '../views/事件分析.vue'
+
+import Main from '../views/Main.vue'
+import Home from '../views/Home.vue'
+import register from '@/user/register'
+import test from "@/views/test";
+import 	市场主体分析	from   '../views/市场主体分析.vue'
+import 	系统性风险分析	from   '../views/系统性风险分析.vue'
+import systemRiskV2 from "@/components/systemRiskComponent";
+import 	个体风险分析	from   '../views/个体风险分析.vue'
+import  login from "@/user/login";
+import 	高影响力主体分析	from '../views/高影响力主体分析.vue'
+import 	预警服务	from       '../views/预警服务.vue'
+import 	风险预警	from       '../views/风险预警.vue'
+import 	异常检测	from       '../views/异常检测.vue'
+import warn from '@/views/404'
+import 	健康指数	from       '../views/健康指数.vue'
+import 	压力测试	from       '../views/压力测试.vue'
+import 	行情分析	from       '../views/行情分析.vue'
+import 	事件分析	from       '../views/事件分析.vue'
+import 	事件图谱	from       '../views/事件图谱.vue'
+import graphViewV4 from "@/views/graphViewV4";
+import 风险传导 from "@/views/风险传导"
+import 	大屏	from       '../bigscreen/大屏.vue'
+import 	UserManagement	from     '../views/UserManagement.vue'
+
+import SSE from "@/views/SSE";
+// import tab from "@/store/tab";
+
+
+// 解决重复点击页面报NavigationDuplicated: Avoided redundant navigation to current locat
+const originalPush = VueRouter.prototype.push
+
+VueRouter.prototype.push = function push(location) {
+  return originalPush.call(this, location).catch(err => err)
+}
+
+
+
+Vue.use(VueRouter)
+
+
+//1.import 创建路由组件
+//2.将路由与组件进行映射
+
+
+const routes = [
+
+
+    //主路由
+
+  { path:'/',
+    component:Main,
+    redirect:'systematic_risk',//当地址是/时就重定向到market_entities
+    meta : {                      //加一个自定义obj
+      requireAuth:true      //这个参数 true 代表需要登录才能进入A
+    },
+    children:[
+      //子路由
+      {path:'/home', name:'home',component:Home},//首页
+      {path:'/market_entities',name:'market_entities',component:市场主体分析,
+        meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }
+        },//1
+      {path:'/systematic_risk',name:'systematic_risk', component:系统性风险分析, meta : {                      //加一个自定义obj
+          requireAuth:true      //这个参数 true 代表需要登录才能进入A
+        },},//2-1
+
+      // {path:'/systemriskV2',name:'systemriskV2', component:systemRiskV2, meta : {                      //加一个自定义obj
+      //     requireAuth:true      //这个参数 true 代表需要登录才能进入A
+      //   },},//2-1
+
+      {path:'/individual_risk',name:'individual_risk', component:个体风险分析, meta : {                      //加一个自定义obj
+          requireAuth:true      //这个参数 true 代表需要登录才能进入A
+        },},//2-2
+
+      {path:'/influential_entities', name:'influential_entities', component:高影响力主体分析, meta : {                      //加一个自定义obj
+          requireAuth:true      //这个参数 true 代表需要登录才能进入A
+        },},//3
+
+      {path:'/warning',       name:'warning',       component:预警服务,
+      meta : {                      //加一个自定义obj
+          keepAlive:true,
+        requireAuth:true
+        }},//4-1
+
+      {path:'/risk_warning',       name:'risk_warning',       component:风险预警,
+        meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},//4-1
+      {path:'/abnormal_detection', name:'abnormal_detection', component:异常检测,
+        meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},//4-2
+      {path:'/health',    name:'health',    component:健康指数, meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},//5
+      {path:'/diffus',    name:'diffus',  props: true, // 启用路由参数作为组件属性传递
+        component:风险传导, meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},
+      {path:'/pressure',  name:'pressure',  component:压力测试,    meta : {                      //加一个自定义obj
+          requireAuth:true      //这个参数 true 代表需要登录才能进入A
+        }},//6
+      {path:'/quotation', name:'quotation', component:行情分析, meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},//7
+      {path:'/event_analysis',  name:'event_analysis',  component:事件分析,
+        meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},//8-1
+      {path:'/event_graph',     name:'event_graph',     component:事件图谱,
+        meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},//8-2
+      {path:'/knowladgeGraph',     name:'knowladgeGraph',     component:graphViewV4,meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},
+
+        // 用户管理
+      {path:'/UserManagement',name :'UserManagement',component: UserManagement, meta : {                      //加一个自定义obj
+          keepAlive:true,
+          requireAuth:true
+        }},
+
+
+    ]
+
+  },
+  // 登录
+  {path:'/login',name :'login',component: login},
+  // {path:'/login2',name :'login2',component: login2},
+
+  // 注册
+  {path:'/register',name :'register',component: register},
+
+
+  //大屏
+  {path:'/bigscreen',name :'bigscreen',component: 大屏,},
+  {path:'/test',name :'test',component: test,},
+  {path:'/sse',name :'sse',component: SSE,},
+  {path:'/systemrisk',name :'systemrisk',component: systemRiskV2,}
+  ]
+
+
+  //3.创建router实例
+  const router = new VueRouter({
+    routes
+  })
+  
+  export default router
+export  const isLogin=false;
+//4.在main.js挂载
+
+
+//路由守卫
+router.beforeEach(async(to,from,next) => {
+  const allowedRoutes = ['/systematic_risk', '/market_entities','/individual_risk','/influential_entities'
+    ,'/warning','/risk_warning','/abnormal_detection','/health','/diffus','/pressure','/quotation','/event_analysis',
+    '/event_graph','/knowladgeGraph','/UserManagement','/login','/register','/bigscreen','/test','/sse','/systemrisk'];
+  const name=sessionStorage.getItem('user')
+  // if (allowedRoutes.includes(to.path)) {
+  //   next();
+  // } else {
+  //   next('/'); // 重定向到首页或其他允许的路由
+  // }
+  if (to.meta.requireAuth){//需要认证
+    if (name || !name && (to.name==='/user' || to.name==='/login')){
+      next()
+    }else {
+      next('/login')
+      // return{
+      //   path:'/login',
+      //   query:{redirect:to.fullPath}
+      // }
+    }
+  }
+  else {
+    next()
+  }
+})
+
diff --git a/src_old/store/index.js b/src_old/store/index.js
new file mode 100644
index 0000000..72ea63a
--- /dev/null
+++ b/src_old/store/index.js
@@ -0,0 +1,12 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+import tab from './tab'//管理菜单的数据
+
+Vue.use(Vuex)
+
+//创建vuex实例
+export default new Vuex.Store({
+    modules: {
+        tab
+    }
+})
\ No newline at end of file
diff --git a/src_old/store/tab.js b/src_old/store/tab.js
new file mode 100644
index 0000000..f6d3ec4
--- /dev/null
+++ b/src_old/store/tab.js
@@ -0,0 +1,76 @@
+// import user from "@/store/user";
+
+export default{
+    state:{
+        tabsList:[
+            // {
+            //     path: "/",
+            //     name: "home",
+            //     label: "首页",
+            //     icon: "s-home",
+            //     url: "Home/Home",
+            //   },
+        ],//tags(位于上导航栏)
+        //用户
+        isAdmin:'',
+        userId : '',
+        isLogin:false,
+        token:'',
+        isCollapse:false,
+
+    },
+    mutations:{//mutations往往接收两个数据，第二个才是我们想要的数据
+        collapseMenu(state){
+            state.isCollapse= !state.isCollapse
+
+        },
+        // 更新导航栏tag标签
+        selectMenu(state,val){
+            // console.log(val , 'val')
+            // if(val.name!=='home'){
+                const index = state.tabsList.findIndex(item => item.name===val.name)//index是判断是否在tabsList里面，在就显示索引，不在就显示-1
+                const length = state.tabsList.length
+                console.log(state.tabsList)
+                console.log(length)
+
+
+                //如果不存在
+                if(index===-1){
+                    state.tabsList.push(val)//列表添加
+                }
+
+        },
+        // 删除指定的tag数据
+        closeTag(state,item){
+            // console.log(item,'item')//后面参数，优化打印查看，类似于更换数据名
+            const index=state.tabsList.findIndex(val => val.name===item.name)
+            state.tabsList.splice(index,1)//删除index（一个）
+
+        },
+
+    login(state,user){
+        state.isLogin=true
+        sessionStorage.setItem('token',user.token)
+        sessionStorage.setItem('user',user.name)
+        // 管理员字段
+        sessionStorage.setItem('stats',user.stats)
+        // console.log('login:'+state.isLogin)
+        // console.log('token:u'+user.token)
+    },
+    // 关闭会话（页面），session会自动清除？
+    logout(state){
+        state.isLogin=false
+        state.name=''
+        sessionStorage.clear()
+    }
+},
+    getters: {
+        getUserState(state) {
+            return state.isLogin;
+        },
+
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/src_old/user/login.vue b/src_old/user/login.vue
new file mode 100644
index 0000000..1d70764
--- /dev/null
+++ b/src_old/user/login.vue
@@ -0,0 +1,292 @@
+<template>
+  <div class="login-container" >
+    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
+
+      <div class="title-container">
+        <h3 class="title">欢迎使用</h3>
+      </div>
+
+      <el-form-item prop="userName">
+        <span class="svg-container">
+<!--          <svg-icon icon-class="user" />-->
+        </span>
+        <el-input
+          ref="userName"
+          v-model="loginForm.userName"
+          placeholder="账号"
+          name="userName"
+          type="text"
+          tabindex="1"
+          auto-complete="on"
+          @keyup.enter.native="handleLogin"
+          @submit.native.prevent
+        />
+      </el-form-item>
+
+      <el-form-item prop="password">
+        <span class="svg-container">
+<!--          <svg-icon icon-class="password" />-->
+        </span>
+        <el-input
+          :key="passwordType"
+          ref="password"
+          v-model="loginForm.password"
+          :type="passwordType"
+          placeholder="密码"
+          name="password"
+          tabindex="2"
+          auto-complete="on"
+          @keyup.enter.native="handleLogin"
+        />
+        <span class="show-pwd" @click="showPwd">
+<!--          <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />-->
+        </span>
+      </el-form-item>
+      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">登录</el-button>
+<!--      <p class="tips">-->
+<!--        <a href="/user" type="primary" @click="toRegister">还没有帐号？立即注册</a>-->
+<!--      </p>-->
+      <router-link to="/register" style="color: white">还没有帐号？立即注册</router-link>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import http from "@/utils/request";
+export default {
+  name: 'login',
+  data() {
+    return {
+      loginForm: {
+        userName: '',
+        password: ''
+      },
+      loginRules: {
+        userName: [{ type: 'email', required: true, trigger: 'blur', message: '请输入账号' }],
+        password: [{
+          required: true,
+          message: '输入密码',
+          trigger: 'blur'
+        }]
+          // { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,15}$/, message: '密码必须同时包含数字与字母,且长度为 6-15位' }]
+      },
+      loading: false,
+      passwordType: 'password',
+      redirect: undefined
+    }
+  },
+  watch: {
+    $route: {
+      handler: function(route) {
+        this.redirect = route.query && route.query.redirect
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    toRegister(){
+      this.$router.push('/user')
+    },
+    showPwd() {
+      if (this.passwordType === 'password') {
+        this.passwordType = ''
+      } else {
+        this.passwordType = 'password'
+      }
+      this.$nextTick(() => {
+        this.$refs.password.focus()
+      })
+    },
+    handleLogin() {
+      this.$refs.loginForm.validate(valid => {
+          this.loading = true
+        //-www-form-urlencoded的格式可以有多种方式，详见axios文档
+        const params = new URLSearchParams();
+        params.append('username', this.loginForm.userName);
+        params.append('password', this.loginForm.password);
+        http.post('/users/login/', params)
+        // axios({
+        //   method: 'post',
+        //   url: 'http://61.240.140.173:8000/users/login/',
+        //   // url:'/api/users/login/',
+        //   headers: {
+        //         'Content-Type': 'application/x-www-form-urlencoded'
+        //       },
+        //   data: {
+        //     username:this.loginForm.userName,
+        //     password:this.loginForm.password
+        //   }
+        .then((res)=>{
+          if (res.data.message===1){
+            this.loading = false
+            // if (res.data.data)
+            let user={token:res.data.data,name:this.loginForm.userName,stats:res.data.stats}
+            this.$store.commit('login',user)
+            this.$router.push('/systematic_risk')
+          }
+          else {
+            this.$message({
+              showClose: true,
+              message: res.data.data,
+              type: 'warning'
+            });
+            this.loading = false
+          }
+
+          }).catch((error)=>{
+            console.log(error)
+            this.loading = false
+          alert('登陆失败')
+          })
+          // this.$store.dispatch('login', this.loginForm).then(() => {
+          //   this.$router.push({ path: this.redirect || '/' })
+          //   this.loading = false
+          // }).catch(() => {
+          //   this.loading = false
+          // }
+
+      })
+    }
+  },
+  computed:{
+    isLogin(){
+      return this.$store.state.isLogin
+    }
+  },
+}
+</script>
+
+<style lang="scss">
+/* 修复input 背景不协调 和光标变色 */
+/* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
+
+$bg:#283443;
+$light_gray:#fff;
+$cursor: #fff;
+
+@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
+  .login-container .el-input input {
+    color: $cursor;
+  }
+}
+
+/* reset element-ui css */
+.login-container {
+  .el-input {
+    display: inline-block;
+    height: 47px;
+    width: 85%;
+
+    input {
+      background: transparent;
+      border: 0px;
+      -webkit-appearance: none;
+      border-radius: 0px;
+      padding: 12px 5px 12px 15px;
+      color: $light_gray;
+      height: 47px;
+      caret-color: $cursor;
+
+      &:-webkit-autofill {
+        box-shadow: 0 0 0px 1000px $bg inset !important;
+        -webkit-text-fill-color: $cursor !important;
+      }
+    }
+  }
+
+  .el-form-item {
+    border: 1px solid rgba(255, 255, 255, 0.1);
+    background: rgba(0, 0, 0, 0.1);
+    border-radius: 5px;
+    color: #454545;
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+$bg:#2d3a4b;
+$dark_gray:#889aa4;
+$light_gray:#eee;
+
+.router-link-active {
+  text-decoration: none;
+  color: #fff;
+}
+a {
+  text-decoration: none;
+  color: #fff;
+}
+
+.login-container {
+  min-height: 100vh;
+  width: 100%;
+  background-color: $bg;
+  overflow: hidden;
+
+  .login-form {
+    position: relative;
+    width: 520px;
+    max-width: 100%;
+    padding: 160px 35px 0;
+    margin: 0 auto;
+    overflow: hidden;
+  }
+
+  .tips {
+    float: right;
+    font-size: 14px;
+    color: #fff;
+    margin-bottom: 10px;
+
+    span {
+      &:first-of-type {
+        margin-right: 16px;
+      }
+    }
+  }
+
+  .svg-container {
+    padding: 6px 5px 6px 15px;
+    color: $dark_gray;
+    vertical-align: middle;
+    width: 30px;
+    display: inline-block;
+  }
+
+  .title-container {
+    position: relative;
+
+    .title {
+      font-size: 26px;
+      color: $light_gray;
+      margin: 0px auto 40px auto;
+      text-align: center;
+      font-weight: bold;
+    }
+  }
+
+  .show-pwd {
+    position: absolute;
+    right: 10px;
+    top: 7px;
+    font-size: 16px;
+    color: $dark_gray;
+    cursor: pointer;
+    user-select: none;
+  }
+}
+</style>
+
+<style scoped>
+/* 修改验证器样式 */
+::v-deep .el-form-item.is-error .el-input__inner {
+  border-color: #889aa4;
+}
+::v-deep .el-form-item.is-error .el-input__validateIcon {
+  color: #889aa4;
+}
+::v-deep .el-form-item__error {
+  color: #e6a23c;
+}
+</style>
diff --git a/src_old/user/register.vue b/src_old/user/register.vue
new file mode 100644
index 0000000..17344e3
--- /dev/null
+++ b/src_old/user/register.vue
@@ -0,0 +1,450 @@
+<template>
+  <div class="register-container">
+    <article class="header">
+      <header>
+        <el-avatar icon="el-icon-user-solid" shape="circle" />
+        <span class="login">
+          <em class="bold">已有账号？</em>
+          <router-link to="/login">
+             <el-button type="primary" size="mini">登录</el-button>
+          </router-link>
+<!--          <a href="/login" >-->
+<!--            <el-button type="primary" size="mini">登录</el-button>-->
+<!--          </a>-->
+        </span>
+      </header>
+    </article>
+    <section>
+      <el-form
+        ref="ruleForm"
+        :model="ruleForm"
+        :rules="rules"
+        label-width="100px"
+        autocomplete="off"
+        :hide-required-asterisk="true"
+        size="medium"
+      >
+        <div style="padding-top: 10px">
+          <el-form-item label="账号" prop="account">
+            <el-col :span="10">
+              <el-input v-model="ruleForm.account" />
+            </el-col>
+          </el-form-item>
+          <el-form-item label="真实姓名" prop="name">
+            <el-col :span="10">
+              <el-input v-model="ruleForm.name" />
+            </el-col>
+          </el-form-item>
+          <el-form-item label="电话" prop="tele">
+          <el-col :span="10">
+            <el-input v-model="ruleForm.tele" />
+          </el-col>
+        </el-form-item>
+          <el-form-item label="单位" prop="unit">
+          <el-col :span="10">
+            <el-input v-model="ruleForm.unit" />
+          </el-col>
+        </el-form-item> <el-form-item label="职位" prop="position">
+          <el-col :span="10">
+            <el-input v-model="ruleForm.position" />
+          </el-col>
+        </el-form-item>
+          <el-form-item label="邮箱" prop="email">
+            <el-col :span="10">
+              <el-input
+                v-model="ruleForm.email"
+                placeholder="输入邮箱并点击发送验证码"
+              />
+            </el-col>
+            <el-button
+              :loading="codeLoading"
+              :disabled="isDisable"
+              size="small"
+              round
+              @click="sendMsg"
+            >发送验证码</el-button>
+
+            <span class="status">{{ statusMsg }}</span>
+          </el-form-item>
+          <el-form-item label="验证码" prop="code">
+            <el-col :span="10">
+              <el-input
+                v-model="ruleForm.code"
+                maxlength="8"
+                placeholder="请登录邮箱接收验证码"
+              />
+            </el-col>
+          </el-form-item>
+          <el-form-item label="邀请码" prop="invite">
+            <el-col :span="10">
+              <el-input
+                  v-model="ruleForm.invite"
+                  maxlength="8"
+                  placeholder="请联系管理员获取邀请码"
+              />
+            </el-col>
+          </el-form-item>
+          <el-form-item label="密码" prop="pwd">
+            <el-col :span="10">
+              <el-input v-model="ruleForm.pwd" type="password" />
+            </el-col>
+          </el-form-item>
+          <el-form-item label="确认密码" prop="cpwd">
+            <el-col :span="10">
+              <el-input v-model="ruleForm.cpwd" type="password" />
+            </el-col>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              style="width: 40%"
+              @click="register"
+            >注册</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </section>
+
+    <div class="error">{{ error }}</div>
+  </div>
+</template>
+
+<script>
+// import { getEmailCode, user } from '@/api/user'
+// import { encrypt } from '@/utils/rsaEncrypt'
+import http from "@/utils/request";
+
+export default {
+  name: 'register',
+  data() {
+    return {
+
+      statusMsg: '',
+      error: '',
+      isDisable: false,
+      codeLoading: false,
+      ruleForm: {
+        name:'',
+        unit:'',
+        position:'',
+        tele:'',
+        account:'',
+        email: '',
+        code: '',
+        invite:'',
+        pwd: '',
+        cpwd: ''
+      },
+      rules: {
+        name: [{
+          required: true,
+          type: 'string',
+          message: '真实姓名',
+          trigger: 'blur',
+        },{pattern:/^[\u4e00-\u9fa5]{2,4}$/,message:'请输入正确姓名'}
+        ],
+        account: [{
+          required: true,
+          type: 'string',
+          message: '账户名',
+          trigger: 'blur'
+        }],
+        email: [{
+          required: true,
+          type: 'email',
+          message: '请输入邮箱',
+          trigger: 'blur'
+        },
+          {pattern:/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.(com|cn|net)$/,message:'请输入正确邮箱'}
+        ],
+        code: [{
+          required: true,
+          type: 'string',
+          message: '请输入验证码',
+          trigger: 'blur'
+        }],
+        invite: [{
+          required: true,
+          type: 'string',
+          message: '请输入邀请码',
+          trigger: 'blur'
+        }],
+        pwd: [{
+          required: true,
+          message: '创建密码',
+          trigger: 'blur'
+        }, { pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{6,20}$/, message: '密码必须同时包含数字与字母,且长度为 6-20位' }],
+        cpwd: [{
+          required: true,
+          message: '确认密码',
+          trigger: 'blur'
+        }, {
+          validator: (rule, value, callback) => {
+            if (value === '') {
+              callback(new Error('请再次输入密码'))
+            } else if (value !== this.ruleForm.pwd) {
+              callback(new Error('两次输入密码不一致'))
+            } else {
+              callback()
+            }
+          },
+          trigger: 'blur'
+        }]
+
+      }
+    }
+  },
+  methods: {
+    sendMsg: function() {
+      const self = this
+      let emailPass
+      let timerid
+      if (timerid) {
+        return false
+      }
+      self.statusMsg = ''
+      this.$refs['ruleForm'].validateField('email', (valid) => {
+        emailPass = valid
+      })
+      // 向后台API验证码发送
+      if (!emailPass) {
+        self.codeLoading = true
+        self.statusMsg = '验证码已发送...'
+        http.get('/users/send/',{params:{
+            email:self.ruleForm.email
+        }}).then((res)=>{
+          let count = 60
+          self.ruleForm.code = ''
+          self.codeLoading = false
+          self.isDisable = true
+          self.statusMsg = `验证码已发送,${count--}秒后重新发送`
+          timerid = window.setInterval(function() {
+            self.statusMsg = `验证码已发送,${count--}秒后重新发送`
+            if (count <= 0) {
+              window.clearInterval(timerid)
+              self.isDisable = false
+              self.statusMsg = ''
+            }
+          }, 1000)
+        }).catch(err => {
+          console.log(err.response)
+          this.isDisable = false
+          this.statusMsg = ''
+          this.codeLoading = false
+          console.log(err)
+        })
+
+        // getEmailCode(self.ruleForm.email).then(res => {
+        //   this.$message({
+        //     showClose: true,
+        //     message: '发送成功，验证码有效期5分钟',
+        //     type: 'success'
+        //   })
+
+      }
+      else alert('wrong'+emailPass  )
+    },
+
+    // 用户注册
+    register: function() {
+      console.log(sessionStorage.getItem('verify_code'))
+      this.$refs['ruleForm'].validate((valid) => {
+        if (valid) {
+          // const user = {
+          //   code: this.ruleForm.code,
+          //   email: this.ruleForm.email,
+          //   //这里删除源码的加密
+          //   password: this.ruleForm.pwd
+          // }
+          const params = new URLSearchParams();
+          params.append('username', this.ruleForm.account);
+          params.append('password', this.ruleForm.pwd);
+          params.append('email', this.ruleForm.email);
+          params.append('security_code', this.ruleForm.code);
+          params.append('invite_code', this.ruleForm.invite);
+          params.append('realname', this.ruleForm.name);
+          params.append('telephone', this.ruleForm.tele);
+          params.append('unit', this.ruleForm.unit);
+          params.append('position', this.ruleForm.position);
+
+          // http.post('/users/register/',{
+          //   params:{
+          //     username:this.ruleForm.account,
+          //     email:this.ruleForm.email,
+          //     password:this.ruleForm.pwd,
+          //     security_code:this.ruleForm.code,
+          //     invite_code:this.ruleForm.invite,
+          //     realname:this.ruleForm.name,
+          //     telephone:this.ruleForm.tele,
+          //     unit:this.ruleForm.unit,
+          //     position:this.ruleForm.position
+          //   }
+          http.post('/users/register/',params).then((res)=>{
+            if (res.data.message===1){
+              this.$message({
+                showClose: true,
+                message: res.data.data,
+                type: 'warning'
+              });
+              // 跳转回登录
+              this.$router.push('/login')
+            }
+           else {
+              alert(res.data.data)
+            }
+          }).catch((error)=>{
+            alert(error)
+          })
+          // user(user).then(res => {
+          //   console.log(res)
+          //   this.$message({
+          //     showClose: true,
+          //     message: '注册成功，正在跳转到登录界面...',
+          //     type: 'success'
+          //   })
+          //   setTimeout(() => {
+          //     this.$router.push('/')
+          //   }, 2000)
+          // }).catch(err => {
+          //   console.log(err.response.data.message)
+          // })
+        }
+        else {
+          this.$message({
+            showClose: true,
+            message:'请检查信息是否正确',
+            type: 'warning'
+          });
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+/* 修复input 背景不协调 和光标变色 */
+/* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
+
+$bg: #283443;
+$light_gray: #fff;
+$cursor: #fff;
+
+@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
+  .register-container .el-input input {
+    color: $cursor;
+  }
+}
+
+/* reset element-ui css */
+.register-container {
+  .el-input {
+    display: inline-block;
+    height: 47px;
+    width: 95%;
+
+    input {
+      background: rgba(0, 0, 0, 0.1);
+      border-radius: 5px;
+      border: 1px solid rgba(255, 255, 255, 0.1);
+      -webkit-appearance: none;
+      padding: 12px 5px 12px 15px;
+      color: $light_gray;
+      height: 47px;
+      caret-color: $cursor;
+
+      &:-webkit-autofill {
+        box-shadow: 0 0 0px 1000px $bg inset !important;
+        -webkit-text-fill-color: $cursor !important;
+      }
+    }
+  }
+
+  .el-form-item {
+    label {
+      font-style: normal;
+      font-size: 12px;
+      color: $light_gray;
+    }
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+$bg: #2d3a4b;
+$dark_gray: #889aa4;
+$light_gray: #eee;
+
+.register-container {
+  min-height: 100vh;
+  width: 100%;
+  background-color: $bg;
+  overflow: hidden;
+
+  .header {
+    border-bottom: 2px solid rgb(235, 232, 232);
+    min-width: 980px;
+    color: #666;
+
+    header {
+      margin: 0 auto;
+      padding: 10px 0;
+      width: 980px;
+
+      .login {
+        float: right;
+      }
+
+      .bold {
+        font-style: normal;
+        color: $light_gray;
+      }
+    }
+  }
+
+  > section {
+    margin: 0 auto 30px;
+    padding-top: 30px;
+    width: 980px;
+    min-height: 300px;
+    padding-right: 100px;
+    box-sizing: border-box;
+
+    .status {
+      font-size: 12px;
+      margin-left: 20px;
+      color: #e6a23c;
+    }
+
+    .error {
+      color: red;
+    }
+  }
+
+  .tips {
+    float: right;
+    font-size: 14px;
+    color: #fff;
+    margin-bottom: 10px;
+
+    span {
+      &:first-of-type {
+        margin-right: 16px;
+      }
+    }
+  }
+}
+</style>
+
+<style scoped>
+/* 修改验证器样式 */
+::v-deep .el-form-item.is-error .el-input__inner {
+  border-color: #889aa4;
+}
+::v-deep .el-form-item.is-error .el-input__validateIcon {
+  color: #889aa4;
+}
+::v-deep .el-form-item__error {
+  color: #e6a23c;
+}
+</style>
diff --git a/src_old/utils/EventBus.js b/src_old/utils/EventBus.js
new file mode 100644
index 0000000..f9ef51b
--- /dev/null
+++ b/src_old/utils/EventBus.js
@@ -0,0 +1,2 @@
+import Vue from 'vue'
+export default new Vue()
\ No newline at end of file
diff --git a/src_old/utils/javaRequest.js b/src_old/utils/javaRequest.js
new file mode 100644
index 0000000..75f1b76
--- /dev/null
+++ b/src_old/utils/javaRequest.js
@@ -0,0 +1,8 @@
+import axios from "axios";
+
+const javaReq=axios.create({
+    // baseURL:'http://61.240.140.173:8088/',//java的地址前缀
+    baseURL:'/api/',//后端的地址前缀
+})
+
+export default javaReq
\ No newline at end of file
diff --git a/src_old/utils/request.js b/src_old/utils/request.js
new file mode 100644
index 0000000..863bbaf
--- /dev/null
+++ b/src_old/utils/request.js
@@ -0,0 +1,53 @@
+// axios二次封装
+import axios from 'axios'
+
+//
+const http = axios.create({
+    //通用请求
+    // baseURL:'http://61.240.140.173:8000/',//后端的地址前缀
+    baseURL:'/api/',//后端的地址前缀
+    // withCredentials:truenpm run serve
+    // async:true,
+    // timeout:'10000',//10s 超时时间
+    // headers:{token:sessionStorage.getItem('token')?sessionStorage.getItem('token'):'null'}
+
+})
+
+http.interceptors.request.use(
+    function(config) {
+        // 在请求发送之前，为 headers 添加 token
+        const token =sessionStorage.getItem('token')?sessionStorage.getItem('token'):'null';
+        const name =sessionStorage.getItem('user')?sessionStorage.getItem('user'):'null';
+
+        config.headers['token'] = token
+        // config.headers['user_name']=name
+
+
+        return config;
+    },
+    function(error) {
+        return Promise.reject(error);
+    }
+);
+
+// // 添加请求拦截器
+// http.interceptors.request.use(function (config) {
+//     // 在发送请求之前做些什么
+//     return config;
+//   }, function (error) {
+//     // 对请求错误做些什么
+//     return Promise.reject(error);
+//   });
+
+// // 添加响应拦截器
+// http.interceptors.response.use(function (response) {
+//     // 对响应数据做点什么
+//     return response;
+//   }, function (error) {
+//     // 对响应错误做点什么
+//     return Promise.reject(error);
+//   });
+
+
+export default http//将实例对外暴露
+
diff --git a/src_old/views/404.vue b/src_old/views/404.vue
new file mode 100644
index 0000000..06d885f
--- /dev/null
+++ b/src_old/views/404.vue
@@ -0,0 +1,18 @@
+<template>
+  <div>
+    <h1>404 - Page Not Found</h1>
+    <p>The page you are looking for does not exist.</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'NotFound'
+};
+</script>
+
+<style scoped>
+h1 {
+  color: #ffce2a;
+}
+</style>
\ No newline at end of file
diff --git a/src_old/views/Home.vue b/src_old/views/Home.vue
new file mode 100644
index 0000000..274a328
--- /dev/null
+++ b/src_old/views/Home.vue
@@ -0,0 +1,25 @@
+<!--  -->
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  components:{
+  },
+  data () {
+    return {
+    }
+  },
+  mounted(){
+  },
+  methods:{
+  },
+}
+</script>
+
+<style lang='less' scoped>
+
+</style>
diff --git a/src_old/views/Main.vue b/src_old/views/Main.vue
new file mode 100644
index 0000000..db1f140
--- /dev/null
+++ b/src_old/views/Main.vue
@@ -0,0 +1,123 @@
+<template>
+  <!-- 布局 -->
+  <el-container>
+    <el-aside width="auto">  <!-- auto自适应 -->
+      <Common-aside />  <!-- 不能用驼峰体CommonAside,要小写加斜杠 -->
+    </el-aside>
+
+    <el-container>
+      <el-header>
+        <common-header-user v-if="!state"/>
+        <common-header-admin v-if="state"/>
+      </el-header>
+
+      <el-main>
+        <!-- 子路由出口 -->
+        <!-- 路由匹配组建将渲染到这里 -->
+        <!-- 将每个页面提供边距(封套) -->
+        <div class='wrapper'>
+          <keep-alive>
+          <router-view>
+          </router-view>
+          </keep-alive>
+        </div>
+
+      </el-main>
+    </el-container>
+  </el-container>
+</template>
+
+<script>
+import CommonAside from "../components/CommonAside.vue";
+import CommonHeader from "../components/CommonHeader.vue";
+import CommonHeaderAdmin from "@/components/CommonHeaderAdmin";
+import CommonHeaderUser from "@/components/CommonHeaderUser";
+import {mapState} from "vuex";
+
+export default {
+  //
+  // beforeRouteEnter(to ,from,next){
+  //   console.log(to.name)
+  //   if (to.meta.requireAuth){//需要认证
+  //     if (user.state.isLogin || !user.state.isLogin && (to.name==='/user' ||to.name==='/login')){
+  //       next()
+  //     }else {
+  //       next('/login')
+  //       // return{
+  //       //   path:'/login',
+  //       //   query:{redirect:to.fullPath}
+  //       // }
+  //     }
+  //   }
+  //   else {
+  //     next()
+  //   }
+  //
+  // },
+
+
+    // beforeRouteEnter(to ,from,next){
+    //   console.log(to.name)
+    //   if (to.name==='/user' || to.name==='/login'){
+    //     next()
+    //   }
+    //     else if (isLogin){
+    //     next()
+    //   }
+    //   else {
+    //     next('/login')
+    //   }
+    //
+    // },
+  data() {
+    return {
+      user:''
+    };
+  },
+  computed:{
+    // state(){
+    //   return this.$store.state.isLogin
+    //
+    // },
+    ...mapState(['isLogin']),
+    // state(){
+    //   return this.$store.getters.getUserState || sessionStorage.getItem('stats')!==null
+    // }
+    state(){
+      return sessionStorage.getItem('stats') === '1'
+    },
+
+  },
+  watch:{
+    // state(newValue){
+    //   console.log(1)
+    //   console.log(newValue)
+    // }
+  },
+
+
+mounted() {
+  console.log(this.state)
+},
+
+  //引入组件
+  components: {
+    CommonAside,
+    CommonHeaderUser,
+    CommonHeaderAdmin,
+    CommonHeader,
+  },
+};
+</script>
+
+<style scoped>
+
+/* 边距(封套) */
+/* .wrapper{
+  padding:20px
+} */
+.el-header{
+
+  padding:0  /*横框左右间距为 0 */
+}
+</style>
diff --git a/src_old/views/MarketRisk.vue b/src_old/views/MarketRisk.vue
new file mode 100644
index 0000000..3b18948
--- /dev/null
+++ b/src_old/views/MarketRisk.vue
@@ -0,0 +1,879 @@
+<template>
+    <div>
+      <div class="one">
+        <el-card style='height: 750px;margin-bottom: 10px;' :body-style={padding:0}>
+       <!-- height:400px -->
+       <!-- 1、上标 -->
+        <span class="superscript" style="width: 20px; height: 40px;">系统性影响指标分析</span>
+        <!-- 2、产品搜索栏 -->
+
+        <div class="form">
+                                                         <!-- inline="true"表单域在一行 -->
+            <el-form :inline="true"  class="demo-form-inline" :model="formInline1" ref="formInline">
+<!--              <el-form-item label="市场" prop="市场">-->
+<!--                <el-select size="mini" v-model="formInline1.market">-->
+<!--                  <el-option label="股票" value="股票"></el-option>-->
+<!--                  <el-option label="基金" value="基金"></el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+
+              <el-form-item label="行业" prop="行业">
+                <el-select  size="mini" v-model="formInline1.industry" multiple>
+                  <el-option label="银行" value="银行"></el-option>
+                  <el-option label="保险" value="保险"></el-option>
+                  <el-option label="证券" value="证券"></el-option>
+                  <el-option label="其他" value="其他"></el-option>
+<!--                  <el-checkbox v-model="bank">银行</el-checkbox>-->
+<!--                  <el-checkbox v-model="insurance">保险</el-checkbox>-->
+<!--                  <el-checkbox v-model="security">证券</el-checkbox>-->
+<!--                  <el-checkbox v-model="other">其他</el-checkbox>-->
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="地区" prop="地区">
+                <el-select size="mini" v-model="formInline1.region" multiple clearable>
+                  <el-option v-for='(val,key) in region' :prop="key" :label="val"  :value="val" :key="key"/>
+
+
+                </el-select>
+
+              </el-form-item>
+              <el-form-item label="开始时间" prop="开始时间">
+                <el-date-picker
+                    v-model="formInline1.start_date"
+                    type="date"
+                    placeholder="年/月/日"
+                    size="mini">
+                </el-date-picker>
+              </el-form-item>
+
+              <el-form-item label="结束时间" prop="结束时间">
+              <el-date-picker
+                  v-model="formInline1.end_date"
+                  type="date"
+                  placeholder="年/月/日"
+                  size="mini">
+              </el-date-picker>
+            </el-form-item>
+              <el-form-item>
+                <el-button class="grayish_btn" @click="onSubmit1_query" size="mini">查询</el-button>
+              </el-form-item>
+              <el-form-item>
+                <el-button class="grayish_btn" @click="resetForm('formInline')" size="mini">清空</el-button>
+              </el-form-item>
+          </el-form>
+        </div>
+        <!-- 3、tab -->
+        <el-tabs type="border-card" style='margin: 0 20px 0 20px;'>
+
+          <!-- 收益率传染 -->
+          <el-tab-pane label="收益率传染">
+            <el-tabs type="card">
+              <!-- 风险价值排名 -->
+              <el-tab-pane label="风险价值排名">
+                        <!-- 返回table数据-tab1系统风险分析 -->
+              <div  class="content">
+                <el-table class='table' :data="tableData_1_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                          height="370"
+                  cell-class-name="content_center">
+                  <!-- header-row-class-name 表头行 加classname -->
+                  <!-- cell-class-name 单元格加名字 -->
+                <!-- border有边框 -->
+                    <!-- stripe
+                    height="90%"
+                    :data="tableData"
+                    style="width: 80%;  margin-top:10px; margin-bottom:10px;" -->
+                <el-table-column v-for='(val,key) in tableLabel_1' :prop="key" :label="val" show-overflow-tooltip sortable>
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+               </el-table>
+               <el-card style='height: 170px; margin: 5px 5px 2px 5px;background-color: rgba(200, 200, 200, 0.812);'>
+                <span v-html="info" ></span>
+               </el-card>
+
+              </div>
+            </el-tab-pane>
+              <!-- 风险价值动态变化 -->
+              <el-tab-pane label="风险价值动态变化">
+<!--                <addline />-->
+                 <div ref="echarts_1" style="height:300px;width:800px;margin-left: 200px;"></div>
+              </el-tab-pane>
+              <!-- 溢出风险价值动态变化 -->
+              <el-tab-pane label="溢出风险价值动态变化">
+<!--                <addline />-->
+                 <div ref="echarts_2" style="height:300px;width:800px;margin-left: 200px;"></div>
+              </el-tab-pane>
+              <!-- 格兰杰因果关系网络 -->
+              <el-tab-pane label="格兰杰因果关系网络">
+                <el-button class="grayish_btn" @click="onSubmit_grayish" >查看格兰杰因果关系网络</el-button>
+                <div ref="echarts_5" style="height:1000px;width:1000px;margin-left: 200px;"></div>
+              </el-tab-pane>
+            </el-tabs>
+          </el-tab-pane>
+
+
+          <!-- 波动传染 -->
+          <el-tab-pane label="波动传染">
+            <el-tabs type="card">
+              <!-- 波动率预测 -->
+              <el-tab-pane label="波动率预测">
+                <div ref="echarts_3" style="height:350px;width:800px; margin-left: 200px"></div>
+              </el-tab-pane>
+              <!-- 累计风险分数 -->
+              <el-tab-pane label="累计风险分数">
+                <div ref="echarts_4" style="height:300px;width:800px;margin-left: 200px;"></div>
+              </el-tab-pane>
+              <!-- 累计风险分数 -->
+              <el-tab-pane label="系统风险贡献率">
+                <el-table class='table' :data="tableData_1_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                          height="370"
+                  cell-class-name="content_center">
+                  <!-- header-row-class-name 表头行 加classname -->
+                  <!-- cell-class-name 单元格加名字 -->
+                <!-- border有边框 -->
+                    <!-- stripe
+                    height="90%"
+                    :data="tableData"
+                    style="width: 80%;  margin-top:10px; margin-bottom:10px;" -->
+                <el-table-column v-for='(val,key) in tableLabel_2' :prop="key" :label="val" show-overflow-tooltip sortable>
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+               </el-table>
+              </el-tab-pane>
+    
+            </el-tabs>
+          </el-tab-pane>
+        </el-tabs>
+
+
+      </el-card>
+    
+      </div>
+
+    </div>
+  </template>
+  
+  <script>
+
+  import qs from 'qs'
+  import * as echarts from "echarts"
+  import http from '../utils/request'
+  import addline from "../components/addline.vue";
+  export default {
+    //引入组件
+  // components: {
+  //   addline
+  // },
+    data() {
+      return {
+        region:
+            [
+                '全部',
+              '北京市',
+              '天津市',
+              '河北省',
+              '山西省',
+              '内蒙古自治区',
+              '辽宁省',
+              '吉林省',
+              '黑龙江省',
+              '上海市',
+              '江苏省',
+              '浙江省',
+              '安徽省',
+              '福建省',
+              '江西省',
+              '山东省',
+              '河南省',
+              '湖北省',
+              '湖南省',
+              '广东省',
+              '广西壮族自治区',
+              '海南省',
+              '重庆市',
+              '四川省',
+              '贵州省',
+              '云南省',
+              '西藏自治区',
+              '陕西省',
+              '甘肃省',
+              '青海省',
+              '宁夏回族自治区',
+              '新疆维吾尔自治区',
+              '台湾省',
+              '香港特别行政区',
+              '澳门特别行政区'
+            ],
+        cp:{},
+        dat:{},
+        ra:[],
+        // bank:false,
+        // insurance:false,
+        // security:false,
+        // other:false,
+// 【整合接收数据】
+// 表单1-"系统风险分析"
+
+    formInline1: {
+        market:[],
+        industry:[],
+        start_date:'',
+        end_date:'',
+      region:[]
+    },
+// 表单2-个体风险分析
+formInline2: {
+        market:'',
+        industry:'',
+        start_date:'',
+        end_date:'',
+    },
+
+
+// 【表格】
+// [table-label]
+        // tab1"收益率传染"表格
+        tableLabel_1: {
+            id:'编号',
+            name:'名称',
+            Data:'β系数',
+            COVAR:'条件风险价值',
+            VAR_005:'风险价值(机构处于极端状况)',
+            VAR_05:'风险价值(机构处于常态)',
+            DELTA_COVAR:'溢出风险价值',
+            risk_level:'风险等级',
+      },
+        // tab2-“系统风险贡献率”的表格
+        tableLabel_2:{
+          name:'名称',
+          pcas:'系统风险贡献率',
+          rank:'排名'
+        },
+
+
+// [table-data]
+        // tab1"收益率传染"表格
+      tableData_1_1: [
+        // {  num:0,
+        //     name:'秦农商行',
+        //     Data:0.129,
+        //     condention_var:-0.06564,
+        //     var_extre:-0.11661,
+        //     var_norm:-0.03489,
+        //     overflow:0.01061,
+        //     risk_level:'一级风险',},
+        //     {  num:1,
+        //     name:'华夏商行',
+        //       Data:0.129,
+        //     condention_var:-0.06564,
+        //     var_extre:-0.11661,
+        //     var_norm:-0.03489,
+        //     overflow:0.01061,
+        //     risk_level:'一级风险',},
+        //     {  num:2,
+        //     name:'xx商行',
+        //     β:0.129,
+        //     condention_var:-0.06564,
+        //     var_extre:-0.11661,
+        //     var_norm:-0.03489,
+        //     overflow:0.01061,
+        //     risk_level:'一级风险',},
+      ],
+       // tab2-“系统风险贡献率”的表格
+       tableData_1_2: [],
+
+      //个体风险分析表格
+      tableData_card2: [
+        {  
+            name:'秦农商行',
+            },
+            {  
+            name:'华夏商行',
+            },
+      ],
+      // 解释说明
+      info:"·第一个指标：β系数，表示公司i(或金融机构)与整体回报（损失）之间的相关性，同时它也是影响公司i(或金融机构)陷入危机时对整体的风险溢出大小的要素之一。按照该指标进行排名时，排名靠前的公司(或金融机构)，如浙商银行、紫金银行、民生银行等，说明其与整体之间的联动性比较强，对系统风险的贡献排名比较靠前。<br/>·第二个指标：条件风险价值，表示当i公司(或金融机构)处于极端困境情况时，系统整体的最大可能损失。<br/>·第三个指标，风险价值(机构处于极端困境情况时)，表示由于某种市场因素如股票价格、汇率或者利率等突然发生变化时，某项金融产品头寸或者资产组合在特定置信水平及持有期条件下所可能遭受的最大损失。按照该指标进行排名时，排名靠前的公司(或金融机构)，说明其风险较高，风险防控能力还需要加强。该指标对于公司i(或金融机构)自身的风险监控尤为重要，风险较高时很容易成为系统性危机的诱因。<br/>·第四个指标，风险价值(机构处于常态时)，表示该机构处于常态时，某项金融产品头寸或者资产组合在特定置信水平及持有期条件下所可能遭受的最大损失。<br/>·第五个指标：溢出风险价值，可以直观的反映公司i(或金融机构)的风险事件对整体的风险溢出值，衡量了公司i(或金融机构)对系统风险的贡献程度。按照该指标进行排名时，排名靠前的公司(或金融机构)，说明其对系统造成的影响(系统溢出效应)将更加明显，监管部门需要尤为关注。"
+
+
+      }
+    },
+    mounted(){},
+
+
+    methods: {
+      // 清空功能
+      resetForm(formInline) {
+        this.$refs[formInline].resetFields();
+        this.formInline1= {}
+        console.log(this.formInline1)
+        console.log('正在清空')
+        
+      },
+
+      onSubmit1_query() {//确定
+        console.log("系统风险分析查询")
+        console.log(this.formInline1.market)
+        if(this.formInline1.region.includes('全部') && this.formInline1.region.length!==1  ){
+
+          this.$message.warning('请重新选择')
+        }
+        else {
+          http.get(
+              "/risk/risk_set/",
+              {params:{
+                  industry: this.formInline1.industry,//行业
+                  market: this.formInline1.market,//市场
+                  start_date:this.formInline1.start_date,
+                  end_date:this.formInline1.end_date,
+                  region:this.formInline1.region
+                },
+                //   防止带中括号
+                paramsSerializer:params => {
+                  return qs.stringify(params,{indices:false})
+                }
+              }).then(response => {
+            this.tableData_1_1= response.data.data['covar_table']
+            this.tableData_1_2= response.data.data['ra']
+            this.dat=response.data.data['data']
+            this.ra=response.data.data['ra']
+            this.cp=response.data.data['cp']
+            //拿到所有数据
+            //风险价值动态变化
+            const echarts1 = echarts.init(this.$refs.echarts_1)
+            { let keys,x,bank,insurance,security,other,legend
+
+              for (keys in this.cp['Var']){
+                if (keys=== 'x'){
+                  x=this.cp['Var']['x']
+                }
+                if (keys=== 'bank'){
+                  bank=this.cp['Var']['bank']
+                }
+                if (keys=== 'insurance'){
+                  insurance=this.cp['Var']['insurance']
+                }
+                if (keys=== 'zhengquan'){
+                  security=this.cp['Var']['zhengquan']
+                }
+                if (keys=== 'other'){
+                  other=this.cp['Var']['other']
+                }
+                if (keys=== 'data1'){
+                  legend=this.cp['Var']['data1']
+                }
+              }
+              const option_1 = {
+                // 右上角存图
+                toolbox: {
+                  feature: {
+                    saveAsImage: {}
+                  }
+                },
+                legend: {
+                  data: legend},
+                title: [
+                  {
+                    x :'center',
+                    y:'bottom',
+
+                    text: '各行业风险价值（机构处于极端困难情况时）的时序变化'
+                  },
+                ],
+                tooltip: {
+                  trigger: 'axis'
+                },
+                xAxis: {
+                  data:x
+                },
+
+                yAxis: [
+                  {},
+                ],
+
+                series: [
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'银行',
+                    data:bank
+                  },
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'保险',
+                    data:insurance
+                  },
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'证券',
+                    data:security
+                  },
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'其他',
+                    data:other
+                  },
+
+                ]
+              };
+              echarts1.setOption(option_1)}
+            //溢出风险动态变化
+            const echarts2 = echarts.init(this.$refs.echarts_2)
+            {let keys,x,bank,insurance,security,other,legend
+
+              for (keys in this.cp['Delta_Covar']){
+                if (keys=== 'x'){
+                  x=this.cp['Delta_Covar']['x']
+                }
+                if (keys=== 'bank'){
+                  bank=this.cp['Delta_Covar']['bank']
+                }
+                if (keys=== 'insurance'){
+                  insurance=this.cp['Delta_Covar']['insurance']
+                }
+                if (keys=== 'zhengquan'){
+                  security=this.cp['Delta_Covar']['zhengquan']
+                }
+                if (keys=== 'other'){
+                  other=this.cp['Delta_Covar']['other']
+                }
+                if (keys=== 'data1'){
+                  legend=this.cp['Delta_Covar']['data1']
+                }
+              }
+              const option_2 = {
+                // 右上角存图
+                toolbox: {
+                  feature: {
+                    saveAsImage: {}
+                  }
+                },
+                legend: {
+                  data: legend},
+                title: [
+                  {
+                    x :'center',
+                    y:'bottom',
+
+                    text: '各行业风险价值（机构处于极端困难情况时）的时序变化'
+                  },
+                ],
+                tooltip: {
+                  trigger: 'axis'
+                },
+                xAxis: {
+                  data:x
+                },
+
+                yAxis: [
+                  {},
+                ],
+
+                series: [
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'银行',
+                    data:bank
+                  },
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'保险',
+                    data:insurance
+                  },
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'证券',
+                    data:security
+                  },
+                  {
+                    type: 'line',
+                    showSymbol: true,
+                    // color：
+                    name:'其他',
+                    data:other
+                  },
+
+                ]
+              };
+              echarts2.setOption(option_2)}
+
+            // 波动率预测
+
+            const echarts3 = echarts.init(this.$refs.echarts_3)
+            {let keys,GRACH_Volatility,Real_Volatility,x
+
+              for (keys in this.dat['GARCH']){
+                if (keys=== 'GARCH_Volatility'){
+                  GRACH_Volatility=this.dat['GARCH']['GARCH_Volatility']
+                }
+                if (keys=== 'Real_Volatility'){
+                  Real_Volatility=this.dat['GARCH']['Real_Volatility']
+                }
+                if (keys=== 'x'){
+                  x=this.dat['GARCH']['x']
+                }}
+
+
+              const option_3 = {
+                // 右上角存图
+                toolbox: {
+                  feature: {
+                    saveAsImage: {}
+                  }
+                },
+                // Make gradient line here
+
+                // visualMap: [//将第一个数据组用不同啊颜色展示
+                //   {
+                //     show: false,
+                //     type: 'continuous',
+                //     seriesIndex: 0,
+                //     min: 0,
+                //     max: 400
+                //   },
+
+                // ],
+                // title: [
+                //   {
+                //   x : 'center',
+                //   y:'bottom',
+
+                //     text: '各行业溢出风险价值的时序变化'
+                //   },
+                // ],
+                legend: {
+                  data: ['GARCH(1,1) Volatility', 'Real Volatility']
+                },
+                tooltip: {
+                  trigger: 'axis'
+                },
+                xAxis: {
+                  data:x
+                },
+                yAxis: [
+                  {},
+                ],
+
+                series: [
+                  {
+                    name: 'GARCH(1,1) Volatility',
+                    type: 'line',
+                    showSymbol: true,
+                    color:'#654e3e',//深褐色
+                    data: GRACH_Volatility
+                  },
+                  {
+                    name: 'Real Volatility',
+                    type: 'line',
+                    showSymbol: true,
+                    color:'#b0896d',//浅褐色
+                    data: Real_Volatility,//加入新数据
+                  },
+
+                ]
+              };
+              echarts3.setOption(option_3)}
+
+            //累计风险分数
+            const echarts4 = echarts.init(this.$refs.echarts_4)
+            {let keys,PCA1,PCA10,PCA5,PCA25,x
+
+              for (keys in this.dat['PCA']){
+                if (keys=== 'PCA1'){
+                  PCA1=this.dat['PCA']['PCA1']
+                }
+                if (keys=== 'PCA10'){
+                  PCA10=this.dat['PCA']['PCA10']
+                }
+                if (keys=== 'x'){
+                  x=this.dat['PCA']['x']
+                }
+                if (keys=== 'PCA25'){
+                  PCA25=this.dat['PCA']['PCA25']
+                }
+                if (keys=== 'PCA5'){
+                  PCA5=this.dat['PCA']['PCA5']
+                }}
+
+              const option_4 = {
+                // 右上角存图
+                toolbox: {
+                  feature: {
+                    saveAsImage: {}
+                  }
+                },
+                title: {
+                  text: '主成分解释股票收益率变动的比例'
+
+                },
+                tooltip: {
+                  trigger: 'axis',
+                  axisPointer: {
+                    type: 'cross',
+                    label: {
+                      backgroundColor: '#6a7985'
+                    }
+                  }
+                },
+                legend: {
+                  data: ['PC1', 'PC5', 'PC10', 'PC25']
+                },
+
+
+                grid: {
+                  left: '3%',
+                  right: '4%',
+                  bottom: '3%',
+                  containLabel: true
+                },
+                xAxis: [
+                  {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: x,
+                  }
+                ],
+                yAxis: [
+                  {
+                    type: 'value'
+                  }
+                ],
+                series: [
+                  {
+                    name: 'PC1',
+                    type: 'line',
+                    stack: 'Total',
+                    areaStyle: {},
+                    emphasis: {
+                      focus: 'series'
+                    },
+                    data: PCA1
+                  },
+                  {
+                    name: 'PC5',
+                    type: 'line',
+                    stack: 'Total',
+                    areaStyle: {},
+                    emphasis: {
+                      focus: 'series'
+                    },
+                    data: PCA5
+                  },
+                  {
+                    name: 'PC10',
+                    type: 'line',
+                    stack: 'Total',
+                    areaStyle: {},
+                    emphasis: {
+                      focus: 'series'
+                    },
+                    data:PCA10
+                  },
+                  {
+                    name: 'PC25',
+                    type: 'line',
+                    stack: 'Total',
+                    areaStyle: {},
+                    emphasis: {
+                      focus: 'series'
+                    },
+                    data: PCA25
+                  },
+
+                ]
+              }
+              echarts4.setOption(option_4)
+
+            }
+          })
+        }
+
+      },
+
+      // 查看格兰杰因果关系网络
+      onSubmit_grayish(){
+        console.log("查看格兰杰因果关系网络")
+        http.get(
+            "/risk/risk_net/",).then(response => {
+              let links= response.data.data['links']
+              let nodes=response.data.data['nodes']
+        const graph=echarts.init(this.$refs.echarts_5)
+        let option = {
+          title: {
+            text: '格兰杰因果关系网络',
+            top: 'bottom',
+            left: 'right'
+          },
+          tooltip: {},
+          // legend: [
+          //   {
+          //     data: graph.categories.map(function (a) {
+          //       return a.name;
+          //     })
+          //   }
+          // ],
+          animationDurationUpdate: 1500,
+          animationEasingUpdate: 'quinticInOut',
+          series: [
+            {
+              name: '格兰杰因果关系网络',
+              type: 'graph',
+              layout: 'circular',
+              circular: {
+                rotateLabel: true
+              },
+              data: nodes,
+              links: links,
+              // categories: graph.categories,
+              roam: true,
+              label: {
+                position: 'right',
+                formatter: '{b}'
+              },
+              lineStyle: {
+                color: 'source',
+                curveness: 0.3
+              }
+            }
+          ]
+        };
+          graph.setOption(option)
+      })
+
+      },
+
+      // part2的提交
+      onSubmit2_query() {
+        console.log("个体风险分析")
+        http.get(
+                "/risk/risk_individual/",
+                {params:{
+                    name1: this.formInline.industry,//行业
+                    name2: this.formInline.market,//省or市场
+                    start_date:this.formInline.start_date,
+                    end_date:this.formInline.end_date,
+        }}).then(response => {
+            this.tableData_card2= response.data.data.cover_table
+            console.log(response)
+            console.log(response.data)
+
+          })
+      },
+      //还有Query and Clear和图表没做
+
+      dateList(data){
+        const dateList =data.map(function (item) {
+          return item[0];
+          });
+          return dateList
+      },
+
+      valueList(data){
+        const valueList =data.map(function (item) {
+          return item[1];
+          });
+          return valueList
+      },
+
+
+    }
+
+      };
+  
+  </script>
+  
+
+
+<style lang="less" scoped>
+.grayish_btn{//浅灰色按钮
+  color: #fff;//文字颜色
+  background-color: #aaaaaa;//背景颜色
+}
+
+
+  .form{//产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:10px; 
+    // height: 40px;
+    padding-left: 20px;
+
+  }
+  .content{
+    
+    font-size: 12px;
+
+
+  }
+    
+    // 调整表头间隔、设置表头下方边框颜色
+
+
+    .table{
+  // 和选项框隔开
+  // margin:10px;
+  font-size: 12px;
+  padding: 0px 5px 2px 5px;//返回表格添加间隙 上 右
+
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 1px 1px 1px;
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0;
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #110101;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+}
+.kala_text {
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+  
+</style>
+  
\ No newline at end of file
diff --git a/src_old/views/SSE.vue b/src_old/views/SSE.vue
new file mode 100644
index 0000000..1384914
--- /dev/null
+++ b/src_old/views/SSE.vue
@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <h1>SSE数据：</h1>
+    <ul>
+      <li v-for="message in messages" :key="message.id">{{ message.data }}</li>
+    </ul>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "SSE.vue",
+  data(){
+    return{
+      message:''
+
+    }
+  },
+  methods:{
+      longConnect(){
+        const eventSource=new EventSource('http://61.240.140.173:9999/sse?message="fine"')
+        eventSource.onmessage=function (event){
+          const result= event.data;
+          console.log('receive:',result)
+        }
+        eventSource.addEventListener('message', (event) => {
+          this.messages.push({ id: Date.now(), data: event.data });
+          console.log( event.data)
+        });
+      }
+  },
+  mounted() {
+    this.longConnect()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src_old/views/UserManagement.vue b/src_old/views/UserManagement.vue
new file mode 100644
index 0000000..d00bfe2
--- /dev/null
+++ b/src_old/views/UserManagement.vue
@@ -0,0 +1,594 @@
+<!-- 用户管理 -->
+<template>
+
+    
+  <div>
+    <el-row>
+      <el-tabs type="border-card">
+      <el-tab-pane label="邀请码">
+    <div class="form">
+        
+                                                        <!-- inline="true"表单域在一行 -->
+          <el-form :inline="true"  :model="formInline" class="demo-form-inline">
+
+
+<!--            <el-form-item label="搜索用户名">-->
+<!--                <el-input v-model="formInline.name" size="mini" placeholder="" ></el-input>-->
+<!--            </el-form-item>-->
+
+            <el-form-item style="margin-left: 10px;">
+              <el-button  @click="onSubmit" >查看所有用户</el-button>
+            </el-form-item>
+          </el-form>
+
+
+        
+            <el-form :inline="true"  :model="formInline" class="demo-form-inline">
+
+
+<!--            <el-form-item>-->
+<!--                <el-button v-if="permissions=='管理员'" type="warning"   plain @click="onSubmit" icon="el-icon-postcard" size="mini" >点击生成邀请码</el-button>-->
+<!--            </el-form-item>-->
+
+            <el-form-item >
+                <el-button type="primary" plain style="margin-right: 10px;margin-left: 10px;" size="mini" icon="el-icon-plus" @click="addInviteCode">点击添加邀请码</el-button>
+            </el-form-item>
+           
+          </el-form>
+
+    </div>
+
+    <el-table v-if="permissions=='管理员'" class='table' :data="tableData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                border
+                height="100%"   
+                :row-style="{height:'36px'}"
+                :cell-style="{padding:'0px'}"
+                header-row-class-name="active_header"
+                header-cell-class-name="active_header"
+                cell-class-name="content_center">
+                
+                <el-table-column v-for='(val,key) in tableLabel' :prop="key" :label="val" /><!--插槽里面没有东西就可以用单标签  -->
+
+                <el-table-column
+                    prop="scale"
+                    label="操作">
+                    <template slot-scope="scope">
+
+                         <!-- <el-button v-if="scope.row.权限=='管理员'" v-on:click="detail(scope.row)" size="mini" type="primary">生成邀请码</el-button> -->
+                         <el-button v-on:click="modify(scope.row)" size="mini" >修改</el-button>
+                         <el-button v-on:click="delete(scope.row)" size="mini" >删除</el-button>
+
+                    </template>
+                </el-table-column>
+              </el-table>
+    <el-button style='width: 150px;' @click="queryInviteCode">邀请码管理</el-button>
+    <el-dialog title="邀请码使用情况" :visible.sync="dialogVisible" width="100%">
+        <el-table
+            :data="inviteCodeData"
+            stripe
+            style="width: 100%">
+          <el-table-column
+              prop="code"
+              label="邀请码"
+              width="200">
+          </el-table-column>
+          <el-table-column
+              prop="ctime"
+              label="生成时间"
+              width="300">
+          </el-table-column>
+          <el-table-column
+              prop="tuser"
+              label="使用者"
+          width="100">
+          </el-table-column>
+          <el-table-column
+              prop="status"
+              label="是否使用"
+              width="100">
+          </el-table-column>
+          <el-table-column
+              prop="utime"
+              label="使用时间"
+              width="300">
+          </el-table-column>
+        </el-table>
+    </el-dialog>
+    <el-dialog title="用户列表" :visible.sync="usertDataVisible" width="100%">
+      <el-table
+          :data="usertData"
+          stripe
+          style="width: 100%">
+        <el-table-column
+            prop="realname"
+            label="姓名"
+            width="200">
+        </el-table-column>
+        <el-table-column
+            prop="username"
+            label="用户名"
+            width="200">
+        </el-table-column>
+        <el-table-column
+            prop="telephone"
+            label="电话"
+            width="300">
+        </el-table-column>
+        <el-table-column
+            prop="email"
+            label="邮箱"
+            width="200">
+        </el-table-column>
+        <el-table-column
+            prop="unit"
+            label="单位"
+            width="200">
+        </el-table-column>
+        <el-table-column
+            prop="position"
+            label="职位"
+            width="200">
+        </el-table-column>
+        <el-table-column
+            prop="status"
+            label="是否为管理员（1为管理员）"
+            width="80">
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+    <el-dialog title="当前生成的邀请码" :visible.sync="inviteCodeVisible" width="100%">
+      {{inviteCode}}
+    </el-dialog>
+    </el-tab-pane>
+
+    <el-tab-pane label="用户活动" height="500px">
+    <el-form :inline="true">
+
+      <el-form-item >
+        <el-input v-model="name"  placeholder="请输入用户名" size="mini" @keyup.enter.native="activity(name,start,end)" @submit.native.prevent></el-input>
+      </el-form-item>
+
+      <el-form-item label="开始时间" prop="开始时间">
+        <el-date-picker
+            v-model="start"
+            type="date"
+            placeholder="年/月/日"
+            size="mini"
+            value-format="yyyy-MM-dd[T]hh:mm:ss[.000Z]"
+        >
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="结束时间" prop="结束时间">
+        <el-date-picker
+            v-model="end"
+            type="date"
+            placeholder="年/月/日"
+            size="mini"
+            value-format="yyyy-MM-dd[T]hh:mm:ss[.000Z]"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item >
+        <el-button type="primary" plain style="margin-right: 10px;margin-left: 10px;"   @click="activity(name,start,end)">查看</el-button>
+      </el-form-item>
+    </el-form>
+<!--用户表-->
+      <el-table class='table' :data="activityData.slice((currentPage-1)*pageSize,currentPage*pageSize)" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                border
+                height="100%"
+                :row-style="{height:'36px'}"
+                :cell-style="{padding:'0px'}"
+                header-row-class-name="active_header"
+                header-cell-class-name="active_header"
+                cell-class-name="content_center">
+
+        <el-table-column v-for='(val,key) in activityLabel' :prop="key" :label="val" /><!--插槽里面没有东西就可以用单标签  -->
+
+<!--        <el-table-column-->
+<!--            prop="scale"-->
+<!--            label="操作">-->
+<!--          <template slot-scope="scope">-->
+
+<!--            &lt;!&ndash; <el-button v-if="scope.row.权限=='管理员'" v-on:click="detail(scope.row)" size="mini" type="primary">生成邀请码</el-button> &ndash;&gt;-->
+<!--            <el-button v-on:click="modify(scope.row)" size="mini" >修改</el-button>-->
+<!--            <el-button v-on:click="delete(scope.row)" size="mini" >删除</el-button>-->
+
+<!--          </template>-->
+<!--        </el-table-column>-->
+      </el-table>
+
+<!--      分页-->
+      <div class="block" style="margin-top:15px;">
+        <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                       :current-page="currentPage"
+
+                       :page-size="pageSize"
+                       layout="total, sizes, prev, pager, next, jumper"
+                       :total="activityData.length">
+        </el-pagination>
+      </div>
+
+
+
+    </el-tab-pane>
+        <el-tab-pane label="访问模块" height="500px">
+          <el-form :inline="true">
+
+          <el-form-item label="开始时间" prop="开始时间">
+            <el-date-picker
+                v-model="moduleStart"
+                type="date"
+                placeholder="年/月/日"
+                size="mini"
+                value-format="yyyy-MM-dd[T]hh:mm:ss[.000Z]"
+            >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="结束时间" prop="结束时间">
+            <el-date-picker
+                v-model="moduleEnd"
+                type="date"
+                placeholder="年/月/日"
+                size="mini"
+                value-format="yyyy-MM-dd[T]hh:mm:ss[.000Z]"
+            >
+            </el-date-picker>
+          </el-form-item>
+            <el-form-item >
+              <el-button type="primary" plain style="margin-right: 10px;margin-left: 10px;"   @click="moduleAct(moduleStart,moduleEnd)">查看</el-button>
+            </el-form-item>
+          </el-form>
+
+          <div id="module" ref="module"  style="width:100%;height:300px;"></div>
+          <div id="time" ref="time"  style="width:100%;height:300px;"></div>
+        </el-tab-pane>
+
+      </el-tabs>
+    </el-row>
+
+  </div>
+
+</template>
+
+<script>
+import http from "@/utils/request";
+import * as echarts from "echarts"
+import {Loading} from "element-ui";
+export default {
+  components:{
+  },
+  data () {
+    return {
+      moduleStart:'',
+      moduleEnd:'',
+      start:'',
+      end:'',
+      currentPage: 1, // 当前页码
+      total: 20, // 总条数
+      pageSize: 10, // 每页的数据条数
+      name:'',
+      activityData:[],
+      usertData:'',
+      usertDataVisible:false,
+      inviteCode:'',
+      inviteCodeData:[],
+      dialogVisible:false,
+      inviteCodeVisible:false,
+        formInline:{
+            name:''
+        },
+        // 当前用户
+        // permissions:'管理员',
+        permissions:'普通用户',
+
+      activityLabel:{
+        用户名:'用户名',
+        IP:'IP',
+        访问模块:'访问模块',
+        关键词:'关键词',
+        时间:'时间',
+
+
+      },
+
+        tableLabel: {
+                  用户名: '用户名',
+                  姓名: '姓名',
+                  电话: '电话',
+                  邮箱: '邮箱',
+                  单位:'单位',
+                  职位:'职位',
+                  权限:'权限',
+                  
+
+        },
+        tableData:[
+            {
+                用户名: 'user1',
+                权限:'管理员',
+            },
+            {
+                用户名: 'test1',
+                权限:'普通用户',
+            },
+            {
+                用户名: 'test2',
+                权限:'普通用户',
+            },
+            {
+                用户名: 'test3',
+                权限:'普通用户',
+            },
+            {
+                用户名: 'user2',
+                权限:'管理员',
+            },
+            {
+                用户名: 'test4',
+                权限:'普通用户',
+            },
+            {
+                用户名: 'test5',
+                权限:'普通用户',
+            },
+                ]
+    }
+  },
+  mounted(){
+
+  },
+  watch:{
+    activityData(){
+      console.log(this.activityData.length)
+      this.total= this.activityData.length
+    }
+
+  },
+  methods:{
+
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.currentPage = 1;
+      this.pageSize = val;
+    },
+    //当前页改变时触发 跳转其他页
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.currentPage = val;
+    },
+
+
+    activity(name,start,end){
+      const params = new URLSearchParams();
+      params.append('username', name);
+      params.append('stime',start);
+      params.append('etime',end);
+      // if (start!=='' && end!==''){
+      //   ''
+      // }
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
+      http.post('/users/user_act/',params).then((res)=>{
+        this.activityData=res.data
+        loadingInstance.close()
+      }).finally(()=>
+          loadingInstance.close()
+      )
+    },
+
+    moduleAct(moduleStart,moduleEnd){
+      const params = new URLSearchParams();
+      params.append('stime',moduleStart)
+      params.append('etime',moduleEnd)
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
+      http.post('/users/model_act/',params).then((res)=>{
+        let data=[]
+        for (let i in res.data){
+          let tmp={}
+          tmp['name']=res.data[i]['访问模块']
+          tmp['value']=res.data[i]['次数']
+          data.push(tmp)
+        }
+        // let chartDom = document.getElementById('module');
+        let myChart = echarts.init(this.$refs.module)
+        let option = {
+          tooltip: {
+            trigger: 'item'
+          },
+          legend: {
+            top: '5%',
+            left: 'center'
+          },
+          series: [
+            // {
+            //   name: '访问来源',
+            //   type: 'pie',
+            //   radius: ['50%', '70%'],
+            //   avoidLabelOverlap: false,
+            //   label: {
+            //     show: false,
+            //     position: 'center'
+            //   },
+            //   emphasis: {
+            //     label: {
+            //       show: true,
+            //       fontSize: '30',
+            //       fontWeight: 'bold'
+            //     }
+            //   },
+            //   labelLine: {
+            //     show: false
+            //   },
+            //   data: data
+            // }
+
+            {
+              name: 'Access From',
+              type: 'pie',
+              radius: ['40%', '70%'],
+              avoidLabelOverlap: false,
+              padAngle: 5,
+              itemStyle: {
+                borderRadius: 10
+              },
+              label: {
+                show: false,
+                position: 'center'
+              },
+              emphasis: {
+                label: {
+                  show: true,
+                  fontSize: 40,
+                  fontWeight: 'bold'
+                }
+              },
+              labelLine: {
+                show: false
+              },
+              data: data
+            }
+          ]
+        };
+        // console.log(option)
+    myChart.setOption(option)
+        console.log(myChart.getOption())
+
+      })
+      http.post('/users/time_act/',params).then((res)=>{
+
+       let  data=[]
+        let time=[]
+        for (let i in res.data){
+         time.push(res.data[i]['访问模块'])
+          data.push(res.data[i]['访问量'])
+        }
+        // let chartDom = document.getElementById('time');
+
+        let myChart = echarts.init(this.$refs.time);
+        let option = {
+          xAxis: {
+            type: 'category',
+            data: data
+          },
+          yAxis: {
+            type: 'value'
+          },
+          series: [
+            {
+              data: time,
+              type: 'line',
+              smooth: true
+            }
+          ]
+        };
+        // console.log(option)
+        myChart.setOption(option);
+        console.log(myChart.getOption())
+      })
+      loadingInstance.close()
+
+
+    },
+
+    queryInviteCode(){
+      http.get('/users/invite_all/').then((res)=>{
+        this.inviteCodeData=res.data
+        this.dialogVisible=true
+      })
+    },
+    addInviteCode(){
+      http.get('/users/invite/').then((res)=>{
+
+        this.inviteCode=res.data
+        this.inviteCodeVisible=true
+      })
+    },
+    onSubmit(){
+      http.post('/users/all_users/').then((res)=>{
+        this.usertData=res.data
+        this.usertDataVisible=true
+      })
+
+
+    },
+    modify(){},
+    delete(){},
+  },
+}
+</script>
+<style lang='less' scoped>
+.form1{//2、产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin:0px; 
+    // height: 40px;
+    padding-left: 5px;
+    .el-form-item {
+    margin-bottom: 5px;
+}
+
+  }
+  .form{//搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    // margin-top:5px; 
+    // height: 40px;
+    padding-left: 5px;
+  }
+
+  .table{
+    margin-top: 0px;
+    margin-right: 0px;
+    margin-left: 5px;
+    padding: 0px;
+    }
+//     /deep/ .el-table {
+//   width: 98.5% !important;
+// }
+// /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+//       border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
+//       padding: 0px 0 !important;
+//       min-width: 0 !important;
+//     }
+//     .el-table .el-table__cell {
+//       padding: 20px 0; 
+//       min-width: 0;
+//     }
+    /deep/ .active_header{//表头
+      color: #333333;
+      font-size: 13px;
+      text-align: center !important;
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      font-size: 13px;
+    }
+
+
+    
+  .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+
+.el-tabs--card {
+  height: calc(100vh - 110px);
+  /* overflow-y: auto; */
+}
+.el-tab-pane {
+  height: calc(100vh - 110px);
+  overflow-y: auto;
+}
+
+</style>
diff --git a/src_old/views/graphViewV4.vue b/src_old/views/graphViewV4.vue
new file mode 100644
index 0000000..523f1de
--- /dev/null
+++ b/src_old/views/graphViewV4.vue
@@ -0,0 +1,2436 @@
+<template xmlns:position="http://www.w3.org/1999/xhtml">
+  <div class="container" >
+<!--    <form action="">-->
+<!--      <input type="text"   v-model="content">-->
+<!--      <button @click="findNode(content)" type="button">搜索图谱</button>-->
+<!--    </form>-->
+    <el-form :inline="true">
+      <el-form-item label="公司名称">
+<!--        回车查询-->
+        <form @submit.prevent>
+        <el-input v-model="content"  placeholder="请输入" size="mini" @keyup.enter.native="findNode(content)" @submit.native.prevent></el-input>
+        </form>
+      </el-form-item>
+      <el-form-item>
+        <el-button class="grayish_btn" @click="findNode(content)" size="mini" >查询</el-button>
+      </el-form-item>
+      <el-button @click="drawer = true" type="primary" plain style="margin-left: 20px;">更多功能</el-button>
+    </el-form>
+
+    <!--    详细信息弹窗-->
+    <el-button type="text" @click="dialogVisible = true" >查看详细信息</el-button>
+    <el-dialog title="详细信息" :visible.sync="dialogVisible" width="100%">
+      <el-table style="width: 100%" border :data="tableData" empty-text="暂无数据" >
+        <template v-for="(item,index) in tableHead">
+          <el-table-column  :prop="item.prop" :label="item.label" :key="index" :width="item.width"></el-table-column>
+        </template>
+
+      </el-table>
+    </el-dialog>
+
+<!--    关联实体弹窗-->
+    <el-dialog title="关联实体信息" :visible.sync="relationDialog" width="70%" >
+        <el-table :data="relationData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                  border
+                  stripe
+                  style="width: 100%">          <!-- style="width: 40%"               height="215"  -->
+          <el-table-column
+              prop="关联实体"
+              label="关联实体 "
+              width="180">
+          </el-table-column>
+          <el-table-column
+              prop="类型"
+              label="关联类型"
+              width="180">
+          </el-table-column>
+          <el-table-column
+              prop="权重"
+              label="权重"
+              width="300">
+          </el-table-column>
+          <el-table-column
+              prop="相似性强度"
+              label="相似性强度"
+              width="80">
+          </el-table-column>
+        </el-table>
+      <div class="flex-charts">
+        <div ref="relationChart" style="height:300px;width:1000px; border: 1px solid #e0e0e0;margin:20px"></div>
+      </div>
+
+    </el-dialog>
+
+  <div class="graph" ref="graph" id="graph" ></div>
+<!--    <div id="hovertip" position: absolute; ></div>-->
+<!--    <div id="timebrush_div" style="z-index: 999;position: absolute;margin-top: -35px;width:100%;bottom: 20px" class="test1"></div>-->
+    <table id="node_info_table"><tbody id="tbody1" style=""></tbody></table>
+
+
+    <el-drawer
+      title="功能选项卡"
+      :visible.sync="drawer"
+      :modal="false"
+      :show-close="true"
+      :with-header="false">
+
+
+      <!-- 1、更改布局 -->
+      <el-form label-position='top' label-width="80px" >
+
+      <div style="margin-top: 20px;">
+      <el-divider content-position="left"><p style="font-weight: bold">更改布局</p></el-divider>
+      </div>
+
+      <el-form-item >
+        <el-button  @click="saveImg" size="mini" style="margin-left:12px ;">导出图谱</el-button>
+        <el-button  @click="cose" size="mini" style="margin-left:12px ;">CoSE</el-button>
+  <!--      <el-button  @click="euler" size="mini">euler</el-button>-->
+        <el-button  @click="circle" size="mini">Circle</el-button>
+        <el-button  @click="concentric" size="mini">Concentric</el-button>
+        <el-button  @click="collapseAllEdges" size="mini">折叠所有边</el-button>
+        <el-button  @click="expandAllEdges" size="mini">展开所有边</el-button>
+  <!--      <el-button  @click="collapseAllnode" size="mini">折叠节点</el-button>-->
+  <!--      <el-button  @click="expandAllnode" size="mini">展开节点</el-button>-->
+        <el-button  @click="displayNode" size="mini">显示节点名称</el-button>
+        <el-button  @click="hideNode" size="mini">隐藏节点名称</el-button>
+        <el-button  @click="displayEdge" size="mini">显示边名称</el-button>
+        <el-button  @click="hideEdge" size="mini">隐藏边名称</el-button>
+        <el-button  @click="BFS" size="mini">查找并高亮所选节点BFS路径</el-button>
+        <el-button  @click="cancleBFS" size="mini">取消所选节点BFS路径</el-button>
+        <el-button  @click="recover" size="mini">复原隐藏元素</el-button>
+        <el-button  @click="clearAll" size="mini">清空</el-button>
+    </el-form-item >
+      </el-form>
+
+      <!--    百分比高亮边-->
+      <el-form :inline="true" >
+        <div style="margin-top: 20px;">
+          <el-divider content-position="left"><p style="font-weight: bold">按百分比高亮边</p></el-divider>
+        </div>
+        <div class="block">
+          <span class="demonstration">自定义初始值</span>
+          <el-slider v-model="percentage" :format-tooltip="formatTooltip"></el-slider>
+        </div>
+
+      </el-form>
+<!--    节点最短路径-->
+    <el-form :inline="true" >
+      <div style="margin-top: 20px;">
+        <el-divider content-position="left"><p style="font-weight: bold">最短路径</p></el-divider>
+      </div>
+
+
+      <el-form-item label="开始节点:" style="padding: 0; margin: 5px;margin-left:12px ;">
+        <el-input v-model="startID" placeholder="节点ID" size="mini" ></el-input><!-- 修改宽度 -->
+      </el-form-item>
+      <el-form-item label="结束节点:" style="padding: 0;margin: 5px;margin-left:12px ;">
+        <el-input v-model="endID" placeholder="节点ID" size="mini" ></el-input>
+      </el-form-item>
+      <el-switch
+          v-model="directed"
+          active-text="有向"
+          inactive-text="无向"
+          style="padding-top: 10px;margin: 5px;">
+      </el-switch>
+      <el-form-item>
+        <el-button type="primary" plain size="mini" @click="shortestPath(startID,endID,directed)" style="margin-left: 20px;margin-bottom: 0px;">查询</el-button>
+      </el-form-item>
+
+    </el-form>
+<!--    拓展节点-->
+    <el-form :inline="true"  class="demo-form-inline">
+
+      <div style="margin-top: 20px;">
+        <el-divider content-position="left"><p style="font-weight: bold">节点</p></el-divider>
+      </div>
+      <el-form-item label="选择节点类型以拓展节点" style="padding: 0; margin: 0px;margin-left:12px ;">
+<!--        <el-select v-model="formInline.region" placeholder="类型">-->
+<!--          <el-option label="区域一" value="shanghai"></el-option>-->
+<!--          <el-option label="区域二" value="beijing"></el-option>-->
+<!--        </el-select>-->
+      <el-select v-model="typeSelect" placeholder="类型"  size="mini">
+          <el-option v-for="item in type" :key="item.value" :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item style="display:block">
+        <el-button type="primary" plain size="mini" @click="onSubmit" style="margin-left: 20px;">查询</el-button>
+      </el-form-item>
+    </el-form>
+<!--    寻找关键节点-->
+    <el-form :inline="true" >
+      <div style="margin-top: 20px;">
+        <el-divider content-position="left"><p style="font-weight: bold">关键节点</p></el-divider>
+      </div>
+
+      <el-form-item label="输入节点个数:" style="padding: 0; margin: 5px;margin-left:12px ;">
+        <el-input v-model="num" placeholder="个数" size="mini"></el-input>
+      </el-form-item>
+      <el-form-item style="padding: 0px; margin: 0px;margin-left:9px ;">
+        <el-radio v-model="keyNodeType" label="pr" style="padding: 0px; margin: 4px;">PageRank</el-radio>
+        <el-radio v-model="keyNodeType" label="bc" style="padding: 0px; margin: 4px;">中介中心性</el-radio>
+        <el-radio v-model="keyNodeType" label="dc" style="padding: 0px; margin: 4px;">度中心性</el-radio>
+        <el-radio v-model="keyNodeType" label="cc" style="padding: 0px; margin: 4px;">紧密中心性</el-radio>
+      </el-form-item>
+      <el-form-item style="padding: 0px; margin: 5px;">
+        <el-button type="primary" plain size="mini" @click="keyNode" style="margin-left: 20px;">查询</el-button>
+      </el-form-item>
+      <el-button type="text" @click="keynodeVisible = true" style="display:block;padding-top: 10px;margin-left: 10px;">查看详细信息</el-button>
+
+
+      <el-dialog title="详细信息" :visible.sync="keynodeVisible" width="60%"  :modal="false">
+        <el-table style="width: 100%" border :data="keyNodeTable" empty-text="暂无数据">
+
+            <el-table-column
+                prop="name"
+                label="名称"
+                width="300">
+            </el-table-column>
+          <el-table-column
+              prop="lable"
+              label="类型"
+              width="300">
+          </el-table-column>
+          <el-table-column
+              prop="value"
+              label="节点得分"
+              width="300">
+          </el-table-column>
+<!--          <template v-for="(item,index) in keyNodeTable">-->
+<!--            <el-table-column  :prop="item.prop" :label="item.label" :key="index" :width="item.width"></el-table-column>-->
+<!--          </template>-->
+        </el-table>
+      </el-dialog>
+    </el-form>
+      <!--    社团划分-->
+      <el-form :inline="true" >
+        <div style="margin-top: 20px;">
+        <el-divider content-position="left">
+          <p style="font-weight: bold">社团划分</p></el-divider>
+      </div>
+        <el-form-item label="社团划分方式:"  style="padding: 0px; margin: 0px;margin-left:9px ;">
+        <el-radio v-model="communityType" label="lpa">LPA    </el-radio>
+        <el-radio v-model="communityType" label="inf">infomap</el-radio>
+        <el-radio v-model="communityType" label="lou">Louvain</el-radio>
+        <el-radio v-model="communityType" label="le">leading_eigenvector</el-radio>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" plain size="mini" @click="community" style="margin-left: 20px;">查询</el-button>
+          <el-button type="primary" plain size="mini" @click="communityCancel" style="margin-left: 20px;">取消</el-button>
+        </el-form-item>
+        <el-button type="text" @click="communityVisible = true" style="display:block;padding-top: 10px;margin-left: 10px;">查看详细信息</el-button>
+        <el-dialog title="详细信息" :visible.sync="communityVisible" width="100%"  :modal="false">
+          <el-table style="width: 100%" border :data="communityTable" empty-text="暂无数据">
+
+            <el-table-column
+                prop="order"
+                label="社团"
+                width="100">
+            </el-table-column>
+            <el-table-column
+                prop="data"
+                label="节点"
+                width="700">
+            </el-table-column>
+            <!--          <template v-for="(item,index) in keyNodeTable">-->
+            <!--            <el-table-column  :prop="item.prop" :label="item.label" :key="index" :width="item.width"></el-table-column>-->
+            <!--          </template>-->
+          </el-table>
+        </el-dialog>
+      </el-form>
+<!--      按边显示-->
+    <div style="margin-top: 20px;">
+        <el-divider content-position="left">
+          <p style="font-weight: bold">按边类型显示</p></el-divider>
+      </div>
+      <div class='checkbox1' style="margin-left:10px;">
+        <el-checkbox :indeterminate="edgeIndeterminate" v-model="checkAllEdges" @change="handleCheckedAllEdges">全选</el-checkbox>
+        <div style="margin: 15px 0;"></div>
+        <el-checkbox-group v-model="checkedEdges" @change="handleCheckedEdges">
+          <el-checkbox v-for="edge in edgesTypes" :label="edge" :key="edge">{{edge}}</el-checkbox>
+        </el-checkbox-group>
+      </div>
+
+      <!--      按节点显示-->
+      <div style="margin-top: 20px;">
+        <el-divider content-position="left">
+          <p style="font-weight: bold">按节点类型显示</p></el-divider>
+      </div>
+
+      <div  class="checkbox2" style="margin-left:10px;">
+        <el-checkbox :indeterminate="nodeIndeterminate" v-model="checkAllNodes" @change="handleCheckedAllNodes" >全选</el-checkbox>
+        <div style="margin: 15px 0;"></div>
+        <el-checkbox-group v-model="checkedNodes" @change="handleCheckedNodes">
+          <el-checkbox v-for="node in nodeTypes" :label="node" :key="node">{{node}}</el-checkbox>
+        </el-checkbox-group>
+      </div>
+
+      <!--    时间轴-->
+    </el-drawer>
+    <div id="hovertip" class="info" ></div>
+    <div id="timebrush_div" style="z-index: 999;position: absolute;margin-top: -35px;width:100%;bottom: 20px" class="test1">
+      <div v-html="svg"></div>
+<!--      <div id="hovertip" style="position: absolute;margin-top: -35px;width:100%;bottom: 40px" ></div>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import http from "@/utils/request";
+import cytoscape from 'cytoscape'
+import cxtmenu from 'cytoscape-cxtmenu' // 圆形菜单
+import { Loading } from 'element-ui';
+import euler from "cytoscape-euler"
+import expandCollapse from "cytoscape-expand-collapse"
+import * as d3 from "d3"
+import BubbleSets from "cytoscape-bubblesets";
+// cytoscape.use(euler)
+// cytoscape.use(expandCollapse)
+// cytoscape.use(cxtmenu)
+export default {
+  name: "graphViewV4",
+  data() {
+    return {
+      svg:null,
+      parentSide:null,
+      timebrustStart:null,
+      timebrustEnd:null,
+      colors: [
+        {color: '#f56c6c', percentage: 20},
+        {color: '#e6a23c', percentage: 40},
+        {color: '#5cb87a', percentage: 60},
+        {color: '#1989fa', percentage: 80},
+        {color: '#6f7ad3', percentage: 100}
+      ],
+      percentage:0,
+      relationData:[],
+      relationDialog:false,
+      checkAllEdges: false,
+      checkAllNodes: false,
+      checkedCities: ['上海', '北京'],
+      edges:[' 股东', ' 流通股东', ' 股权质押', ' 股权赎回', ' 发行', ' 法律顾问', ' 财务审计', ' 战略合作', ' 竞争', ' 业务链', ' 监管', ' 成员', ' 保荐承销', ' 担保', ' 法人代表', ' 客户', ' 高管', ' 购买', ' 属于', ' 投资', ' 委托管理', ' 管理', ' 原材料', ' 补充', ' 注册', ' 设立', ' 交易', ' 经营', ' 毕业', ' 位于', ' 同学', ' 亲属', ' 同乡', ' 好友', ' 出生', ' 工作', ' 任职', ' 合作'],
+      edgesTypes: [' 股东', ' 流通股东', ' 股权质押', ' 股权赎回', ' 发行', ' 法律顾问', ' 财务审计', ' 战略合作', ' 竞争', ' 业务链', ' 监管', ' 成员', ' 保荐承销', ' 担保', ' 法人代表', ' 客户', ' 高管', ' 购买', ' 属于', ' 投资', ' 委托管理', ' 管理', ' 原材料', ' 补充', ' 注册', ' 设立', ' 交易', ' 经营', ' 毕业', ' 位于', ' 同学', ' 亲属', ' 同乡', ' 好友', ' 出生', ' 工作', ' 任职', ' 合作'],
+      checkedEdges:[],
+      nodes:[ ' 上市公司', ' 上市公司-实体企业', ' 上市公司-金融机构', ' 上市公司-金融机构-银行', ' 上市公司-金融机构-证券', ' 上市公司-金融机构-保险', ' 上市公司-金融机构-信托', ' 上市公司-金融机构-基金', ' 上市公司-金融机构-基金-公募基金', ' 上市公司-金融机构-基金-私募基金', ' 上市公司-金融机构-其他金融机构', ' 非上市公司其他公司', ' 非上市公司-实体企业', ' 非上市公司-金融机构', ' 非上市公司-金融机构-银行', ' 非上市公司-金融机构-证券', ' 非上市公司-金融机构-保险', ' 非上市公司-金融机构-信托', ' 非上市公司-金融机构-基金', ' 非上市公司-金融机构-基金-公募基金', ' 非上市公司-金融机构-基金-私募基金', ' 非上市公司-金融机构-其他金融机构', ' 非上市公司其他公司',  ' 人物-普通人物', ' 人物-基金经理', ' 人物-投资经理', ' 机构-国务院国有资产监督管理委员会',  ' 监管机构-银保监会', ' 监管机构-证监会', ' 监管机构-人民银行', ' 监管机构-食药监局', ' 监管机构-网信', ' 监管机构-工信', ' 监管机构-行业协会', ' 交易所', ' 板块',  ' 地点-国家', '地点-省', '地点-县/区', ' 地点-市',  ' 行业-门类', ' 行业-大类', ' 行业-中类',  ' 产品-一般产品', ' 产品-服务产品',  ' 产品-金融产品-股票', ' 产品-金融产品-债券', ' 产品-金融产品-基金', ' 产品-金融产品-基金--公募', ' 产品-金融产品-基金--私募', ' 产品-金融产品-基金--REITS', ' 产品-金融产品-信托', ' 产品-金融产品-其他', ' 学校', '时间','事件-股东减持','事件-股东增持','事件-重大安全事故','事件-重大对外赔付',' 事件-重大资产损失','事件-高层死亡',' 事件-股权质押',' 事件-股权冻结','事件-破产清算','报道媒体',' 未知'],
+      nodeTypes:[ ' 上市公司', ' 上市公司-实体企业', ' 上市公司-金融机构', ' 上市公司-金融机构-银行', ' 上市公司-金融机构-证券', ' 上市公司-金融机构-保险', ' 上市公司-金融机构-信托', ' 上市公司-金融机构-基金', ' 上市公司-金融机构-基金-公募基金', ' 上市公司-金融机构-基金-私募基金', ' 上市公司-金融机构-其他金融机构', ' 非上市公司其他公司', ' 非上市公司-实体企业', ' 非上市公司-金融机构', ' 非上市公司-金融机构-银行', ' 非上市公司-金融机构-证券', ' 非上市公司-金融机构-保险', ' 非上市公司-金融机构-信托', ' 非上市公司-金融机构-基金', ' 非上市公司-金融机构-基金-公募基金', ' 非上市公司-金融机构-基金-私募基金', ' 非上市公司-金融机构-其他金融机构', ' 非上市公司其他公司',  ' 人物-普通人物', ' 人物-基金经理', ' 人物-投资经理', ' 机构-国务院国有资产监督管理委员会',  ' 监管机构-银保监会', ' 监管机构-证监会', ' 监管机构-人民银行', ' 监管机构-食药监局', ' 监管机构-网信', ' 监管机构-工信', ' 监管机构-行业协会', ' 交易所', ' 板块',  ' 地点-国家', '地点-省', '地点-县/区', ' 地点-市',  ' 行业-门类', ' 行业-大类', ' 行业-中类',  ' 产品-一般产品', ' 产品-服务产品',  ' 产品-金融产品-股票', ' 产品-金融产品-债券', ' 产品-金融产品-基金', ' 产品-金融产品-基金--公募', ' 产品-金融产品-基金--私募', ' 产品-金融产品-基金--REITS', ' 产品-金融产品-信托', ' 产品-金融产品-其他', ' 学校', '时间','事件-股东减持','事件-股东增持','事件-重大安全事故','事件-重大对外赔付',' 事件-重大资产损失','事件-高层死亡',' 事件-股权质押',' 事件-股权冻结','事件-破产清算','报道媒体',' 未知'],
+      checkedNodes:[],
+      edgeIndeterminate: true,
+      nodeIndeterminate: true,
+      shetuan_paths:[],
+      communityData:null,
+      communityVisible:false,
+      communityTable:[],
+      communityType:'',
+      keynodeVisible:false,
+      keyNodeTable:[],
+      keyNodeType:'',
+      num:'',
+      // 控制抽屉是否展开
+      drawer: false,
+      typeSelect:'',
+      directed:false,
+      startID:null,
+      endID:null,
+
+      x:null,
+      brush:null,
+      search_memory:[],
+      mindata:'',
+      maxdata:'',
+      dialogVisible: false,
+      tableHead:[],
+      tableData:[],
+      content: '',
+      graphData: {},
+      type :[{'value': '板块', 'label': '板块'}, {'value': '行业-门类', 'label': '行业-门类'}, {'value': '行业-大类', 'label': '行业-大类'}, {'value': '地点-市', 'label': '地点-市'}, {'value': '地点-国家', 'label': '地点-国家'}, {'value': '上市公司-金融机构-其他金融机构', 'label': '上市公司-金融机构-其他金融机构'}, {'value': '上市公司-金融机构-证券', 'label': '上市公司-金融机构-证券'}, {'value': '上市公司-金融机构-银行', 'label': '上市公司-金融机构-银行'}, {'value': '上市公司-实体企业', 'label': '上市公司-实体企业'}, {'value': '上市公司-金融机构-保险', 'label': '上市公司-金融机构-保险'}, {'value': '上市公司-金融机构-基金-私募基金', 'label': '上市公司-金融机构-基金-私募基金'}, {'value': '上市公司-金融机构-基金-公募基金', 'label': '上市公司-金融机构-基金-公募基金'}, {'value': '上市公司-金融机构-信托', 'label': '上市公司-金融机构-信托'}, {'value': '交易所', 'label': '交易所'}, {'value': '人物-基金经理', 'label': '人物-基金经理'}, {'value': '人物-普通人物', 'label': '人物-普通人物'}, {'value': '产品-金融产品-债券', 'label': '产品-金融产品-债券'}, {'value': '产品-金融产品-基金--私募', 'label': '产品-金融产品-基金--私募'}, {'value': '产品-金融产品-基金--公募', 'label': '产品-金融产品-基金--公募'}, {'value': '产品-金融产品-基金—REITS', 'label': '产品-金融产品-基金—REITS'}, {'value': '产品-金融产品-股票', 'label': '产品-金融产品-股票'}, {'value': '地点-省', 'label': '地点-省'}, {'value': '监管机构-银保监会（局）', 'label': '监管机构-银保监会（局）'}, {'value': '监管机构-人民银行（分行）', 'label': '监管机构-人民银行（分行）'}, {'value': '监管机构-行业协会', 'label': '监管机构-行业协会'}, {'value': '监管机构-证监会（局）', 'label': '监管机构-证监会（局）'}, {'value': '学校', 'label': '学校'}, {'value': '非上市公司-金融机构-证券', 'label': '非上市公司-金融机构-证券'}, {'value': '非上市公司-金融机构-银行', 'label': '非上市公司-金融机构-银行'}, {'value': '非上市公司-实体企业', 'label': '非上市公司-实体企业'}, {'value': '非上市公司-金融机构-保险', 'label': '非上市公司-金融机构-保险'}, {'value': '非上市公司-金融机构-其他金融机构', 'label': '非上市公司-金融机构-其他金融机构'}, {'value': '非上市公司-金融机构-基金-公募基金', 'label': '非上市公司-金融机构-基金-公募基金'}, {'value': '非上市公司-金融机构-信托', 'label': '非上市公司-金融机构-信托'}, {'value': '地点-县/区', 'label': '地点-县/区'}, {'value': '非上市公司其他公司', 'label': '非上市公司其他公司'}, {'value': '未知', 'label': '未知'}, {'value': '组织机构', 'label': '组织机构'}, {'value': '产品-金融产品-其他', 'label': '产品-金融产品-其他'}, {'value': '时间', 'label': '时间'}, {'value': '事件-股东减持', 'label': '事件-股东减持'}, {'value': '事件-股东增持', 'label': '事件-股东增持'}, {'value': '报道媒体', 'label': '报道媒体'}, {'value': '事件-重大安全事故', 'label': '事件-重大安全事故'}, {'value': '事件-重大对外赔付', 'label': '事件-重大对外赔付'}, {'value': '事件-重大资产损失', 'label': '事件-重大资产损失'}, {'value': '事件-高层死亡', 'label': '事件-高层死亡'}, {'value': '事件-股权质押', 'label': '事件-股权质押'}, {'value': '事件-股权冻结', 'label': '事件-股权冻结'}, {'value': '事件-破产清算', 'label': '事件-破产清算'}]
+    }
+  },
+  methods: {
+    clearAll(){
+
+      this.$cy.elements().remove()
+      this.$cy.destroy()
+      this.content=''
+      this.tableData=[]
+      this.mindata=''
+      this.mindata=''
+      this.search_memory.length = 0
+      this.num=''
+      this.typeSelect=''
+      http.get(
+          '/graph/clear/').then()
+    },
+    recover(){
+      this.$cy.elements().removeClass("light-off")
+      this.timebrustStart=null
+      this.timebrustEnd=null
+    },
+    formatTooltip(val){
+      return val/100
+    },
+    displayAsPercentage(){
+      var that=this
+        this.$cy.elements().addClass("light-off");
+          this.$cy.edges().filter(function (ele, i,eles) {
+            var w = ele.data('w');
+            if (w === '') return false;
+            else if (w.substr(w.length - 1, 1) === '%') {
+              w = parseFloat(w.substr(0, w.length - 1));
+              if (w >= that.percentage/100)
+                return true
+              else return false;
+            }
+          }).removeClass("light-off");
+          this.$cy.edges().filter(function (ele, i,eles) {
+            var w = ele.data('w');
+            if (w === '') return false;
+            else if (w.substr(w.length - 1, 1) === '%') {
+              w = parseFloat(w.substr(0, w.length - 1));
+              if (w >= that.percentage/100)
+                return true
+              else return false;
+            }
+          }).connectedNodes().removeClass("light-off");
+          if (this.percentage===100)
+            this.$cy.elements().addClass("light-off");
+          if(this.percentage===0)
+            this.recover()
+
+    },
+
+
+    saveImg () {
+
+
+      let blob = this.$cy.png({
+        output: 'blob', bg: 'transparent',
+        full: true, scale: 4, quality: 1
+      });
+      let aLink = document.createElement('a');
+      let evt = document.createEvent("HTMLEvents");
+      evt.initEvent("click", true, true);
+      aLink.download = `${new Date().getTime()}.png`;
+      aLink.href = URL.createObjectURL(blob);
+      aLink.dispatchEvent(evt);
+      aLink.click();
+    },
+
+    resize(){
+      console.log(document.getElementById('graph').style.height)
+      document.getElementById('graph').style.height=String(window.screen.height/108000*this.getRatio()*630)+'px'
+      console.log(document.getElementById('graph').style.height)
+    },
+     getRatio()
+{
+  var ratio=0;
+  var screen=window.screen;
+  var ua=navigator.userAgent.toLowerCase();
+
+  if(window.devicePixelRatio !== undefined)
+  {
+    ratio=window.devicePixelRatio;
+  }
+  else if(~ua.indexOf('msie'))
+  {
+    if(screen.deviceXDPI && screen.logicalXDPI)
+    {
+      ratio=screen.deviceXDPI/screen.logicalXDPI;
+    }
+
+  }
+  else if(window.outerWidth !== undefined && window.innerWidth !== undefined)
+  {
+    ratio=window.outerWidth/window.innerWidth;
+  }
+
+  if(ratio)
+  {
+    ratio=Math.round(ratio*100);
+  }
+  return ratio;
+},
+    updateStatus(){
+      let checked=[]
+      // 去除空格
+      for(let i in  this.checkedEdges)
+        checked.push(this.checkedEdges[i].replace(/\s*/g,""))
+      for(let i in  this.checkedNodes)
+        checked.push(this.checkedNodes[i].replace(/\s*/g,""))
+      // this.$cy.elements().hide()
+      // console.log(this.$cy.elements().hidden())
+      this.$cy.elements().hide();
+      // this.$cy.elements(':hidden').removeClass('hidden')
+      if (checked.length > 0) {
+        let list = [];
+        for (let i = 0; i < checked.length; i++) {
+          list.push(checked[i])
+        }
+        for (let i = 0; i < checked.length; i++) {
+          let checked_v = checked[i];
+          console.log(checked_v)
+          this.$cy.edges().filter(function (element, i) {
+            return element.data('relationship') === checked_v
+          }).show()
+          //筛选边连接的点显示，避免悬空边
+          this.$cy.edges().filter(function (element, i) {
+            // console.log(element.connectedNodes(), element.connectedNodes().data('label'),'ppppppppppp')
+            return element.data('relationship') === checked_v && list.indexOf(element.connectedNodes()[0].data('label')) !== -1 && list.indexOf(element.connectedNodes()[1].data('label')) !== -1
+          }).connectedNodes()
+              .show();
+          this.$cy.nodes().filter(function (element, i) {
+            return element.data('label') === checked_v
+          }).show();
+          this.$cy.nodes().filter(function (element, i) {
+                if (element.data('label') === checked_v) {
+                  for (var t = 0; t < element.connectedEdges(); t++) {
+                    if (list.indexOf(element.connectedEdges()[t].data('relationship')) !== -1)
+                      element.connectedEdges()[t].show();
+                  }
+                }
+              }
+          )
+        }
+      }
+
+
+    },
+    handleCheckedAllEdges(val){
+      this.checkedEdges = val ? this.edgesTypes : [];
+      this.edgeIndeterminate = false;
+    },
+    handleCheckedEdges(value) {
+      let checkedCount = value.length;
+      this.checkAllEdges = checkedCount === this.edges.length;
+      this.edgeIndeterminate = checkedCount > 0 && checkedCount < this.edges.length;
+    },
+    handleCheckedAllNodes(val){
+      this.checkedNodes = val ? this.nodeTypes : [];
+      this.nodeIndeterminate = false;
+    },
+    handleCheckedNodes(value) {
+      let checkedCount = value.length;
+      this.checkAllNodes = checkedCount === this.nodes.length;
+      this.nodeIndeterminate = checkedCount > 0 && checkedCount < this.nodes.length;
+    },
+    communityCancel(){
+      const  path =this.$bb.getPaths()
+      for (let i in  path)
+      this.$bb.removePath(path[i])
+          },
+     getRandomColor(){
+  var r = Math.floor(Math.random() * 256);
+  var g = Math.floor(Math.random() * 256);
+  var b = Math.floor(Math.random() * 256);
+  if (r === 255 && g === 255 && b === 255)
+    this.getRandomColor();
+  else
+    return "rgb(" + r + ',' + g + ',' + b + ")";
+},
+    community(){
+      if (this.communityData){
+        this.communityData.length=0
+      }
+      if (this.communityType==='')
+        alert('请选择划分方式')
+      else
+      http.get('/graph/divide/?wh='+this.communityType).then((res)=>{
+        this.$cy.elements().removeClass("light-off");
+
+        var get_color = [];
+        this.$cy.ready(() => {
+          this.$bb = this.$cy.bubbleSets({
+            interactive: true,
+            zIndex: 100
+          })
+          //const ids = Array.from(new Set(cy.elements().map(el => el.data().label)))
+          const ids = res.data.data;
+          this.communityData=res.data.data
+          ids.forEach(id => {
+            const nodes = this.$cy.nodes().filter(function (ele) {
+              let g = false;
+              for (let t = 0; t < id.length; t++) {
+                if (ele.data('id') === id[t]) g = true;
+              }
+              return g
+            })
+
+            let i_color = this.getRandomColor();
+            get_color.push(i_color);
+
+            let pp = this.$bb.addPath(nodes, null, null, {
+              virtualEdges: true,
+              style: {
+                fill: 'rgba(255, 0, 0, 0)',
+                stroke: i_color,
+                strokeDasharray: '7, 7, 7'
+              }
+            })
+            // this.shetuan_paths.push(pp);
+
+          for (let i in res.data.data){
+
+            this.communityTable.push({'order':i,'data':String(res.data.data[i])})
+            // console.log(res.data.data[i])
+          }
+
+        })
+
+        //表格信息
+        // st_data = res.data.data;
+        // if (st_data.length != 0) {
+        //   document.getElementById("shetuan_div").style.height = '400px';
+        //   document.getElementById("tishi_div").innerText = '提示：点击表格的某一行，高亮对应的社团';
+        //   var tableData1 = "<tr style='border:1px solid black;'>" + //<td style='width: 30%;font-weight:bold;border:1px solid black;'>ID</td>
+        //       "<td style='border:1px solid black;width:50px;'>社团</td>" +
+        //       "<td style='border:1px solid black;'>社团成员ID</td>" +
+        //       "</tr>";
+        //   for (var i = 0; i < st_data.length; i++) {
+        //     tableData1 += "<tr style='border:1px solid black;'>" + //<td style='width: 30%;font-weight:bold;border:1px solid black;'>"+info_data[i].id+"</td>
+        //         "<td style='border:1px solid black;background-color: " + get_color[i] + "'>" + i + "</td>" +
+        //         "<td style='border:1px solid black;'>" + st_data[i] + "</td>" +
+        //         "</tr>";
+        //   }
+        //   $("#shetuan_tbody").html(tableData1);
+        //
+        // }
+      //
+      })
+    }
+    )},
+    expandAllNodes(){this.$api.expandAll()},
+    collapseAllNodes(){this.$api.collapseAll()},
+    keyNode(){
+      console.log(this.keyNodeType)
+        if (!(/^[0-9]+$/.test(this.num))) alert("请输入非负整数！");
+        else {
+          let options={
+            text:'请稍等'
+          }
+          let loadingInstance = Loading.service(options);
+         http.get(
+        '/graph/key_nodes/?type=' + this.keyNodeType + '&num=' + this.num).then((res)=>{
+            let get_data=res.data
+             this.$cy.nodes().removeClass('key_node');
+           let data = get_data.data.top;
+             for (let j = 0; j < data.length; j++) {
+               //cy.$('#'+data[j]).removeClass("light-off");
+               this.$cy.$('#' + data[j]).addClass('key_node');
+             }
+             loadingInstance.close()
+             //表格信息
+             this.keyNodeTable = get_data.data.info
+
+           })
+        }
+      },
+
+    onSubmit(){
+      console.log(this.typeSelect)
+      let input_label = this.typeSelect
+      let name_list = [];
+      this.$cy.nodes().filter(function (ele) {
+        if (ele.data('label') === input_label)
+          name_list.push(ele.data('id'))
+      });
+      console.log(name_list)
+      let name_str = "";
+
+      for (let j = 0; j < name_list.length - 1; j++) {
+        name_str = name_str + name_list[j] + ",";
+      }
+      name_str = name_str + name_list[name_list.length - 1]
+
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
+
+      http.get('/graph/expand/?name=' + name_str + '&label=' + input_label).then((res)=>{
+        let get_data=res.data
+
+          this.$cy.add(get_data.data['nodes'])
+            this.$cy.add(get_data.data['edges'])
+
+          if (this.search_memory.length === 0 || this.mindate === "" || this.maxdate === "") {
+            this.mindate = get_data.data['mindate']
+            this.maxdate = get_data.data['maxdate']
+          }
+          else {
+            if (this.mindate > get_data.data['mindate'] && get_data.data['mindate'] !== "") this.mindate = get_data.data['mindate']
+            if (this.maxdate < get_data.data['maxdate'] && get_data.data['maxdate'] !== "") this.maxdate = get_data.data['maxdate']
+          }
+
+          var layout = this.$cy.layout({
+            name: 'euler',
+            randomize: true,
+            animate: false,
+          });
+          layout.run();
+
+          if (get_data.data['id'] !== "") {
+            for (let h = 0; h < get_data.data['id'].length; h++)
+              this.$cy.$('#' + get_data.data['id'][h]).addClass("search_node");
+          }
+
+          loadingInstance.close()
+          //时间轴
+          document.getElementById("timebrush_div").innerHTML = "";
+          var margin = { top: -12, right: 27, bottom: 21, left: 0 },
+              width = document.all.graph.offsetWidth,
+              height = 55 - margin.top - margin.bottom;
+
+          this.x = d3.scaleTime()
+              .domain([new Date(this.mindate), new Date(this.maxdate) - 1])
+              .rangeRound([0, width]);
+            this.brush=d3.brushX()
+                .extent([[0, 0], [width, height+30]])
+                //.on("start",brushstart)
+                .on("brush",this.brushmove)
+          // let svg = d3.select("#timebrush_div").append("svg")
+            this.svg.selectAll("*").remove()
+            this.svg = d3.select("#timebrush_div").append("svg")
+                .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
+                .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
+                .append("g")
+                .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+        this.svg
+              .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
+              .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
+              .append("g")
+              .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+          this.svg.append("g")
+              .attr("class", "axis axis--x")
+              .attr("transform", "translate(0," + height + ")")
+              .call(d3.axisBottom(this.x)
+                  .ticks(d3.timeYear)
+                  .tickPadding(0))
+              .attr("text-anchor", null)
+              .selectAll("text")
+              .attr("fill", "#ef5b9c")
+              .attr("x", 0);
+
+          this.svg.append("g")
+              .attr("class", "brush")
+              .call(d3.brushX()
+                  .extent([[0, 0], [width, height + 30]])
+                  //.on("start",brushstart)
+                  .on("brush", this.brushmove));
+          // .on("end",brushended));
+
+        },
+        ).catch((error)=>{
+          loadingInstance.close()
+        console.log(error)
+        alert('查询失败！')
+      })
+
+    },
+     lightOn(ele) {
+      this.$cy.startBatch();
+       this.$cy.batch(() => {
+         this.$cy.elements().addClass("light-off"); //*添加样式*/
+    let elements = ((Array.isArray ? Array.isArray(ele) : null != ele && ele instanceof Array) ? ele : [ele]);
+    elements.forEach(__ => {
+      this.$cy.getElementById(__).removeClass("light-off");
+      this.$cy.getElementById(__).neighborhood().removeClass("light-off");
+    });
+  });
+  //cy.once('click', () => lightOff());
+       this.$cy.endBatch();
+},
+//取消高亮
+     lightOff() {
+       this.$cy.startBatch();
+       this.$cy.batch(() =>  this.$cy.elements().removeClass("light-off") /*移除样式*/);
+       this.$cy.endBatch();
+},
+
+    tuozhan(t_name, t_label)
+    {
+      let that =this
+  //console.log(t_name,t_label)
+  //   document.getElementById('fade').style.display='block';
+  //   document.getElementById('fade').innerText="正在加载数据，请稍等...";
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
+
+    var this_neigh_e = this.$cy.$('#'+t_name).connectedEdges();
+    for(let j=0;j<this_neigh_e.length;j++)
+    {
+    if(this_neigh_e[j].data('directionType')==='unidirection')
+      this.$api.expandEdges(this_neigh_e[j]);
+  }
+
+  //console.log(cy.$('#'+t_name).connectedEdges()[0].data('directionType')=='unidirection')
+
+  http.get('/graph/expand/?name='+ t_name + '&label=' + t_label).then((response)=>{{
+      //console.log(get_data)
+      // console.log(mindate, maxdate)
+      let tmp=response.data.data
+      that.$cy.add(tmp['nodes'])
+      that.$cy.add(tmp['edges'])
+
+
+      if( that.search_memory.length ===0 || that.mindate==="" || that.maxdate==="" )
+      {
+        that.mindate = tmp['mindate']
+        that.maxdate = tmp['maxdate']
+      }
+      else
+      {
+        if(that.mindate >tmp['mindate'] && tmp['mindate']!=="")
+          that.mindate = tmp['mindate']
+        if(that.maxdate < tmp['maxdate']  && tmp['maxdate']!=="")
+          that.maxdate = tmp['maxdate']
+      }
+
+      let layout = this.$cy.layout({
+        name: 'euler',
+        randomize: true,
+        animate: false,
+      });
+      layout.run();
+
+      that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
+      loadingInstance.close();
+    });
+      if(tmp['id']!=="")
+        this.$cy.$('#'+tmp['id']).addClass("search_node");
+
+      // document.getElementById('fade').innerText="";
+      // document.getElementById('fade').style.display='none'
+
+      //时间轴
+      document.getElementById("timebrush_div").innerHTML="";
+      let  margin = {top: -12, right: 27, bottom: 21, left: 0},
+          width = document.all.graph.offsetWidth,
+          height = 55 - margin.top - margin.bottom
+
+      this.x = d3.scaleTime()
+          .domain([new Date(that.mindate), new Date(that.maxdate) - 1])
+          .rangeRound([0, width]);
+    this.brush=d3.brushX()
+        .extent([[0, 0], [width, height+30]])
+        //.on("start",brushstart)
+        .on("brush",this.brushmove)
+      // let svg = d3.select("#timebrush_div").append("svg")
+    this.svg.selectAll("*").remove()
+    this.svg = d3.select("#timebrush_div").append("svg")
+        .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
+        .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
+        .append("g")
+        .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+    this.svg
+          .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
+          .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
+          .append("g")
+          .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+      this.svg.append("g")
+          .attr("class", "axis axis--x")
+          .attr("transform", "translate(0," + height + ")")
+          .call(d3.axisBottom(that.x)
+              .ticks(d3.timeYear)
+              .tickPadding(0))
+          .attr("text-anchor", null)
+          .selectAll("text")
+          .attr("fill","#ef5b9c")
+          .attr("x", 0);
+
+      this.svg.append("g")
+          .attr("class", "brush")
+          .call(d3.brushX()
+              .extent([[0, 0], [width, height+30]])
+              //.on("start",brushstart)
+              .on("brush",this.brushmove));
+      // .on("end",brushended));
+
+    }
+
+  }).catch(
+      function (error){
+      //关闭阴影 div
+        console.log(error)
+        that.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
+          loadingInstance.close();
+        });
+      // document.getElementById('fade').innerText="";
+      // document.getElementById('fade').style.display='none'
+      alert("查询异常！")
+    }
+  )
+
+},
+    removeDuplicatedItem(ar) {
+      var _arr = ar;
+      var _res = []; //
+      _arr.sort();
+      for (var i = 0; i < _arr.length;) {
+        var count = 0;
+        for (var j = i; j < _arr.length; j++) {
+          if (_arr[i] == _arr[j]) {
+            count++;
+          }
+        }
+        _res.push({name:_arr[i], value:count});
+        i += count;
+      }
+      return _res;
+    },
+    zhedie(ele) {
+      if ( this.$cy.nodes().filter(function (element, i) {return element.data('id') === ele}).scratch().restData == null) {
+        // Save node data and remove
+        this.$cy.nodes().filter(function (element, i) { return element.data('id') === ele })
+            .scratch({// restData: this.connectedEdges().targets().remove()
+              restData:  this.$cy.nodes().filter(function (element, i) {
+                return element.data('id') === ele
+              }).successors().targets().hide()//remove()
+            });
+      } else {
+        // Restore the removed nodes from saved data
+        this.$cy.nodes().filter(function (element, i) {
+          return element.data('id') == ele
+        }).scratch().restData.show()//restore();
+        this.$cy.nodes().filter(function (element, i) {
+          return element.data('id') == ele
+        }).scratch({
+          restData: null
+        });
+      }
+    },
+     chuantou(node_id) {
+  // var parentC_flag = this.parentSide.css("display");//记录原来的状态
+  //
+  // if (parentC_flag === 'block') {
+  //   this.parentSide.css("display", 'none');
+  // }
+
+       let options={
+         text:'请稍等'
+       }
+       let loadingInstance = Loading.service(options);
+
+
+       http.get('/graph/control/?id=' + node_id,
+       ).then((response) => {
+      this.$cy.add(response.data.data['nodes'])
+      this.$cy.add(response.data.data['edges'])
+
+      let node_id = [], nodes=response.data.data['nodes'];
+      for(let i=0;i<nodes.length;i++){
+        node_id.push(nodes[i].data.id)
+
+        for(let k in nodes[i].data){
+          this.$cy.$('#'+nodes[i].data.id).data(k, nodes[i].data[k])
+        }
+      }
+      let edge_id = [], edges=response.data.data['edges'];
+      for(let i=0;i<edges.length;i++){
+        edge_id.push(edges[i].data.id)
+      }
+
+      // console.log(node_id);
+      // console.log(edge_id);
+      for(let nn of node_id){
+        this.$cy.$('#' + nn).addClass("search_node");
+      }
+
+      this.$cy.edges().filter(function (ele) {
+        if (edge_id.indexOf(ele.data('id')) !== -1)
+          return true;
+      }).addClass("search_edge");
+
+      var layout = this.$cy.layout({
+        name: 'euler',
+        randomize: true,
+        animate: false,
+      });
+      layout.run();
+
+
+      if (this.search_memory.length === 0 || this.mindate === "" || this.maxdate === "") {
+        this.mindate = response.data.data['mindate']
+        this.maxdate = response.data.data['maxdate']
+      }
+      else {
+        if (this.mindate > response.data.data['mindate'] && response.data.data['mindate'] !== "")
+          this.mindate = response.data.data['mindate']
+        if (this.maxdate < response.data.data['maxdate'] && response.data.data['maxdate'] !== "")
+          this.maxdate = response.data.data['maxdate']
+      }
+
+
+      if (response.data.data['id'] !== "")
+        this.$cy.$('#' + response.data.data['id']).addClass("search_node");
+
+      // document.getElementById('fade').innerText = "";
+      // document.getElementById('fade').style.display = 'none';
+
+      // if (parentC_flag == 'block') {
+      //   parentSide.css("display", 'block');
+      // }
+
+      //时间轴
+      // document.querySelector("#timeEle").innerHTML = ''
+      // document.getElementById("timebrush_div").innerHTML = "";
+      var margin = { top: -12, right: 27, bottom: 21, left: 0 },
+          width = document.all.graph.offsetWidth,
+          height = 55 - margin.top - margin.bottom;
+
+      this.x = d3.scaleTime()
+          .domain([new Date(this.mindate), new Date(this.maxdate) - 1])
+          .rangeRound([0, width]);
+
+         this.brush=d3.brushX()
+             .extent([[0, 0], [width, height+30]])
+             //.on("start",brushstart)
+             .on("brush",this.brushmove)
+
+      this.svg.selectAll("*").remove()
+         // document.getElementById('timebrush_div').
+      // let svg = d3.select("#timebrush_div").append("svg")
+
+         this.svg = d3.select("#timebrush_div").append("svg")
+             .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
+             .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
+             .append("g")
+             .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+         this.svg
+          .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
+          .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
+          .append("g")
+          .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+      this.svg.append("g")
+          .attr("class", "axis axis--x")
+          .attr("transform", "translate(0," + height + ")")
+          .call(d3.axisBottom(this.x)
+              .ticks(d3.timeYear)
+              .tickPadding(0))
+          .attr("text-anchor", null)
+          .selectAll("text")
+          .attr("fill", "#ef5b9c")
+          .attr("x", 0);
+
+      this.svg.append("g")
+          .attr("class", "brush")
+          .call(d3.brushX()
+              .extent([[0, 0], [width, height + 30]])
+              // .on("start",brushstart)
+              .on("brush", this.brushmove))
+              // .on("end",brushended));
+    }).catch((err)=>{
+         // document.getElementById('fade').innerText = "";
+         // document.getElementById('fade').style.display = 'none'
+         alert("err！"+err)
+       }
+       ).finally(()=>
+       loadingInstance.close()
+       )
+},
+
+     tongji(node_id)
+       {
+        document.getElementById("light1_h").innerText=cy.$('#'+node_id).data("name")+"("+cy.$('#'+node_id).data("label")+")";
+        var out_label_list=[];
+        this.$cy.$('#'+node_id).outgoers().nodes().filter(function (ele) {
+        out_label_list.push(ele.data('label'))
+  });
+        out_label_list=this.removeDuplicatedItem(out_label_list); //相连 出去的节点的类型
+
+          var in_label_list=[];
+         this.$cy.$('#'+node_id).incomers().nodes().filter(function (ele) {
+    in_label_list.push(ele.data('label'))
+  });
+      in_label_list=removeDuplicatedItem(in_label_list); //相连 进来的节点的类型
+
+      var out_relation_list=[];
+         this.$cy.$('#'+node_id).outgoers().edges().filter(function (ele) {
+      out_relation_list.push(ele.data('relationship'))
+  });
+      out_relation_list=removeDuplicatedItem(out_relation_list); //相连 出去的边 的类型
+
+        var in_relation_list=[];
+         this.$cy.$('#'+node_id).incomers().edges().filter(function (ele) {
+    in_relation_list.push(ele.data('relationship'))
+  });
+  in_relation_list=removeDuplicatedItem(in_relation_list); //相连 出去的边 的类型
+
+    document.getElementById('light1').style.display='block';
+    document.getElementById('fade').style.display='block';
+
+  var out_bt1 = echarts.init(document.getElementById('out_bt1')),
+      out_bt2 = echarts.init(document.getElementById('out_bt2')),
+      in_bt1 = echarts.init(document.getElementById('in_bt1')),
+      in_bt2 = echarts.init(document.getElementById('in_bt2'));
+
+
+  var title1="以节点为源节点的节点类型比例（源节点 → ...）",
+      title2="以节点为源节点的边类型比例（源节点 → ...）",
+      title3="以节点为末节点的节点类型比例（... → 末节点）",
+      title4="以节点为末节点的边类型比例（... → 末节点）";
+
+
+  out_bt1.setOption(op(title1, out_label_list));
+  out_bt2.setOption(op(title2, out_relation_list));
+  in_bt1.setOption(op(title3, in_label_list));
+  in_bt2.setOption(op(title4, in_relation_list));
+
+  out_bt1.on('click', function (param) {
+    var name = param.name;
+
+    var a_info=[];
+    this.$cy.$('#'+node_id).outgoers().nodes().filter(function (ele) {
+      if(ele.data('label')==name)
+        a_info.push(ele);
+    });
+
+    // var tableData = "<tr style='border:1px solid black;'><td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"源节点"+"</td>"
+    //             //+"<td style='width: 10%;font-weight:bold;border:1px solid black;'>"+"关系"+"</td>"
+    //             +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"末节点"+"</td>"
+    //             +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"末节点类型"+"</td>"
+    //             //+"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+"开始日期"+"</td>"
+    //             //+"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+"结束日期"+"</td>"
+    //             +"</tr>";
+    var tableData = "";
+    for(let h=0;h<a_info.length;h++)
+    { //便历每一条数据
+      if(Math.round(h/14)*14===h)
+      {
+        tableData += "<tr style='border:1px solid black;'><td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"源节点"+"</td>"
+            //+"<td style='width: 10%;font-weight:bold;border:1px solid black;'>"+"关系"+"</td>"
+            +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"末节点"+"</td>"
+            +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"末节点类型"+"</td>"
+            //+"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+"开始日期"+"</td>"
+            //+"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+"结束日期"+"</td>"
+            +"</tr>";
+      }
+      //else
+      tableData+="<tr style='border:1px solid black;'><td style='width: 20%;font-weight:bold;border:1px solid black;'>"+cy.$('#'+node_id).data("name")+"</td>"
+          // +"<td style='width: 10%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('relationship')+"</td>"
+          +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('name')+"</td>"
+          +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('label')+"</td>"
+          // +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('开始日期')+"</td>"
+          // +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('结束日期')+"</td>"
+          +"</tr>";
+    }
+    $("#o_tbody").html(tableData);
+    document.getElementById('light2').style.display='block';
+
+    $(document).ready(function() {
+      page = new Page(15, 'o_table', 'o_tbody', "pageindex");
+    });
+
+  });
+
+  out_bt2.on('click', function (param) {
+    var name = param.name;
+
+    var a_info=[];
+    this.$cy.$('#'+node_id).outgoers().edges().filter(function (ele) {
+      if(ele.data('relationship')===name)
+        a_info.push(ele);
+    });
+
+    a_info.sort(function(a, b) {
+      return parseFloat(b.data('w').substr(0,b.data('w').length-1)) - parseFloat(a.data('w').substr(0,a.data('w').length-1));
+    });
+
+    var tableData ="";
+    for(var h=0;h<a_info.length;h++)
+    { //便历每一条数据
+      if(Math.round(h/14)*14==h)
+      {
+        tableData += "<tr style='border:1px solid black;'><td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"源节点"+"</td>"
+            +"<td style='width: 10%;font-weight:bold;border:1px solid black;'>"+"关系"+"</td>"
+            +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"末节点"+"</td>"
+            +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+"末节点类型"+"</td>"
+            +"<td style='width: 5%;font-weight:bold;border:1px solid black;'>"+"权重"+"</td>"
+            +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+"开始日期"+"</td>"
+            +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+"结束日期"+"</td>"
+            +"</tr>";
+      }
+      //else
+      tableData+="<tr style='border:1px solid black;'><td style='width: 20%;font-weight:bold;border:1px solid black;'>"+cy.$("#"+a_info[h].data('source')).data('name')+"</td>"
+          +"<td style='width: 10%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('relationship')+"</td>"
+          +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+this.$cy.$("#"+a_info[h].data('target')).data('name')+"</td>"
+          +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+this.$cy.$("#"+a_info[h].data('target')).data('label')+"</td>"
+          +"<td style='width: 5%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('w')+"</td>"
+          +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('开始日期')+"</td>"
+          +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('结束日期')+"</td>"
+          +"</tr>";
+    }
+    $("#o_tbody").html(tableData);
+    document.getElementById('light2').style.display='block';
+
+    $(document).ready(function() {
+      page = new Page(15, 'o_table', 'o_tbody', "pageindex");
+    });
+
+  });
+
+
+  in_bt1.on('click', function (param) {
+    var name = param.name;
+
+    var a_info=[];
+    cy.$('#'+node_id).incomers().nodes().filter(function (ele) {
+      if(ele.data('label')==name)
+        a_info.push(ele);
+    });
+
+    var tableData = "";
+    for(var h=0;h<a_info.length;h++)
+    { //便历每一条数据
+      if(Math.round(h/14)*14==h)
+      {
+        tableData += "<tr style='border:1px solid black;'><td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"源节点"+"</td>"
+            //+"<td style='width: 10%;font-weight:bold;border:1px solid black;'>"+"关系"+"</td>"
+            +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"源节点类型"+"</td>"
+            +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"末节点"+"</td>"
+            //+"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+"开始日期"+"</td>"
+            //+"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+"结束日期"+"</td>"
+            +"</tr>";
+      }
+      //else
+      tableData+="<tr style='border:1px solid black;'><td style='width: 20%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('name')+"</td>"
+          // +"<td style='width: 10%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('relationship')+"</td>"
+          +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('label')+"</td>"
+          +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+cy.$('#'+node_id).data("name")+"</td>"
+          // +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('开始日期')+"</td>"
+          // +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('结束日期')+"</td>"
+          +"</tr>";
+    }
+    $("#o_tbody").html(tableData);
+    document.getElementById('light2').style.display='block';
+
+    $(document).ready(function() {
+      page = new Page(15, 'o_table', 'o_tbody', "pageindex");
+    });
+
+  });
+
+  in_bt2.on('click', function (param) {
+    var name = param.name;
+
+    var a_info=[];
+    cy.$('#'+node_id).incomers().edges().filter(function (ele) {
+      if(ele.data('relationship')==name)
+        a_info.push(ele);
+    });
+
+    a_info.sort(function(a, b) {
+      return parseFloat(b.data('w').substr(0,b.data('w').length-1)) - parseFloat(a.data('w').substr(0,a.data('w').length-1));
+    });
+
+    var tableData = "";
+    for(var h=0;h<a_info.length;h++)
+    { //便历每一条数据
+      if(Math.round(h/14)*14==h)
+      {
+        tableData += "<tr style='border:1px solid black;'><td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"源节点"+"</td>"
+            +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+"源节点类型"+"</td>"
+            +"<td style='width: 10%;font-weight:bold;border:1px solid black;'>"+"关系"+"</td>"
+            +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+"末节点"+"</td>"
+            +"<td style='width: 5%;font-weight:bold;border:1px solid black;'>"+"权重"+"</td>"
+            +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+"开始日期"+"</td>"
+            +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+"结束日期"+"</td>"
+            +"</tr>";
+      }
+      //else
+      tableData+="<tr style='border:1px solid black;'><td style='width: 20%;font-weight:bold;border:1px solid black;'>"+cy.$("#"+a_info[h].data('source')).data('name')+"</td>"
+          +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+cy.$("#"+a_info[h].data('source')).data('label')+"</td>"
+          +"<td style='width: 10%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('relationship')+"</td>"
+          +"<td style='width: 20%;font-weight:bold;border:1px solid black;'>"+cy.$("#"+a_info[h].data('target')).data('name')+"</td>"
+          +"<td style='width: 5%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('w')+"</td>"
+          +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('开始日期')+"</td>"
+          +"<td style='width: 15%;font-weight:bold;border:1px solid black;'>"+a_info[h].data('结束日期')+"</td>"
+          +"</tr>";
+    }
+    $("#o_tbody").html(tableData);
+    document.getElementById('light2').style.display='block';
+
+    $(document).ready(function() {
+      page = new Page(15, 'o_table', 'o_tbody', "pageindex");
+    });
+
+  });
+
+},
+    relationChart(name,seriesData,timeData){
+    this.$nextTick(()=>{
+          let myChart = this.$echarts.init(this.$refs.relationChart);
+          let option;
+          option = {
+            title: {
+              text: '关联实体'
+            },
+            tooltip: {
+              trigger: 'axis'
+            },
+            legend: {
+              data: name
+            },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            toolbox: {
+              feature: {
+                saveAsImage: {}
+              }
+            },
+            xAxis: {
+              type: 'category',
+              boundaryGap: false,
+              data: timeData
+            },
+            yAxis: {
+              type: 'value'
+            },
+            series:seriesData
+          }
+          option && myChart.setOption(option);
+      console.log(option)
+    })
+    },
+    entity_relationship(id){
+      http.get('/graph/get_current_similarity/?company_id=' + id,
+      ).then((response) => {
+        this.relationData.length=0
+        if(response.data.data) {
+          this.relationData= response.data.data
+          http.get('/graph/get_similarity_history/',{
+            params:{
+              company_id:id,
+              start:this.timebrustStart,
+              end:this.timebrustEnd
+            }
+              }
+          ).then((res) => {
+            let dat=res.data.data
+            let time=res.data.time
+            let name=res.data.name
+            let seriesData=[]
+            for(let i in dat) {
+              let tmp=[]
+              Object.values(dat[i]).forEach(value=>{
+                tmp.push(value)
+              })
+              seriesData.push({name:name[i],type:'line',data:tmp})
+            }
+              this.relationData= response.data.data
+            console.log(seriesData)
+              this.relationChart(name,seriesData,time)
+            // this.relationDialog = true
+          })
+          this.relationDialog=true
+        }
+        else this.$notify.info({
+          title: '提示',
+          message: '暂无数据'
+        });
+      })
+
+
+    },
+
+    xianshi_neigh(id){
+      this.$cy.$('#'+id).neighborhood().show();
+  // cy.nodes().filter(function( element, i ){return element.data('id') == id}).neighborhood().nodes().show();
+  // cy.nodes().filter(function( element, i ){return element.data('id') == id}).neighborhood().edges().show();
+  // cy.nodes().filter(function( element, i ){return element.data('id') == id}).neighborhood().nodes().connectedEdges().show();
+  // cy.nodes().filter(function( element, i ){return element.data('id') == id}).neighborhood().edges().connectedNodes().show();
+
+},
+    yincang_neigh(id){
+  //cy.nodes().filter(function( element, i ){return element.data('id') == id}).neighborhood().hide()
+      this.$cy.$('#'+id).neighborhood().hide()
+},
+    dblclicked(svg) {
+      const selection = d3.brushSelection(this) ? null : this.x.range();
+      console.log(svg)
+      console.log(this.brush)
+      // d3.select(svg).call(this.brush.move, selection)
+},
+    brushmove(event) {
+
+      let  d0 = event.selection.map(this.x.invert),  //开始、最终 随过程变化
+      d1 = d0.map(d3.timeDay.round);    //最终的开始、最终 [,]
+      //
+
+
+      let datetime_s=d1[0].getFullYear() + '-' + (d1[0].getMonth() + 1) + '-' + d1[0].getDate(); //+ ' ' + d1[0].getHours() + ':' + d1[0].getMinutes() + ':' + d1[0].getSeconds();
+      let datetime_e=d1[1].getFullYear() + '-' + (d1[1].getMonth() + 1) + '-' + d1[1].getDate(); //+ ' ' + d1[1].getHours() + ':' + d1[1].getMinutes() + ':' + d1[1].getSeconds();
+      this.timebrustStart=datetime_s
+      this.timebrustEnd=datetime_e
+      this.$cy.elements().addClass("light-off");
+
+  //满足
+      this.$cy.edges().filter(function( element, i ){
+      return new Date(Date.parse(element.data('开始日期'))) >= new Date(Date.parse(datetime_s)) && new Date(Date.parse(element.data('结束日期'))) <= new Date(Date.parse(datetime_e))
+    }).removeClass("light-off");
+
+      this.$cy.edges().filter(function( element, i ){
+      return new Date(Date.parse(element.data('开始日期'))) >= new Date(Date.parse(datetime_s)) && new Date(Date.parse(element.data('结束日期'))) <= new Date(Date.parse(datetime_e))
+  }).connectedNodes()
+      .removeClass("light-off");
+
+},
+
+    brushended(){//监听鼠标抬起事件
+
+      let d0 = d3.event.selection.map(x.invert),  //开始、最终 随过程变化
+      d1 = d0.map(d3.timeDay.round);    //最终的开始、最终 [,]
+
+
+      let datetime_s=d1[0].getFullYear() + '-' + (d1[0].getMonth() + 1) + '-' + d1[0].getDate(); //+ ' ' + d1[0].getHours() + ':' + d1[0].getMinutes() + ':' + d1[0].getSeconds();
+      let datetime_e=d1[1].getFullYear() + '-' + (d1[1].getMonth() + 1) + '-' + d1[1].getDate(); //+ ' ' + d1[1].getHours() + ':' + d1[1].getMinutes() + ':' + d1[1].getSeconds();
+
+      this.$cy.elements().addClass("light-off");
+
+      this.$cy.edges().filter(function( element, i ){
+    return new Date(Date.parse(element.data('开始日期'))) >= new Date(Date.parse(datetime_s)) && new Date(Date.parse(element.data('结束日期'))) <= new Date(Date.parse(datetime_e))
+  }).removeClass("light-off");
+
+      this.$cy.edges().filter(function( element, i ){
+      return new Date(Date.parse(element.data('开始日期'))) >= new Date(Date.parse(datetime_s)) && new Date(Date.parse(element.data('结束日期'))) <= new Date(Date.parse(datetime_e))
+  }).connectedNodes()
+      .removeClass("light-off");
+} ,// brushended()
+    doElemsMultiTypes(elems) {
+      const classDict = {};
+      for (let i = 0; i < elems.length; i++) {
+        classDict[elems[i].data('edgeType')] = true;
+      }
+      return Object.keys(classDict).length > 1;
+    },
+    setColor4CompoundEdge(e) {
+      const collapsedEdges = e.data('collapsedEdges');
+      if (this.doElemsMultiTypes(collapsedEdges)) {
+        return '#b3b3b3';
+      }
+      return collapsedEdges[0].style('line-color')
+    },
+    setTargetArrowShape(e) {
+      const collapsedEdges = e.data('collapsedEdges');
+      const shapes = {};
+      for (let i = 0; i < collapsedEdges.length; i++) {
+        shapes[collapsedEdges[0].style('target-arrow-shape')] = true;
+      }
+      delete shapes['none'];
+      if (Object.keys(shapes).length < 1) {
+        if (collapsedEdges.sources().length > 1) {
+          return collapsedEdges[0].style('source-arrow-shape');
+        }
+        return 'none';
+      }
+      return Object.keys(shapes)[0];
+    },
+    setSourceArrowShape(e) {
+      const collapsedEdges = e.data('collapsedEdges');
+      const shapes = {};
+      for (let i = 0; i < collapsedEdges.length; i++) {
+        shapes[collapsedEdges[0].style('source-arrow-shape')] = true;
+      }
+      delete shapes['none'];
+      if (Object.keys(shapes).length < 1) {
+        if (collapsedEdges.sources().length > 1) {
+          return collapsedEdges[0].style('target-arrow-shape');
+        }
+        return 'none';
+      }
+      return Object.keys(shapes)[0];
+    },
+
+    findNode(content) {
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
+
+      http.get('/graph/search/?name=' + content,
+          // {
+          //  name:content
+          //  }
+      ).then((response) => {
+        let graphData = response.data
+        let that = this
+        if (!cytoscape().cxtmenu) {
+          cytoscape.use(cxtmenu)
+        }
+        if (!cytoscape().expandCollapse) {
+          cytoscape.use(expandCollapse)
+        }
+        if (!cytoscape().euler) {
+          cytoscape.use(euler)
+        }
+        if (!cytoscape().BubbleSets) {
+          cytoscape.use(BubbleSets)
+        }
+        cytoscape.use(BubbleSets);
+        if( this.search_memory.length ===0 || this.mindate==="" || this.maxdate==="")
+        {
+          this.mindate = graphData['mindate']
+          this.maxdate = graphData['maxdate']
+        }
+        else
+        {
+          if(this.mindate > graphData['mindate'] && graphData['mindate']!=="") this.mindate  = graphData['mindate']
+          if(this.mindate < graphData['maxdate'] && graphData['maxdate']!=="") this.maxdate = graphData['maxdate']
+        }
+        this.search_memory.push(this.content)
+        this.$cy = cytoscape({
+          elements: graphData,
+          container: document.getElementById('graph'),
+          // ready:this.readyFunc,
+          // ready: function () {
+          //   that.$api = cytoscape().expandCollapse({
+          //     elements:graphData,
+          //     layoutBy: {
+          //       name: 'euler',
+          //       randomize: true,
+          //       animate: false
+          //     },
+          //     fisheye: true,
+          //     animate: false,
+          //     ready: function () {
+          //     },
+          //     undoable: false,
+          //     randomize: false,
+          //
+          //     cueEnabled: true, // Whether cues are enabled
+          //     expandCollapseCueSize: 12, // size of expand-collapse cue
+          //     expandCollapseCueLineSize: 8, // size of lines used for drawing plus-minus icons
+          //     expandCueImage: undefined, // image of expand icon if undefined draw regular expand cue
+          //     collapseCueImage: undefined, // image of collapse icon if undefined draw regular collapse cue
+          //     expandCollapseCueSensitivity: 1, // sensitivity of expand-collapse cues
+          //     allowNestedEdgeCollapse: false
+          //   })
+          //   //api.collapseAll();
+          // },
+          layout: {
+            name: 'euler',
+            randomize: true,
+            animate: false
+          },   //可选：'breadthfirst', 'circle', 'concentric', 'cose', 'grid','null', 'preset', 'random'
+          zoom: 1,
+          pan: {x: 0, y: 0},
+          minZoom: 1e-10,
+          maxZoom: 1e10,
+          zoomingEnabled: true, // 是否通过用户事件和编程方式启用缩放图形.
+          userZoomingEnabled: true, // 是否允许用户事件(例如鼠标滚轮,捏合缩放)缩放图形.对此缩放的编程更改不受此选项的影响.
+          panningEnabled: true, // 是否通过用户事件和编程方式启用平移图形.
+          userPanningEnabled: true, // 是否允许用户事件(例如拖动图形背景)平移图形.平移的程序化更改不受此选项的影响.
+          boxSelectionEnabled: true,
+          wheelSensitivity: 0.3, //缩放时更改滚轮灵敏度.这是一个乘法修饰符.因此,0到1之间的值会降低灵敏度(变焦较慢),而大于1的值会增加灵敏度(变焦更快).
+          multiselectionEnabled: true,
+          //selectionType:"additive",
+          touchTapThreshold: 8,
+          desktopTapThreshold: 4,
+          style: cytoscape.stylesheet()
+
+              .selector('node[label = "公司"]')   //定义节点的样式
+              .css({'background-color': '#d71345'})
+              .selector('node[label = "上市公司"]')
+              .css({'background-color': '#ef4136'}) //'shape':'triangle'
+              .selector('node[label = "上市公司-实体企业"]')
+              .css({'background-color': '#FF1493'})
+              .selector('node[label = "上市公司-金融机构"]')
+              .css({'background-color': '#C71585'})
+              .selector('node[label = "上市公司-金融机构-银行"]')
+              .css({'background-color': '#f8aba6'})
+              .selector('node[label = "上市公司-金融机构-证券"]')
+              .css({'background-color': '#f05b72'})
+              .selector('node[label = "上市公司-金融机构-保险"]')
+              .css({'background-color': '#d93a49'})
+              .selector('node[label = "上市公司-金融机构-信托"]')
+              .css({'background-color': '#FF69B4'})
+              .selector('node[label = "上市公司-金融机构-基金"]')
+              .css({'background-color': '#DB7093'})
+              .selector('node[label = "上市公司-金融机构-基金-公募基金"]')
+              .css({'background-color': '#FFB6C1'})
+              .selector('node[label = "上市公司-金融机构-基金-私募基金"]')
+              .css({'background-color': '#FFC0CB'})
+              .selector('node[label = "上市公司-金融机构-其他金融机构"]')
+              .css({'background-color': '#D8BFD8'})
+              .selector('node[label = "非上市公司"]')
+              .css({'background-color': '#102b6a'})
+              .selector('node[label = "非上市公司-实体企业"]')
+              .css({'background-color': '#224b8f'})
+              .selector('node[label = "非上市公司-金融机构"]')
+              .css({'background-color': '#2a5caa'})
+              .selector('node[label = "非上市公司-金融机构-银行"]')
+              .css({'background-color': '#2b4490'})
+              .selector('node[label = "非上市公司-金融机构-证券"]')
+              .css({'background-color': '#426ab3'})
+              .selector('node[label = "非上市公司-金融机构-保险"]')
+              .css({'background-color': '#0072E3'})
+              .selector('node[label = "非上市公司-金融机构-信托"]')
+              .css({'background-color': '#0080FF'})
+              .selector('node[label = "非上市公司-金融机构-基金"]')
+              .css({'background-color': '#46A3FF'})
+              .selector('node[label = "非上市公司-金融机构-基金-公募基金"]')
+              .css({'background-color': '#66B3FF'})
+
+              .selector('node[label = "非上市公司-金融机构-基金-私募基金"]')
+              .css({'background-color': '#84C1FF'})
+              .selector('node[label = "非上市公司-金融机构-其他金融机构"]')
+              .css({'background-color': '#97CBFF'})
+
+              .selector('node[label = "人物"]')
+              .css({'background-color': '#e0861a'})
+              .selector('node[label = "人物-普通人物"]')
+              .css({'background-color': '#fcaf17'})
+              .selector('node[label = "人物-基金经理"]')
+              .css({'background-color': '#faa755'})
+              .selector('node[label = "人物-投资经理"]')
+              .css({'background-color': '#f58220'})
+
+              .selector('node[label = "机构-国务院国有资产监督管理委员会"]')
+              .css({'background-color': '#2e3a1f'})
+
+              .selector('node[label = "监管机构"]')
+              .css({'background-color': '#1d953f'})
+              .selector('node[label = "监管机构-银保监会（局）"]')
+              .css({'background-color': '#78a355'})
+              .selector('node[label = "监管机构-证监会（局）"]')
+              .css({'background-color': '#7fb80e'})
+              .selector('node[label = "监管机构-人民银行（分行）"]')
+              .css({'background-color': '#78a355'})
+              .selector('node[label = "监管机构-食药监局"]')
+              .css({'background-color': '#abc88b'})
+              .selector('node[label = "监管机构-网信"]')
+              .css({'background-color': '#45b97c'})
+              .selector('node[label = "监管机构-工信"]')
+              .css({'background-color': '#007d65'})
+              .selector('node[label = "监管机构-行业协会"]')
+              .css({'background-color': '#40835e'})
+
+              .selector('node[label = "交易所"]')
+              .css({'background-color': '#3e4145'})
+
+              .selector('node[label = "板块"]')
+              .css({'background-color': '#563624'})
+
+              .selector('node[label = "地点"]')
+              .css({'background-color': '#2468a2'})
+              .selector('node[label = "地点-国家"]')
+              .css({'background-color': '#228fbd'})
+              .selector('node[label = "地点-省"]')
+              .css({'background-color': '#33a3dc'})
+              .selector('node[label = "地点-县/区"]')
+              .css({'background-color': '#7bbfea'})
+              .selector('node[label = "地点-市"]')
+              .css({'background-color': '#90d7ec'})
+
+              .selector('node[label = "行业"]')
+              .css({'background-color': '#2e3a1f'})
+              .selector('node[label = "行业-门类"]')
+              .css({'background-color': '#454926'})
+              .selector('node[label = "行业-大类"]')
+              .css({'background-color': '#726930'})
+              .selector('node[label = "行业-中类"]')
+              .css({'background-color': '#4d4f36'})
+
+              .selector('node[label = "产品"]')
+              .css({'background-color': '#494e8f'})
+              .selector('node[label = "产品-一般产品"]')
+              .css({'background-color': '#585eaa'})
+              .selector('node[label = "产品-服务产品"]')
+              .css({'background-color': '#6a6da9'})
+              .selector('node[label = "产品-金融产品"]')
+              .css({'background-color': '#6950a1'})
+              .selector('node[label = "产品-金融产品-股票"]')
+              .css({'background-color': '#6f60aa'})
+              .selector('node[label = "产品-金融产品-债券"]')
+              .css({'background-color': '#6f599c'})
+              .selector('node[label = "产品-金融产品-基金"]')
+              .css({'background-color': '#9b95c9'})
+              .selector('node[label = "产品-金融产品-基金--公募"]')
+              .css({'background-color': '#afb4db'})
+              .selector('node[label = "产品-金融产品-基金--私募"]')
+              .css({'background-color': '#C7C7E2'})
+              .selector('node[label = "产品-金融产品-基金--REITS"]')
+              .css({'background-color': '#867892'})
+              .selector('node[label = "产品-金融产品-信托"]')
+              .css({'background-color': '#918597'})
+              .selector('node[label = "产品-金融产品-其他"]')
+              .css({'background-color': '#6f6d85'})
+
+              .selector('node[label = "学校"]')
+              .css({'background-color': '#ffd400'})
+
+              .selector('node[label = "非上市公司其他公司"]')
+              .css({'background-color': '#cbc547'})
+
+              .selector('node[label = "未知"]')
+              .css({'background-color': '#d9d6c3'})
+
+              // .selector('node.cy-expand-collapse-collapsed-node')
+              //   .style({
+              //       "background-color": "darkblue",
+              //       "shape": "rectangle"
+              //   })
+              .selector(':parent')
+              .style({
+                'background-opacity': 0.1,
+                'border-width': .001
+              })
+              .selector('node')
+              .style({
+                'color': '#999999', //定义节点标签颜色
+                'background-opacity': 1,
+                'font-size': '5px',
+                // 'width': '17px',
+                // 'height': '17px',
+                'width': function (node) {
+                  var w = node.data('w');
+                  if (w === "" || w===undefined) return '17px';
+                  else {
+                    w = parseFloat(w.substr(0, w.length - 1));
+                    if (w < 1.0) return (17 + Math.log2(w + 1) * 2) + 'px';
+                    else return (17 + Math.log2(w) * 2) + 'px';
+                  }
+
+                },
+                'height': function (node) {
+                  var w = node.data('w');
+                  if (w === ""|| w===undefined) return '17px';
+                  else {
+                    w = parseFloat(w.substr(0, w.length - 1));
+                    if (w < 1.0) return (17 + Math.log2(w + 1) * 2) + 'px';
+                    else return (17 + Math.log2(w) * 2) + 'px';
+                  }
+                },
+              })
+              // 显示隐藏节点样式
+              .selector (".hidden")
+              .style({
+                "display": "none"
+               })
+
+              .selector (".show")
+              .style({
+                "display": "element"
+              })
+
+
+              .selector('edge')   //定义边的样式
+              .style({
+                //'label': 'data(relationship)',
+                'target-arrow-shape': 'triangle-backcurve', /*箭头样式*/
+                'target-arrow-size': '0.1px', /*箭头大小*/
+                'target-arrow-color': '#8B8989', /*箭头颜色*/
+                'curve-style': 'bezier', /*线条样式曲线*/
+                'line-color': '#8B8989', /*线条颜色*/
+                // 'label':'data(id)',
+                'width': function (edge) {
+                  var w = edge.data('w');
+                  if (w == '') return '0.15px';
+                  else {
+                    // if(w.substr(w.length-1,1)=='%')
+                    // {
+                    w = parseFloat(w.substr(0, w.length - 1));
+                    return (0.15 + Math.log2(w + 1)) + 'px';
+                    // if(w<1.0) return (0.3 + Math.log2(w)) + 'px';
+                    // else return (0.3 + Math.log2(w)) + 'px';
+
+                    // }
+                    // else  //以 亿 为单位
+                    // {
+                    //     w=parseFloat(w);
+                    //     if(w<1.0)
+                    //     {
+                    //         return (0.4 + Math.log10(w+1)) + 'px';
+                    //     }
+                    //     else return (0.4 + Math.log10(w)) + 'px';
+                    // }
+                  }
+                },//'2px', /*线条宽度*/
+
+                //'overlay-opacity': 0.25,
+
+                // 'line-opacity':  function (edge) {
+                //    var w =  edge.data('w');
+                //    if(w=='') return '0.5';
+                //    else
+                //    {
+                //        // if(w.substr(w.length-1,1)=='%')
+                //        // {
+                //            w=parseFloat(w.substr(0,w.length-1));
+                //            return (0.5 + Math.log2(w+1)) + 'px';
+                //
+                //    }
+                // },
+                'font-size': '6px', /*标签字体大小*/
+                'color': '#999999', /*标签字体大小*/
+                'text-outline-color': 'white', /*文本轮廓颜色*/
+                'text-outline-width': '1px', /*文本轮廓宽度*/
+                'text-rotation': 'autorotate', /*标签方向*/
+              })
+              .selector('edge.cy-expand-collapse-collapsed-edge')
+              .style(
+                  {
+                    "text-outline-color": "#ffffff",
+                    "text-outline-width": "1px",
+                    'label': (e) => {
+                      return '(' + e.data('collapsedEdges').length + ')';
+                    },
+                    'width': function (edge) {
+                      const n = edge.data('collapsedEdges').length;
+                      return (1 + Math.log2(n)) + 'px';
+                    },
+                    //'line-opacity':1,
+                    'line-style': 'dashed',
+                    'line-color': this.setColor4CompoundEdge,
+                    'target-arrow-color': this.setColor4CompoundEdge,
+                    'target-arrow-shape': this.setTargetArrowShape,
+                    'source-arrow-shape': this.setSourceArrowShape,
+                    'source-arrow-color': this.setColor4CompoundEdge,
+                  })
+              .selector('node:selected')
+              .style({'border-color': '#c84e40', 'border-width': "1px",})
+              .selector('.search_node')
+              .style({'border-color': '#c84e40', 'border-width': "2px",})
+              .selector('.key_node')
+              .style({
+                'background-color': 'red',
+                'width': 30,
+                'height': 30,
+                shape: 'polygon',
+                'shape-polygon-points': '0 1, 0.8660254037844386 0.5, 0.8660254037844386 -0.5, 0 -1, -0.8660254037844386 -0.5, -0.8660254037844386 0.5',
+
+                animation: true,
+                duration: 1000
+              })
+              .selector('edge:selected')
+              .style({
+                'color': '#3165fc', /*标签字体大小*/
+                'target-arrow-color': '#61bffc', /*箭头颜色*/
+                'line-color': '#61bffc', /*线条颜色*/
+                // 'width':'2px',
+              })
+              .selector('.xianshi_label_edge')
+              .style({
+                'label': 'data(relationship)',
+              })
+              .selector('.xianshi_name_node')
+              .style({
+                'content': 'data(name)',
+              })
+              .selector('.mouse_xianshi_name_node')  //鼠标 显示
+              .style({
+                'content': 'data(name)',
+                'font-size': '15px',
+                'color': '#d71345',
+              })
+              .selector('.mouse_xianshi_label_edge')  //显示边
+              .style({
+                'label': 'data(relationship)',
+                'font-size': '15px',
+                'color': '#d71345',
+              })
+              .selector('.light-off')   //高亮样式
+              .style({'opacity': '0.1',})    //opacity: 透明度
+              .selector('.highlighted')
+              .style({
+                'background-color': '#65c294',
+                'line-color': '#d71345',
+                'target-arrow-color': '#d71345',
+                'transition-property': 'background-color, line-color, target-arrow-color',
+                'transition-duration': '0.5s',
+                // 'width': '2px'
+              })
+              .selector('.hbnode')
+              .style({
+                'label': '合并节点',
+                'background-color': '#000080', //定义节点标签颜色
+                'background-opacity': 0.8,
+                'font-size': '20px',
+                'width': '30px',
+                'height': '30px',
+              })
+              // .selector('.keynodes')
+              //     .style({'border-color': '#1d953f', 'border-width': "1px",})
+              .selector('.hbnodes_edge')
+              .style({
+                'target-arrow-color': '#ffd400', /*箭头颜色*/
+                'line-color': '#ffd400', /*线条颜色*/
+                'width': '2px',
+              })
+
+        })
+        loadingInstance.close()
+        for(let j=0;j<graphData['id'].length; j++)
+        {
+          this.$cy.$('#'+graphData['id'][j]).addClass("search_node");
+        }
+        // 添加事件
+        this.$cy.on('mouseover', 'node', function (evt) {
+          evt.target.addClass('mouse_xianshi_name_node');
+        });
+        this.$cy.on('mouseout', 'node', function (evt) {
+          evt.target.removeClass('mouse_xianshi_name_node');
+        });
+
+        this.$cy.on('mouseover', 'edge', function (evt) {
+          evt.target.addClass('mouse_xianshi_label_edge');
+        });
+        this.$cy.on('mouseout', 'edge', function (evt) {
+          evt.target.removeClass('mouse_xianshi_label_edge');
+        });
+        this.$cy.on('tap', 'node', function (d) {
+          if (d.target.data('label') !== "合并节点") {
+            let node_info = '';
+            for (let key in d.target.data()) {
+              if (key === 'id') {
+                node_info = node_info + 'ID' + ':' + d.target.data()[key] + '<br>';
+              } else if (key === 'label') {
+                node_info = node_info + '类型' + ':' + d.target.data()[key] + '<br>';
+              } else if (key === 'name') {
+                node_info = node_info + '名称' + ':' + d.target.data()[key] + '<br>';
+              } else if (key === 'w') {
+                node_info = node_info + '权重' + ':' + d.target.data()[key] + '<br>';
+              } else node_info = node_info + key + ':' + d.target.data()[key] + '<br>';
+            }
+            // node_info = node_info
+                // + '<p><a href = "javascript:void(0)" onclick = "document.getElementById(\'light\').style.display=\'block\';document.getElementById(\'fade\').style.display=\'block\'">更多信息...</a></p>';
+            document.getElementById("hovertip").innerHTML = (node_info)}},
+        )
+        // 更多信息接口
+        this.$cy.on('tap', 'node', function (d) {
+          if (that.tableData || that.tableHead){
+            that.tableData=[]
+            that.tableHead=[]
+          }
+              http.get('/graph/info/?id=' + d.target.data('id') + '&label=' + d.target.data('label'))
+                  .then((response) => {
+                        let node_info = response.data['data']
+                        let tmp={}
+                        for (const i of Object.keys(node_info)){
+                          if (Object.prototype.toString.call(node_info[i]) === '[object Object]')
+                          tmp[i]=JSON.stringify(node_info[i])
+                          else {
+                            tmp[i]=node_info[i]
+                          }
+                        }
+                        that.tableData.push(tmp)
+                        for (const i of Object.keys(node_info)){
+                          if (i==='公司简介'){
+                            that.tableHead.push({prop:i,label:i,width:400})
+                          }else if(i==='经营范围'){
+                            that.tableHead.push({prop:i,label:i,width:300})
+                          }
+                          else {
+                            that.tableHead.push({prop: i, label: i, width: 80})
+                          }
+                        }
+                        // that.dialogVisible=true
+                      }
+                  )
+            }
+        )
+        //BFS
+
+          this.$cy.expandCollapse({
+            layoutBy: {
+              name: 'euler',
+              randomize: true,
+              animate: false
+            },
+            fisheye: true,
+            animate: false,
+            ready: function () { },
+            undoable: false,
+            randomize: false,
+            cueEnabled: true, // Whether cues are enabled
+            expandCollapseCueSize: 12, // size of expand-collapse cue
+            expandCollapseCueLineSize: 8, // size of lines used for drawing plus-minus icons
+            expandCueImage: undefined, // image of expand icon if undefined draw regular expand cue
+            collapseCueImage: undefined, // image of collapse icon if undefined draw regular collapse cue
+            expandCollapseCueSensitivity: 1, // sensitivity of expand-collapse cues
+            allowNestedEdgeCollapse: false
+          })
+        this.$cy.cxtmenu({
+          menuRadius: 110, // the radius of the circular menu in pixels
+          selector: 'node', // elements matching this Cytoscape.js selector will trigger cxtmenus
+          commands: (element) => {
+            return [
+              {
+                fillColor: '#a1a3a6', // optional: custom background color for item
+                content: '<span style="font-size: 7px">关联实体计算</span>', // html/text content to be displayed in the menu
+                // content: '显示邻居',
+                contentStyle: {}, // css key:value pairs to set the command's css in js if you want
+                select: (ele) =>this.entity_relationship(ele.id()),
+                enabled: true, // whether the command is selectable
+              },
+              {
+                fillColor: '#33a3dc', // optional: custom background color for item
+                content: '<span style="font-size: 7px">显示邻居</span>', // html/text content to be displayed in the menu
+                // content: '显示邻居',
+                contentStyle: {}, // css key:value pairs to set the command's css in js if you want
+                select: (ele) =>this.xianshi_neigh(ele.id()),
+                enabled: true, // whether the command is selectable
+              },
+              {
+                fillColor: '#73b9a2', // optional: custom background color for item
+                content: '<span style="font-size: 7px">隐藏邻居</span>', // html/text content to be displayed in the menu
+                contentStyle: {}, // css key:value pairs to set the command's css in js if you want
+                select: (ele) => this.yincang_neigh(ele.id()),
+                enabled: true, // whether the command is selectable
+              },
+              {
+                fillColor: '#f7acbc', // optional: custom background color for item
+                content: '<span style="font-size: 7px">高亮邻居</span>', // html/text content to be displayed in the menu
+                // contentStyle: {}, // css key:value pairs to set the command's css in js if you want
+                select: (ele) => this.lightOn([ele.id()]),
+                enabled: true, // whether the command is selectable
+              },
+              {
+                fillColor: '#ffd400',
+                content: '<span style="font-size: 7px">隐藏/显示出度邻居</span>',
+                // contentStyle: {}, // css key:value pairs to set the command's css in js if you want
+                select: (ele) => this.zhedie(ele.id()),
+                enabled: true,
+              },
+              {
+                fillColor: '#f15b6c', // optional: custom background color for item
+                content: '<span style="font-size: 7px">拓展节点</span>', // html/text content to be displayed in the menu
+                contentStyle: {}, // css key:value pairs to set the command's css in js if you want
+                select: (ele) => this.tuozhan(ele.data('id'), ele.data('label')),
+                enabled: true, // whether the command is selectable
+              },
+              {
+                fillColor: '#b2d235', // optional: custom background color for item
+                content: '<span style="font-size: 7px">股权穿透</span>', // html/text content to be displayed in the menu
+                contentStyle: {}, // css key:value pairs to set the command's css in js if you want
+                select: (ele) => this.chuantou(ele.id()),
+                enabled: true, // whether the command is selectable
+              },
+
+              // {
+              //   fillColor: '#7d5886', // optional: custom background color for item
+              //   content: '<span style="font-size: 7px">统计信息</span>', // html/text content to be displayed in the menu
+              //   contentStyle: {}, // css key:value pairs to set the command's css in js if you want
+              //   select: (ele) => this.tongji(ele.id()),
+              //   enabled: true, // whether the command is selectable
+              // },
+            ]
+          },
+          fillColor: 'rgba(0, 0, 0, 0.75)', // 指令默认颜色(the background colour of the menu)
+          activeFillColor: 'rgba(1, 105, 217, 0.75)', // 所选指令的颜色(the colour used to indicate the selected command)
+          activePadding: 5, // additional size in pixels for the active command
+          indicatorSize: 14, // the size in pixels of the pointer to the active command
+          separatorWidth: 1, //连续命令之间的空白间隔(以像素为单位)
+          spotlightPadding: 10, //元素和聚光灯之间的额外间距(以像素为单位)
+          minSpotlightRadius: 10, // the minimum radius in pixels of the spotlight
+          maxSpotlightRadius: 14, // the maximum radius in pixels of the spotlight
+          openMenuEvents: 'cxttapstart taphold', // space-separated cytoscape events that will open the menu; only `cxttapstart` and/or `taphold` work here
+          itemColor: 'white', // 各指令元素内字体颜色
+          // itemTextShadowColor: '#fffffb', // 各指令元素内字体阴影颜色
+          zIndex: 9999, // the z-index of the ui div
+          atMouse: true, // draw menu at mouse position
+        });
+        this.$api = this.$cy.expandCollapse('get')
+        document.getElementById("timebrush_div").innerHTML=""
+        let margin = {top: -12, right: 27, bottom: 21, left: 0}
+
+        // console.log(document.all.graph)
+        let   width = document.all.graph.offsetWidth
+        console.log(width)
+        let height = 55 - margin.top - margin.bottom;
+
+        this.x = d3.scaleTime()
+            .domain([new Date(this.mindate), new Date(this.maxdate) - 1])
+            .rangeRound([0, width]);
+        this.brush=d3.brushX()
+            .extent([[0, 0], [width, height+30]])
+            //.on("start",brushstart)
+            .on("brush",this.brushmove)
+        this.svg = d3.select("#timebrush_div").append("svg")
+            .attr("width", width + margin.left + margin.right) //width + margin.left + margin.right
+            .attr("height", height + margin.top + margin.bottom)  // height + margin.top + margin.bottom
+            .append("g")
+            .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+        this.svg.append("g")
+            .attr("class", "axis axis--x")
+            .attr("transform", "translate(0," + height + ")")
+            .call(d3.axisBottom(this.x)
+                .ticks(d3.timeYear)
+                .tickPadding(0))
+            .attr("text-anchor", null)
+            .selectAll("text")
+            .attr("fill","#ef5b9c")
+            .attr("x", 0);
+
+        this.svg.append("g")
+            .attr("class", "brush")
+            .call(this.brush)
+            .on("dblclick", this.dblclicked(this.svg))
+        // .on("end",brushended));
+        // svg.append("g").on("dblclick", this.dblclicked(svg))
+
+      })
+      .catch(error=>{
+        loadingInstance.close()
+        this.$message.warning(error)
+      })
+    },
+    collapseAllEdges(){
+      this.$api.collapseAllEdges()
+    },
+    expandAllEdges(){
+      this.$api.expandAllEdges()
+    },
+    collapseAllnode(){
+      this.$api.collapseAll()
+    },
+    expandAllnode(){
+      this.$api.expandAll()
+    },
+    displayNode(){
+      this.$cy.nodes().addClass("xianshi_name_node")
+    },
+    hideNode(){
+      this.$cy.nodes().removeClass("xianshi_name_node")
+    },
+    displayEdge(){
+      this.$cy.edges().addClass("xianshi_label_edge")
+    },
+    hideEdge(){
+      this.$cy.edges().removeClass("xianshi_label_edge")
+    },
+    cose(){
+      var layout = this.$cy.layout({
+        name: 'cose',   //'circle'
+        animate: 'end',
+        animationEasing: 'ease-out',
+        animationDuration: 1000,
+        randomize: true,
+        idealEdgeLength: 50,
+        nodeOverlap: 20,
+        nodeDimensionsIncludeLabels: false,
+        refresh: 40,
+        fit: true,
+        padding: 30,
+        componentSpacing: 100,
+        nodeRepulsion: 400000,
+        edgeElasticity: 100,
+        nestingFactor: 5,
+        gravity: 80,
+        numIter: 1000,
+        initialTemp: 200,
+        coolingFactor: 0.75,
+        minTemp: 1.0
+      });
+      layout.run();
+    },
+    euler(){
+      let layout = this.$cy.layout({
+        name: 'euler',
+        randomize: true,
+        animate: false
+      });
+      layout.run();
+    },
+    fcose(){
+      var layout = this.$cy.layout({
+        name: 'fcose',
+        quality: 'default',
+        randomize: true,
+        animate: true,
+        animationEasing: 'ease-out',
+        uniformNodeDimensions: false,
+        packComponents: true,
+        tile: true,
+        nodeRepulsion: parseFloat('4500'),
+        idealEdgeLength: parseFloat('50'),
+        edgeElasticity: parseFloat('0.45'),
+        nestingFactor: parseFloat('0.1'),
+        gravity: parseFloat('0.25'),
+        gravityRange: parseFloat('3.8'),
+        gravityCompound: parseFloat('1'),
+        gravityRangeCompound: parseFloat('1.5'),
+        numIter: parseFloat('2500'),
+        tilingPaddingVertical: parseFloat('10'),
+        tilingPaddingHorizontal: parseFloat('10'),
+        initialEnergyOnIncremental: '0.3',
+        step:"all"
+      });
+      layout.run();
+    },
+    circle(){
+      var layout = this.$cy.layout({
+        name: 'circle',
+      });
+      layout.run();
+    },
+    concentric(){
+      var layout = this.$cy.layout({
+        name: 'concentric',
+        randomize: true,
+        animate: false
+      });
+      layout.run();
+    },
+    bfs_lujing(id) {
+    let bfs = this.$cy.elements().bfs('#'+id, function(){}, true)
+       let i = 0
+       let highlightNextEle = function(){
+    if( i < bfs.path.length ){
+      bfs.path[i].addClass('highlighted');
+      i++;
+      setTimeout(highlightNextEle, 500);
+    }
+    if( i == bfs.path.length ){
+      alert('BFS路径查找完毕！')
+      i++;
+      }
+    }
+  // kick off first highlight
+    highlightNextEle();
+  },
+    BFS(){
+      {
+        let node = this.$cy.nodes(':selected');
+        if(node.length == 1)
+          this.bfs_lujing(node.data('id'))
+        else
+          alert('请选择单个节点！')
+      }
+    },
+    cancleBFS(){
+      let node = this.$cy.nodes(':selected');
+      let id = node.data('id');
+      let bfs = this.$cy.elements().bfs('#'+id, function(){}, true);
+      let i = 0;
+      let highlightNextEle = function(){
+        if( i < bfs.path.length ){
+          bfs.path[i].removeClass('highlighted');
+          i++;
+          setTimeout(highlightNextEle, 500);
+        }
+      };
+      // kick off first highlight
+      highlightNextEle()
+    },
+    shortestPath (start,end,di) {
+      let node1 = start;
+      let node2 = end;
+      //console.log(node1, node2)
+      let node11=false,node22=false;
+      let is_dire = di;
+
+      if(node1===''||node2==='')
+      {
+        alert("请输入完整ID！")
+      }
+
+      else
+      {
+        this.$cy.elements().unselect();
+        if(is_dire)
+        {
+          http.get('/graph/path/?id0='+node1+'&id1='+node2).then((response)=>{
+            let add_data=response.data
+            this.$cy.add(add_data.data['nodes'])
+            this.$cy.add(add_data.data['edges'])
+
+            if( this.search_memory.length ===0 || this.mindate==="" || this.maxdate==="" )
+            {
+              this.mindate = add_data.data['mindate']
+              this.maxdate = add_data.data['maxdate']
+            }
+            else
+            {
+              if(this.mindate > add_data.data['mindate'] && add_data.data['mindate']!=="") this.mindate = add_data.data['mindate']
+              if(this.maxdate < add_data.data['maxdate'] && add_data.data['maxdate']!=="") this.maxdate = add_data.data['maxdate']
+            }
+
+            var layout = this.$cy.layout({
+              name: 'euler',
+              randomize: true,
+              animate: false,
+            });
+            layout.run();
+
+            this.$cy.nodes().filter(function (ele) {
+              if(ele.data('id')===node1) node11=true;
+              if(ele.data('id')===node2) node22=true;
+              // console.log(node22, node11)
+            })
+            if(node11===true && node22===true)
+            {
+              var dfs = this.$cy.elements().aStar({
+                root: '#'+node1,
+                goal: '#'+node2,
+                directed: is_dire
+              })
+              if(dfs['found']===true)
+              {
+                dfs.path.select();
+                alert('路径查找完毕！');
+              }
+              else alert('不存在从'+node1+'到'+node2+'的路径');
+              // console.log(dfs)
+            }
+            else
+            {
+              if(node11===true)
+                alert("结束节点不存在！");
+              else alert("开始节点不存在！");
+            }
+
+          }
+        )}
+      else
+        {
+      this.$cy.nodes().filter(function (ele) {
+      if(ele.data('id')===node1) node11=true;
+      if(ele.data('id')===node2) node22=true;
+    // console.log(node22, node11)
+  })
+  if(node11===true && node22===true)
+  {
+    var dfs = this.$cy.elements().aStar({
+      root: '#'+node1,
+      goal: '#'+node2,
+      directed: is_dire
+    })
+    if(dfs['found']===true)
+    {
+      dfs.path.select();
+      alert('路径查找完毕！');
+    }
+    else alert('不存在从'+node1+'到'+node2+'的路径');
+    // console.log(dfs)
+  }
+  else
+  {
+    if(node11==true)
+      alert("结束节点不存在！");
+    else alert("开始节点不存在！");
+  }
+
+        }
+      }
+    },
+
+  },
+  mounted() {
+    // let infoDiv = document.getElementById('hovertip');
+    //
+    // // 监听窗口缩放事件
+    // window.addEventListener('resize', function() {
+    //   // 计算元素与窗口底部的距离
+    //   var windowHeight = window.innerHeight;
+    //   var distanceFromBottom = 40; // 你要设置的距离
+    //   var elementHeight = infoDiv.offsetHeight;
+    //
+    //   var newBottomDistance = windowHeight - elementHeight - distanceFromBottom;
+    //
+    //   // 设置元素的样式
+    //   infoDiv.style.bottom = newBottomDistance + 'px';
+    // });
+
+  },
+  watch:{
+  percentage(){
+      this.displayAsPercentage()
+
+    },
+  changeNodes(){
+    console.log('changeNodes')
+    this.updateStatus()
+  },
+  changeEdges(){
+    console.log('changeEdges')
+    this.updateStatus()
+  }
+},
+  computed:{
+    // eslint-disable-next-line vue/no-dupe-keys
+    changeNodes(){
+      return this.checkedNodes
+    },
+    // eslint-disable-next-line vue/no-dupe-keys
+    changeEdges(){
+      return this.checkedEdges
+    }
+  },
+
+  afterM() {
+    this.resize()
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+.info{
+  position: fixed;
+  //margin-top: -35px;
+  //width:100%;
+  bottom: 80px ;
+  white-space:nowrap
+}
+.contain{
+  //overflow: hidden;
+  //position: relative;
+  //bottom: 0px;
+  //padding-left:15%;
+  //right: 0px;
+
+}
+.graph {
+/*//margin-left: -800px;*/
+/*  transform: translate(0,0);*/
+  height: 700px;
+  /*width: */
+}
+.grayish_btn{
+/*//浅灰色按钮*/
+  color: #fff;
+/*//文字颜色*/
+  background-color: #aaaaaa;
+/*//背景颜色*/
+}
+
+
+.checkbox1{
+/deep/ .el-checkbox-group {
+  text-align: left;  /* 这个很关键，否则最后一行是居中状态 */
+  margin-bottom: 5px;
+}
+
+
+ /deep/ .el-checkbox {
+  width: 80px;       /* 根据内容设置宽度 */
+  padding-left: 0px;
+  text-align: left;  /* 这个很关键，否则每一行都是居中状态 */
+  margin-right: 20px;
+}
+
+}
+
+.checkbox2{
+  /deep/ .el-checkbox-group {
+    line-height: 20px !important;
+    // 不起作用
+
+}
+
+
+
+}
+
+
+</style>
\ No newline at end of file
diff --git a/src_old/views/个体风险分析.vue b/src_old/views/个体风险分析.vue
new file mode 100644
index 0000000..6d4b3f2
--- /dev/null
+++ b/src_old/views/个体风险分析.vue
@@ -0,0 +1,862 @@
+<!-- 个体风险分析 -->
+<template>
+  <div>
+            <!-- 卡片化的标签页 -->
+            <el-tabs type="border-card">
+          <!-- 【1】股市 -->
+          <el-tab-pane label="股市">
+            <el-card style='height: auto;' :body-style={padding:0}>
+            <!-- 1、上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">股市实体分析</span>
+              <!-- 2、产品搜索栏 -->
+              <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                  <el-form :inline="true"  class="demo-form-inline" :model="formInline" ref="formInline">
+<!--                    <el-form-item label="市场">-->
+<!--                      <el-select  v-model="formInline.market" size="mini">-->
+<!--                        <el-option label="股票" value="stock"></el-option>-->
+<!--                        <el-option label="基金" value="bond"></el-option>-->
+<!--                      </el-select>-->
+<!--                    </el-form-item>-->
+
+                    <el-form-item label="行业" >
+                      <el-select   v-model="formInline.industry" size="mini">
+                        <el-option-group
+                            v-for="group in options_industry"
+                            :key="group.label"
+                            :label="group.label">
+                          <el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                        </el-option-group>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="季度" >
+                      <quter-component v-model="formInline.quarter_year" placeholder="选择季度" />
+      <!--              <el-form-item label="开始时间">-->
+      <!--                <el-date-picker-->
+      <!--                    v-model="formInline.start_date"-->
+      <!--                    type="date"-->
+      <!--                    placeholder="年/月/日" -->
+      <!--                    size="mini">-->
+      <!--                </el-date-picker>-->
+      <!--              </el-form-item>-->
+
+      <!--              <el-form-item label="结束时间">-->
+      <!--              <el-date-picker-->
+      <!--                  v-model="formInline.end_date"-->
+      <!--                  type="date"-->
+      <!--                  placeholder="年/月/日" -->
+      <!--                  size="mini">-->
+      <!--              </el-date-picker>-->
+      <!--            </el-form-item>-->
+                  </el-form-item>
+                    <el-form-item>
+                      <el-button class="grayish_btn" @click="onSubmit('stock')" size="mini">查询</el-button>
+                    </el-form-item>
+                </el-form>
+              </div>
+              <!-- 3、个体风险分析返回数据 -->
+              <div class="content">
+                <el-table class='table'
+                    :data="tableData"
+                    style="width: 100%;padding: 0px 20px 0px 20px;"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+                    height="420"
+                    :row-style="{height:'28px'}"
+                          @row-click="handleRowContextMenu"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center">
+
+                    <el-table-column
+                    prop="name"
+                    label="公司名称"
+                    width="100">
+                      <template slot-scope="scope">
+<!--                        <div v-contextmenu:row="scope.row" @contextmenu.prevent="showContextMenu(scope.row)">-->
+<!--                          {{ scope.row.name }}-->
+<!--                        </div>-->
+
+                        <!-- 右键菜单内容 -->
+                        <el-dropdown  @command="currentRow" :style="{ top: contextMenuTop, left: contextMenuLeft }" trigger="click">
+<!--  <span class="el-dropdown-link">-->
+<!--    下拉菜单<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
+<!--  </span>-->
+                          <span v-contextmenu:row="scope.row" @contextmenu.prevent="showContextMenu(scope.row)">
+                            {{ scope.row.name }}
+                          </span>
+
+                          <el-dropdown-menu slot="dropdown">
+                            <el-dropdown-item disabled >查看风险传导</el-dropdown-item>
+                            <el-dropdown-item divided command="流动风险">流动风险</el-dropdown-item>
+                            <el-dropdown-item command="市场风险">市场风险</el-dropdown-item>
+                            <el-dropdown-item command="经营风险">经营风险</el-dropdown-item>
+                            <el-dropdown-item command="信用风险">信用风险</el-dropdown-item>
+                            <el-dropdown-item command="资产负债风险">资产负债风险</el-dropdown-item>
+                            <el-dropdown-item command="获现风险">获现风险</el-dropdown-item>
+                          </el-dropdown-menu>
+                        </el-dropdown>
+                      </template>
+                  </el-table-column>
+                  <el-table-column label="风险水平">
+                    <el-table-column
+                      prop="财务杠杆"
+                      label="财务杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="经营杠杆"
+                      label="经营杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="综合杠杆"
+                      label="综合杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+
+                  </el-table-column>
+                    <el-table-column label="（一）流动风险">
+                      <el-table-column
+                          prop="流动比率"
+                          label="流动比率"
+                          sortable
+                          width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="速动比率"
+                        label="速动比率"
+                        sortable
+                        width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="应收账款周转天数(天)"
+                        label="应收账款周转天数（天）"
+                        width="100">
+                      </el-table-column>
+                      <el-table-column
+                        prop="流动风险综合指数"
+                        label="流动风险综合指数"
+                        width="120"
+                        sortable>
+                      </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（二）市场风险">
+                      <el-table-column
+                        prop="在险价值"
+                        label="在险价值"
+                        sortable
+                        width="120">
+                      </el-table-column>
+                    </el-table-column>
+
+                      <el-table-column label="（三）经营风险">
+                        <el-table-column
+                          prop="资产收益率标准差"
+                          label="资产收益率标准差"
+                          sortable
+                          width="120">
+                        </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（四）信用风险">
+                        <el-table-column
+                          prop="资产负债率"
+                          label="资产负债率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                        <el-table-column
+                          prop="投资盈利率"
+                          label="投资盈利率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+                      <el-table-column
+                          prop="信用风险综合指数"
+                          label="信用风险综合指数"
+                          sortable
+                          width="100">
+                      </el-table-column>
+
+                    </el-table-column>
+
+                  <el-table-column label="（五）资产负债风险">
+                    <el-table-column
+                        prop="资产负债率_"
+                        label="资产负债率_"
+                        sortable
+                        width="100">
+                    </el-table-column>
+
+                  </el-table-column>
+
+                  <el-table-column label="（六）获现风险">
+                    <el-table-column
+                        prop="销售现金比率"
+                        label="销售现金比率"
+                        sortable
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="每股营业现金流量"
+                        label="每股营业现金流量"
+                        sortable
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="全部资产现金回收率"
+                        label="全部资产现金回收率"
+                        sortable
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="获现风险综合指数"
+                        label="获现风险综合指数"
+                        sortable
+                        width="100">
+                    </el-table-column>
+
+                  </el-table-column>
+
+                  <el-table-column label="声誉风险">
+                    <el-table-column
+                        prop="市场占有率"
+                        label="市场占有率"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="固有资产增长率"
+                        label="固有资产增长率"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="资本利润率"
+                        label="资本利润率"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="流动比率"
+                        label="流动比率"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="声誉风险综合指数"
+                        label="声誉风险综合指数"
+                        width="100">
+                    </el-table-column>
+
+                  </el-table-column>
+                  <el-table-column label="政策风险">
+                    <el-table-column
+                        prop="政策风险综合指数"
+                        label="政策风险综合指数"
+                        width="100">
+                    </el-table-column>
+                  </el-table-column>
+                  <el-table-column label="法律风险">
+                    <el-table-column
+                        prop="法律风险影响程度"
+                        label="法律风险影响程度"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="法律风险发生可能性"
+                        label="法律风险发生可能性"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="法律风险损失率"
+                        label="法律风险损失率"
+                        width="100">
+                    </el-table-column>
+                    <el-table-column
+                        prop="法律风险综合指数"
+                        label="法律风险综合指数"
+                        width="100">
+                    </el-table-column>
+                  </el-table-column>
+                  <el-table-column label="操作风险">
+                    <el-table-column
+                        prop="监管资本"
+                        label="监管资本"
+                        width="100">
+                    </el-table-column>
+                  </el-table-column>
+                    <el-table-column
+                    prop="综合风险等级"
+                    label="综合风险等级"
+                    width="100">
+                  </el-table-column>
+                </el-table>
+
+
+<!--                <div v-if="isContextMenuVisible" class="context-menu" :style="{ top: contextMenuTop, left: contextMenuLeft }">-->
+<!--                  <div @click="handleMenuItemClick('Option 1')">选项 1</div>-->
+<!--                  <div @click="handleMenuItemClick('Option 2')">选项 2</div>-->
+<!--                  <div @click="handleMenuItemClick('Option 3')">选项 3</div>-->
+<!--                </div>-->
+              </div>
+            </el-card>
+
+          </el-tab-pane>
+
+        <!-- 【2】债市 -->
+        <el-tab-pane label="债市">
+          <el-card style='height: auto;' :body-style={padding:0}>
+            <!-- 1、上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">债市实体分析</span>
+              <!-- 2、产品搜索栏 -->
+              <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                  <el-form :inline="true"  class="demo-form-inline" :model="formInline" ref="formInline">
+<!--                    <el-form-item label="市场">-->
+<!--                      <el-select  v-model="formInline.market" size="mini">-->
+<!--                        <el-option label="股票" value="股票"></el-option>-->
+<!--                        <el-option label="基金" value="基金"></el-option>-->
+<!--                      </el-select>-->
+<!--                    </el-form-item>-->
+
+                    <el-form-item label="行业" >
+                      <el-select   v-model="formInline.industry" size="mini">
+                        <el-option-group
+                            v-for="group in options_industry"
+                            :key="group.label"
+                            :label="group.label">
+                        <el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                        </el-option-group>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="季度" >
+                    <quter-component v-model="formInline.quarter_year" placeholder="选择季度" />
+      <!--              <el-form-item label="开始时间">-->
+      <!--                <el-date-picker-->
+      <!--                    v-model="formInline.start_date"-->
+      <!--                    type="date"-->
+      <!--                    placeholder="年/月/日" -->
+      <!--                    size="mini">-->
+      <!--                </el-date-picker>-->
+      <!--              </el-form-item>-->
+
+      <!--              <el-form-item label="结束时间">-->
+      <!--              <el-date-picker-->
+      <!--                  v-model="formInline.end_date"-->
+      <!--                  type="date"-->
+      <!--                  placeholder="年/月/日" -->
+      <!--                  size="mini">-->
+      <!--              </el-date-picker>-->
+      <!--            </el-form-item>-->
+                    </el-form-item>
+                    <el-form-item>
+                      <el-button class="grayish_btn" @click="onSubmit('bond')" size="mini">查询</el-button>
+                    </el-form-item>
+                </el-form>
+              </div>
+              <!-- 3、个体风险分析返回数据 -->
+              <div class="content">
+                <el-table class='table'
+                    :data="tableDataBond"
+                    style="width: 100%;padding: 0px 20px 0px 20px;"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+
+
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center">
+
+                    <el-table-column
+                    prop="name"
+                    label="公司名称"
+                    width="100">
+                  </el-table-column>
+                  <el-table-column label="风险水平">
+                    <el-table-column
+                      prop="财务杠杆"
+                      label="财务杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="经营杠杆"
+                      label="经营杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="综合杠杆"
+                      label="综合杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+
+                  </el-table-column>
+
+                    <el-table-column label="（一）流动风险">
+                      <el-table-column
+                          prop="流动比率"
+                          label="流动比率"
+                          sortable
+                          width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="速动比率"
+                        label="速动比率"
+                        sortable
+                        width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="应收账款周转天数(天)"
+                        label="应收账款周转天数（天）"
+                        width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="流动风险综合指数"
+                        label="流动风险综合指数"
+                        width="120"
+                        sortable>
+                      </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（二）市场风险">
+                      <el-table-column
+                        prop="在险价值"
+                        label="在险价值"
+                        sortable
+                        width="120">
+                      </el-table-column>
+                    </el-table-column>
+
+                      <el-table-column label="（三）经营风险">
+                        <el-table-column
+                          prop="资产收益率标准差"
+                          label="资产收益率标准差"
+                          sortable
+                          width="120">
+                        </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（四）信用风险">
+                        <el-table-column
+                          prop="资产负债率"
+                          label="资产负债率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                        <el-table-column
+                          prop="资产报酬率（投资盈利率）"
+                          label="资产报酬率（投资盈利率）"
+                          sortable
+                          width="100">
+                        </el-table-column>
+                      <el-table-column
+                          prop="信用风险综合指数"
+                          label="信用风险综合指数"
+                          sortable
+                          width="100">
+                      </el-table-column>
+
+                    </el-table-column>
+                  <el-table-column
+                      prop="声誉风险综合指数"
+                      label="声誉风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="政策风险综合指数"
+                      label="政策风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="法律风险综合指数"
+                      label="法律风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="操作风险综合指数"
+                      label="操作风险"
+                      width="100">
+                  </el-table-column>
+                    <el-table-column
+                    prop="综合风险等级"
+                    label="综合风险等级"
+                    width="100">
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-card>
+
+        </el-tab-pane>
+
+          <!-- 【3】期货 -->
+          <el-tab-pane label="期货">
+            <el-card style='height: auto;' :body-style={padding:0}>
+            <!-- 1、上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">期货实体分析</span>
+              <!-- 2、产品搜索栏 -->
+              <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                  <el-form :inline="true"  class="demo-form-inline" :model="formInline" ref="formInline">
+<!--                    <el-form-item label="市场">-->
+<!--                      <el-select  v-model="formInline.market" size="mini">-->
+<!--                        <el-option label="股票" value="股票"></el-option>-->
+<!--                        <el-option label="基金" value="基金"></el-option>-->
+<!--                      </el-select>-->
+<!--                    </el-form-item>-->
+
+                    <el-form-item label="行业" >
+                      <el-select   v-model="formInline.industry" size="mini">
+                        <el-option-group
+                            v-for="group in options_industry"
+                            :key="group.label"
+                            :label="group.label">
+                        <el-option v-for="item in group.options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                        </el-option-group>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="季度" >
+                    <quter-component v-model="formInline.quarter_year" placeholder="选择季度" />
+      <!--              <el-form-item label="开始时间">-->
+      <!--                <el-date-picker-->
+      <!--                    v-model="formInline.start_date"-->
+      <!--                    type="date"-->
+      <!--                    placeholder="年/月/日" -->
+      <!--                    size="mini">-->
+      <!--                </el-date-picker>-->
+      <!--              </el-form-item>-->
+
+      <!--              <el-form-item label="结束时间">-->
+      <!--              <el-date-picker-->
+      <!--                  v-model="formInline.end_date"-->
+      <!--                  type="date"-->
+      <!--                  placeholder="年/月/日" -->
+      <!--                  size="mini">-->
+      <!--              </el-date-picker>-->
+      <!--            </el-form-item>-->
+                   </el-form-item>
+                    <el-form-item>
+                      <el-button class="grayish_btn" @click="onSubmit('future')" size="mini">查询</el-button>
+                    </el-form-item>
+                </el-form>
+              </div>
+              <!-- 3、个体风险分析返回数据 -->
+              <div class="content">
+                <el-table class='table'
+                    :data="tableDataFuture"
+                    style="width: 100%;padding: 0px 20px 0px 20px;"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center">
+
+                    <el-table-column
+                    prop="name"
+                    label="公司名称"
+                    width="100">
+
+                  </el-table-column>
+                  <el-table-column label="风险水平">
+                    <el-table-column
+                      prop="财务杠杆"
+                      label="财务杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="经营杠杆"
+                      label="经营杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="综合杠杆"
+                      label="综合杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="流动比率"
+                      label="流动比率"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                  </el-table-column>
+                    <el-table-column label="（一）流动风险">
+                      <el-table-column
+                        prop="速动比率"
+                        label="速动比率"
+                        sortable
+                        width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="应收账款周转天数(天)"
+                        label="应收账款周转天数（天）"
+                        width="100">
+                      </el-table-column>
+                      <el-table-column
+                        prop="流动风险综合指数"
+                        label="流动风险综合指数"
+                        width="120"
+                        sortable>
+                      </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（二）市场风险">
+                      <el-table-column
+                        prop="在险价值"
+                        label="在险价值"
+                        sortable
+                        width="120">
+                      </el-table-column>
+                    </el-table-column>
+
+                      <el-table-column label="（三）经营风险">
+                        <el-table-column
+                          prop="资产收益率标准差"
+                          label="资产收益率标准差"
+                          sortable
+                          width="120">
+                        </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（四）信用风险">
+                        <el-table-column
+                          prop="资产负债率"
+                          label="资产负债率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                        <el-table-column
+                          prop="投资盈利率"
+                          label="投资盈利率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                    </el-table-column>
+                  <el-table-column
+                      prop="声誉风险综合指数"
+                      label="声誉风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="政策风险综合指数"
+                      label="政策风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="法律风险综合指数"
+                      label="法律风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="操作风险综合指数"
+                      label="操作风险"
+                      width="100">
+                  </el-table-column>
+                    <el-table-column
+                    prop="综合风险等级"
+                    label="综合风险等级"
+                    width="100">
+                  </el-table-column>
+                </el-table>
+
+
+              </div>
+            </el-card>
+          </el-tab-pane>
+        </el-tabs>
+
+
+          <!-- 4、说明card -->
+          <el-card style='height: 950px; margin: 10px 0px 2px 0px;background-color: rgba(200, 200, 200, 0.812);'>
+            <span v-html="info" ></span>
+          </el-card>
+
+  </div>
+</template>
+
+<script>
+import quterComponent from "@/components/quterComponent";
+import http from '../utils/request'
+import VueContextMenu from 'vue-contextmenu'
+import Vue from "vue";
+Vue.use(VueContextMenu)
+export default {
+  components:{
+    quterComponent
+  },
+  data () {
+    return {
+      // 跳转数据
+      isContextMenuVisible: false,
+      contextMenuTop: 0,
+      contextMenuLeft: 0,
+      currentRowId: null,
+
+      options_industry: [{  label: '房地产业', options:[{'value': '房地产业', 'label': '房地产业'}]},
+        { label: '信息传输、软件和信息技术服务业', options:[{'value': '软件和信息技术服务业', 'label': '软件和信息技术服务业'}, {'value': '互联网和相关服务', 'label': '互联网和相关服务'}, {'value': '电信、广播电视和卫星传输服务', 'label': '电信、广播电视和卫星传输服务'}]},
+        {  label: '水利、环境和公共设施管理业', options:[{'value': '生态保护和环境治理业', 'label': '生态保护和环境治理业'}, {'value': '公共设施管理业', 'label': '公共设施管理业'}]},
+        {  label: '制造业', options:[{'value': '铁路、船舶、航空航天和其他运输设备制造业', 'label': '铁路、船舶、航空航天和其他运输设备制造业'}, {'value': '非金属矿物制品业', 'label': '非金属矿物制品业'}, {'value': '计算机、通信和其他电子设备制造业', 'label': '计算机、通信和其他电子设备制造业'}, {'value': '汽车制造业', 'label': '汽车制造业'}, {'value': '金属制品业', 'label': '金属制品业'}, {'value': '农副食品加工业', 'label': '农副食品加工业'}, {'value': '电气机械和器材制造业', 'label': '电气机械和器材制造业'}, {'value': '石油加工、炼焦和核燃料加工业', 'label': '石油加工、炼焦和核燃料加工业'}, {'value': '有色金属冶炼和压延加工业', 'label': '有色金属冶炼和压延加工业'}, {'value': '医药制造业', 'label': '医药制造业'}, {'value': '专用设备制造业', 'label': '专用设备制造业'}, {'value': '化学纤维制造业', 'label': '化学纤维制造业'}, {'value': '通用设备制造业', 'label': '通用设备制造业'}, {'value': '化学原料及化学制品制造业', 'label': '化学原料及化学制品制造业'}, {'value': '造纸及纸制品业', 'label': '造纸及纸制品业'}, {'value': '橡胶和塑料制品业', 'label': '橡胶和塑料制品业'}, {'value': '酒、饮料和精制茶制造业', 'label': '酒、饮料和精制茶制造业'}, {'value': '其他制造业', 'label': '其他制造业'}, {'value': '纺织业', 'label': '纺织业'}, {'value': '家具制造业', 'label': '家具制造业'}, {'value': '印刷和记录媒介复制业', 'label': '印刷和记录媒介复制业'}, {'value': '黑色金属冶炼和压延加工业', 'label': '黑色金属冶炼和压延加工业'}, {'value': '食品制造业', 'label': '食品制造业'}, {'value': '废弃资源综合利用业', 'label': '废弃资源综合利用业'}, {'value': '木材加工及木、竹、藤、棕、草制品业', 'label': '木材加工及木、竹、藤、棕、草制品业'}, {'value': '纺织服装、服饰业', 'label': '纺织服装、服饰业'}, {'value': '仪器仪表制造业', 'label': '仪器仪表制造业'}, {'value': '文教、工美、体育和娱乐用品制造业', 'label': '文教、工美、体育和娱乐用品制造业'}, {'value': '皮革、毛皮、羽毛及其制品和制鞋业', 'label': '皮革、毛皮、羽毛及其制品和制鞋业'}]},
+        {  label: '综合', options:[{'value': '综合', 'label': '综合'}]},
+        {  label: '建筑业', options:[{'value': '土木工程建筑业', 'label': '土木工程建筑业'}, {'value': '房屋建筑业', 'label': '房屋建筑业'}, {'value': '建筑装饰和其他建筑业', 'label': '建筑装饰和其他建筑业'}, {'value': '建筑安装业', 'label': '建筑安装业'}]}   ,
+        {  label: '批发和零售业', options:[ {'value': '批发业', 'label': '批发业'}, {'value': '零售业', 'label': '零售业'}]},
+        {  label: '电力、热力、燃气及水生产和供应业', options:[{'value': '电力、热力生产和供应业', 'label': '电力、热力生产和供应业'}, {'value': '燃气生产和供应业', 'label': '燃气生产和供应业'}, {'value': '水的生产和供应业', 'label': '水的生产和供应业'}]},
+        {  label: '租赁和商务服务业', options:[{'value': '商务服务业', 'label': '商务服务业'},{'value': '租赁业', 'label': '租赁业'}]},
+
+        {  label: '交通运输、仓储和邮政业', options:[{'value': '道路运输业', 'label': '道路运输业'}, {'value': '航空运输业', 'label': '航空运输业'}, {'value': '水上运输业', 'label': '水上运输业'}, {'value': '铁路运输业', 'label': '铁路运输业'}, {'value': '邮政业', 'label': '邮政业'}, {'value': '仓储业', 'label': '仓储业'}, {'value': '装卸搬运和运输代理业', 'label': '装卸搬运和运输代理业'}]},
+        {  label: '卫生和社会工作', options:[{'value': '卫生', 'label': '卫生'}]},
+        {  label: '文化、体育和娱乐业', options:[{'value': '广播、电视、电影和影视录音制作业', 'label': '广播、电视、电影和影视录音制作业'}, {'value': '新闻和出版业', 'label': '新闻和出版业'}, {'value': '文化艺术业', 'label': '文化艺术业'}, {'value': '体育', 'label': '体育'}]},
+        {  label: '采矿业', options:[{'value': '有色金属矿采选业', 'label': '有色金属矿采选业'}, {'value': '煤炭开采和洗选业', 'label': '煤炭开采和洗选业'}, {'value': '黑色金属矿采选业', 'label': '黑色金属矿采选业'}, {'value': '石油和天然气开采业', 'label': '石油和天然气开采业'}, {'value': '开采辅助活动', 'label': '开采辅助活动'}, {'value': '非金属矿采选业', 'label': '非金属矿采选业'}]},
+        {  label: '住宿和餐饮业', options:[{'value': '住宿业', 'label': '住宿业'}, {'value': '餐饮业', 'label': '餐饮业'}]},
+        {  label: '科学研究和技术服务业', options:[{'value': '科技推广和应用服务业', 'label': '科技推广和应用服务业'}, {'value': '专业技术服务业', 'label': '专业技术服务业'}, {'value': '研究和试验发展', 'label': '研究和试验发展'}]},
+        {  label: '教育', options:[ {'value': '教育', 'label': '教育'}]},
+        {  label: '农、林、牧、渔业', options:[ {'value': '林业', 'label': '林业'}, {'value': '农、林、牧、渔服务业', 'label': '农、林、牧、渔服务业'}, {'value': '畜牧业', 'label': '畜牧业'}, {'value': '渔业', 'label': '渔业'}, {'value': '农业', 'label': '农业'}]} ,
+        {  label: '居民服务、修理和其他服务业', options:[ {'value': '机动车、电子产品和日用产品修理业'}]}
+          ],
+       // 表单-个体风险分析
+      formInline: {
+
+        industry:'',
+        quarter_year:'',
+      },
+      // 个体风险分析表格
+      tableData: [
+    // {
+    //   name:'秦农商行',
+    //   },
+    //   {
+    //   name:'华夏商行',
+    //   },
+      ],
+      tableDataFuture:[],
+      tableDataBond:[],
+      // 解释说明
+      info:"指标说明：<br/>一、风险水平<br/>1.杠杆用来评价企业的风险，一定要结合收入的变动、业务的变动，光看杠杆大小是没有意义的，杠杆只是将这种变动放大，或者向上放大，或者向下放大。<br/>2.具体指标有：<br/>1）财务杠杆：由于债务融资产生的固定利息费用的存在，使得息税前利润的变动引起每股收益产生更大变动程度的现象。财务杠杆越大，负债带来的利息抵税作用也越大，同时财务风险也会提高。<br/>2）经营杠杆：由于存在固定性经营成本，销售收入的较小变动会引起息税前利润较大的变动的现象。经营杠杆率越高，利润变动越剧烈，企业的经营风险越大。<br/>3）综合杠杆：综合杠杆，是经营杠杆和财务杠杆结合在一起共同发挥的连锁作用，可以用于衡量销售量的变动对普通股每股收益变动的影响程度。<br/>二、流动性风险<br/>1.流动性风险是指由于资金筹措不力，现金流动不畅，发生停滞、断流等，不能偿还到期债务形成的风险。<br/>2.具体指标有：<br/>1）流动比率：用来衡量企业流动资产在短期债务到期以前，可以变为现金用于偿还负债的能力。流动比率越高，说明企业资产的变现能力越强，流动性风险越低。<br/>2）速动比率：是衡量企业流动资产中可以立即变现用于偿还流动负债的能力。速动比率越高，流动性风险越低。<br/>3）应收账款周转天数(天)：应收账款周转天数表示在一个会计年度内，应收账款从发生到收回周转一次的平均天数（平均收款期）。应收账款周转天数越短，流动性风险越低。<br/>4）流动风险综合指数：即对上述3个指标进行指标合并，所获得的综合指标，流动风险综合指数越大，该公司遭受流动风险的可能性越小。<br/>三、市场风险<br/>1.市场风险是指未来市场价格(利率、汇率、股票价格和商品价格)的不确定性对企业实现其既定目标的不利影响。(对于一般上市公司市场风险 主要体现在股价的收益率上)<br/>2.具体指标有：<br/>1）风险价值(VaR)：在一定概率水平（置信度）下，某一金融资产或证券组合价值在未来特定时期内的最大可能损失。风险价值越大，该公司遭受市场风险的可能性越小。<br/>四、经营风险<br/>1.经营风险是由于生产经营变动或市场环境改变导致企业未来的经营性现金流量发生变化，从而影响企业的市场价值的可能性。<br/>2.具体指标有：<br/>1）资产收益率标准差：资产收益率是衡量银行盈利能力的一个指标，资产收益率的标准差则表示收益的波动性，可以用其衡量经营风险。资产收益率标准差越大，说明收益的波动性越大，即该公司的经营风险的可能性越大。<br/>五、信用风险<br/>1.信用风险是借款人因各种原因未能及时、足额偿还债务或银行贷款而违约的可能性。发生违约时，债权人或银行必将因为未能得到预期的收益而承担财务上的损失。<br/>2.具体指标有：<br/>1）资产负债率：反映在总资产中有多大比例是通过借债来筹资的。资产负债率越大，信用风险越大。<br/>2）资产报酬率：资产报酬率越高，表明企业投入产出的水平越好，企业的资产运营越有效。资产报酬率越高，该公司遭受信用风险的可能性越小。<br/>3）信用风险综合指数：即对上述2个指标进行指标合并，所获得的综合指标，信用风险综合指数越大，该公司遭受信用风险的可能性越小。<br/>六、资产负债风险<br/>1.资产负债风险是指当负债所取得的经营收益不足以抵偿负债的资金成本时所产生的财务风险。<br/>2.具体指标有：<br/>1）资产负债率：如果资产负债比率达到100%或超过100%，说明公司已经没有净资产或资不抵债。因此，资产负债率越大，该公司遭受资产负债风险的可能性越大。<br/>七、获现风险<br/>1.获现风险是企业利用各种资源获取现金出现问题的可能性。<br/>2.具体指标有：<br/>1）销售现金比率：反映每元销售得到的净现金流入量。销售现金比率越大，获现风险越小。<br/>2）每股营业现金流量：反映每股经营所得到的净现金。每股营业现金流量越大，获现风险越小。<br/>3）全部资产现金回收率：说明企业资产产生现金的能力。全部资产现金回收率越大，获现风险越小。<br/>4）获现风险综合指数：即对上述3个指标进行指标合并，所获得的综合指标，获现风险综合指数越大，该公司遭受获现风险的可能性越小。"
+
+
+    }
+  },
+  mounted(){
+
+  },
+  methods:{
+    currentRow(option){
+      this.$router.push({ name: 'diffus', params: { 'name':this.currentRowId ,'type':option ,'date':this.formInline.quarter_year} });
+      this.$store.commit('selectMenu',{name:'diffus',label:'风险传导'})
+    },
+    handleRowContextMenu(row, column, event){
+      // 保存当前行的 ID
+      this.currentRowId = row.name;
+      console.log(this.currentRowId)
+      // // 获取右键菜单的位置
+      //
+      // this.contextMenuTop = event.clientX+'px'
+      // this.contextMenuLeft = event.clientY+'px'
+      // console.log(this.contextMenuTop)
+      // event.preventDefault(); // 阻止默认的右键菜单弹出
+      // // 显示右键菜单
+      // this.isContextMenuVisible = true;
+      //
+      //
+      // // 点击其他地方隐藏右键菜单
+      // document.addEventListener("click", this.hideContextMenu);
+
+    },
+
+
+
+      // part2的提交
+      onSubmit(market) {
+    console.log("个体风险分析")
+    http.get(
+            "/risk/risk_individual/",
+            {params:{
+                industry: this.formInline.industry,//行业
+                market: market,//省or市场
+                date:this.formInline.quarter_year,
+    }}).then(response => {
+        this.tableData= response.data.data
+        console.log(response)
+        console.log(response.data)
+      }).catch((error)=>{
+      this.$message.warning('暂无数据，请重新选择')
+    })
+  },
+  },
+}
+</script>
+
+<style lang='less' scoped>
+
+//.context-menu {
+//  position: absolute;
+//  background-color: #fff;
+//  border: 1px solid #ccc;
+//  padding: 5px;
+//}
+
+ .form{//产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:10px; 
+    // height: 40px;
+    padding-left: 20px;
+
+   }
+   .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+
+   // 调整表头间隔、设置表头下方边框颜色
+   .table{
+  // 和选项框隔开
+  // margin:10px;
+  font-size: 12px;
+  padding: 0px 5px 2px 5px;//返回表格添加间隙 上 右
+
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 1px 1px 1px;
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0;
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #110101;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+}
+
+</style>
diff --git a/src_old/views/事件分析.vue b/src_old/views/事件分析.vue
new file mode 100644
index 0000000..5515756
--- /dev/null
+++ b/src_old/views/事件分析.vue
@@ -0,0 +1,1005 @@
+<!-- 11.6合并版 -->
+<template>
+  <div>
+    <div class="form">
+                                                        <!-- inline="true"表单域在一行 -->
+          <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+            <el-form-item label="公司名称">
+              <el-input  v-model="formInline1.company" placeholder="全称或简称" size="mini"></el-input>
+<!--              搜索联想-->
+<!--              <el-autocomplete-->
+<!--                  class="inline-input"-->
+<!--                  v-model="formInline1.company"-->
+<!--                  :fetch-suggestions="querySearch"-->
+<!--                  placeholder="公司名称"-->
+<!--                  size="mini"-->
+<!--              ></el-autocomplete>-->
+            </el-form-item>
+
+            <el-form-item label="事件类型">
+              <el-select   v-model="formInline1.event_type" placeholder="事件类型：" size="mini">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="开始时间">
+              <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="结束时间">
+              <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+            </el-form-item>
+          </el-form>
+    </div>
+
+    <div class="one">
+      <el-card class="card" style='height: 1000px;' :body-style={padding:0}> 
+       <!-- height:400px -->
+       <!-- 1、上标 -->
+        <span class="superscript" style="width: 20px; height: 40px;">事件分析</span>
+        <!-- 2、返回数据（图表） -->
+        <div  class="content">
+          <el-empty description="" v-if="noNews"></el-empty>
+          <el-table class='table' :data="tableData" :fit='true' :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+              border
+              height="900"
+                    style="width: 100%"
+              v-if="!noNews"
+              :row-style="{height:'28px'}"
+              :cell-style="{padding:'0px'}"
+              header-row-class-name="active_header"
+              header-cell-class-name="active_header"
+              cell-class-name="content_center">
+
+                <el-table-column v-for="(val, key) in tableLabel" :prop="key"  :label="val"
+                                 :width="widthDict(key)"
+                                 v-show="tableData.length!==0" />
+
+                <!-- <el-table-column v-for='(val,key) in tableLabel' :prop="key" :label="val" :width=calculateColumnWidth(val) />插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- :min-width="calculateColumnWidth(key)"可以省略展示较多的文字内容 -->
+
+                <el-table-column
+                    prop="scale"
+                    label="操作">
+                    <template slot-scope="scope">
+                      <span class="text" v-on:click="detail(scope.row)">查看详情</span>
+                    </template>
+                </el-table-column>
+        </el-table>
+        </div> 
+      </el-card>
+
+      <!-- 详情页 -->
+      <div>
+          <!-- 详细信息弹窗，默认关闭 -->
+          <el-dialog 
+            :visible.sync="detailsdialog"  
+            @open="open()"
+            width="90%">
+            <!-- 详情页part1 -->
+            <el-card class="card" :body-style={padding:0}>
+               <!-- 1-上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">事件详情</span>
+                <!-- 1-表 -->
+              <el-table class='detail_table1' :data="detailData_table1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                border
+                height="300px"
+                :default-expand-all="true"     
+                :row-style="{height:'28px'}"
+                :cell-style="{padding:'0px'}"
+                header-row-class-name="active_header"
+                header-cell-class-name="active_header"
+                cell-class-name="content_center">
+                
+                <el-table-column v-for='(val,key) in detailLabel_table' :prop="key" :label="val" :min-width="calculateColumnWidth(key)" /><!--插槽里面没有东西就可以用单标签  -->
+              </el-table>
+<!--              没显示正文-->
+              <div style="height: 100% ;margin: 20px;">
+                <h4 style="margin-bottom: 5px;">事件正文：</h4>
+                <span style="display:block;text-indent:2em;line-height: 25px; ">{{this.detail_content}}</span> <!-- 首行缩进 -->
+              </div>
+            </el-card >
+
+            <!-- 详情页part2 -->
+            <el-card class="card" :body-style={padding:0}>
+               <!-- 2-上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">事件热度分析</span>
+                <!-- 2-表单 -->
+                <div class="form">
+                                                        <!-- inline="true"表单域在一行 -->
+                  <el-form :inline="true"  :model="formInline2" class="demo-form-inline">
+                    <el-form-item label="关联公司名：">
+                      <el-select v-model="formInline2.detail_company" placeholder="选择公司：" size="mini">
+                        <el-option v-for="item in option_detail_company" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                      </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="间隔时间：">
+                      <el-select v-model="formInline2.detail_time" placeholder="选择时间：" size="mini">
+                        <el-option v-for="item in option_detail_time" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                      </el-select>
+                    </el-form-item>
+
+                    <el-form-item>
+                      <el-button class="grayish_btn" @click="detail_onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+                    </el-form-item>
+                  </el-form>
+              </div>
+              <!-- 2-图 -->
+              <div class="flex-charts">
+                <div ref="echarts_2" style="height:300px;width:1000px; border: 1px solid #e0e0e0;margin:20px"></div>
+
+                <div ref="echarts_3" style="height:300px;width:1000px; border: 1px solid #e0e0e0;margin:20px"></div>
+              </div>
+              <!-- <span>
+                公司1xx事件一天时间内，在中国证券报的7时刻达到热度峰值，当前的热度状态为下降，预测未来一小时内的热度趋势为下降
+              </span> -->
+
+             
+            </el-card >
+
+              <!-- 详情页part3 -->
+              <el-card class="card" :body-style={padding:0}>
+               <!-- 3-上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">其他关联事件</span>
+                <!-- 3-表单 -->
+                <div class="form">
+                                                        <!-- inline="true"表单域在一行 -->
+                  <el-form :inline="true"  :model="formInline3" class="demo-form-inline">
+                    <el-form-item label="选择事件对象：">
+                      <el-select v-model="formInline3.detail_company" placeholder="选择事件对象：" size="mini">
+                        <el-option v-for="item in option_detail_company" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                      </el-select>
+                    </el-form-item>
+
+<!--                    <el-form-item label="事件相关：">-->
+<!--                      <el-checkbox v-model="formInline3.related_event">本公司相关其他事件</el-checkbox>-->
+<!--                      &lt;!&ndash; <el-radio v-model="radio" label="2">备选项</el-radio> &ndash;&gt;-->
+<!--                    </el-form-item>-->
+
+                    <el-form-item label="选择时间：">
+                      <el-select v-model="formInline3.detail_time" placeholder="选择时间：" size="mini">
+                        <el-option v-for="item in option_detail_time" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                      </el-select>
+                    </el-form-item>
+
+                    <el-form-item>
+                      <el-button class="grayish_btn" @click="detail_onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
+                    </el-form-item>
+                  </el-form>
+              </div>
+              
+              <!-- 3-表 -->
+              <el-table class='detail_table2' :data="detailData_table2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                border
+                height="600"   
+                :row-style="{height:'28px'}"
+                :cell-style="{padding:'0px'}"
+                header-row-class-name="active_header"
+                header-cell-class-name="active_header"
+                cell-class-name="content_center">
+                
+                <el-table-column v-for='(val,key) in detailLabel_table' :prop="key" :label="val" :min-width="calculateColumnWidth(key)" /><!--插槽里面没有东西就可以用单标签  -->
+              </el-table>
+            </el-card >
+
+              <!-- 详情页part4 -->
+              <el-card class="card" :body-style={padding:0}>
+               <!-- 4-上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">总体情感分析</span>
+                <!-- 2-表单 -->
+                <div class="form">
+                                                        <!-- inline="true"表单域在一行 -->
+                  <el-form :inline="true"  :model="formInline4" class="demo-form-inline">
+                    <el-form-item label="选择事件对象：">
+                      <el-select v-model="formInline4.detail_company" placeholder="选择事件对象：" size="mini">
+                        <el-option v-for="item in option_detail_company" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                      </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="选择时间：">
+                      <el-select v-model="formInline4.detail_time" placeholder="选择时间：" size="mini">
+                        <el-option v-for="item in option_detail_time" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                      </el-select>
+                    </el-form-item>
+
+                    <el-form-item>
+                      <el-button class="grayish_btn" @click="detail_onSubmit3" icon="el-icon-search" size="mini">查询</el-button>
+                    </el-form-item>
+                  </el-form>
+              </div>
+              <!-- 2-图 -->
+              <div class="flex-charts">
+                <div ref="echarts_4" style="height:300px;width:2000px; border: 1px solid #e0e0e0;margin:20px"></div>
+
+              </div>
+
+
+             
+            </el-card >
+
+
+
+        </el-dialog>
+      </div>  <!-- 详情页结束 -->
+    </div> <!-- 上一个板块结束 -->
+  </div>
+
+
+
+
+  
+</template>
+
+<script >
+import qs from 'qs'
+// import { getData } from "../api";
+import * as echarts from "echarts"
+// import pagination from '@/components/pagination.vue'
+import http from '../utils/request'
+import {Loading} from "element-ui";
+export default {
+  name:"eventBase",
+  components:{
+
+  },
+  data() {
+    return {
+// 【接收数据】
+      sentiment:[],
+      clout:[],
+      targetId:'',
+      formInline1: {
+          company: '',
+          event_type: '',
+          start_date:'',
+          end_date:'',
+        },
+        // 详情页(3个)
+        formInline2: {
+          detail_company:'',
+          detail_time:'',
+        },
+        formInline3: {
+          detail_company:'',
+          related_event: false,// Checkbox 多选框单独使用可以表示两种状态之间的切换,初始化为关闭
+          detail_time:'',
+        
+        },
+        formInline4: {
+          detail_company:'',
+          detail_time:'',
+        },
+
+
+// 【选择框】
+      options: [
+        {
+          value: '',
+          label: '全部'
+        },
+          {
+        value: '股权增持',
+        label: '股权增持'
+      }, {
+        value: '股东减持',
+        label: '股东减持'
+      }, {
+        value: '股权质押',
+        label: '股权质押'
+      }, {
+        value: '其他',
+        label: '其他'
+      },
+    {
+      value: '重大财产损失',
+          label: '重大财产损失'
+    },
+        {
+          value: '重大安全事故',
+          label: '重大安全事故'
+        },
+        {
+          value: '股权冻结',
+          label: '股权冻结'
+        },
+        {
+          value: '高层死亡',
+          label: '高层死亡'
+        },
+        {
+          value: '破产清算',
+          label: '破产清算'
+        },
+        {
+          value: '重大对外赔付',
+          label: '重大对外赔付'
+        },
+
+    ],//issue_type只有  增持事件 减持事件 股权质押  
+    
+      option_detail_company: [{
+        value: '公司1',
+        label: '公司1'
+      }, {
+        value: '公司2',
+        label: '公司2'
+      }],
+      option_detail_time: [{
+        value: '一天内',
+        label: '一天内'
+      }, {
+        value: '近三天',
+        label: '近三天'
+      }
+      , {
+        value: '一周内',
+        label: '一周内'
+      }
+      , {
+        value: '一个月内',
+        label: '一个月内'
+      }
+      , {
+        value: '一年内',
+        label: '一年内'
+      }
+    ],
+      option_prediction: [
+      {
+          value: '一小时内',
+          label: '一小时内'
+        }, {
+          value: '三小时内',
+          label: '三小时内'
+        }
+        , {
+          value: '六小时内',
+          label: '六小时内'
+        }
+        , 
+        {
+          value: '一天内',
+          label: '一天内'
+        }, {
+          value: '近三天',
+          label: '近三天'
+        }
+        , {
+          value: '一周内',
+          label: '一周内'
+        }
+        , {
+          value: '一个月内',
+          label: '一个月内'
+        }
+        , {
+          value: '一年内',
+          label: '一年内'
+        }
+      ],
+
+
+
+
+// 【表格】
+      tableLabel: {
+                  order: '事件id',
+                  type: '事件类型',
+                  objects: '涉及对象',
+                  title: '事件标题',
+                  abstract:'事件摘要',
+                  keyword:'事件关键词',
+                  publish_time:'发布时间',
+                  event_heat:'事件热度',
+                  risk_grade:'风险等级',
+
+        },
+  
+      tableData: [
+        { order: 1,
+          type: '',
+          objects: [
+          ],
+          title: '',
+          abstract:'',
+          keyword:'',
+          publish_time:'',
+          event_heat:'',
+          risk_grade:'',}
+      ],
+      noNews:true,
+
+
+
+// 【详情页】
+    detailsdialog: false,// 详情页是否打开的判断标签
+    // 表格
+      detailLabel_table: {
+          objects: '涉及对象',
+          title: '事件标题',
+          abstract:'事件摘要',
+          keyword:'事件关键词',
+          // content:'事件正文',
+          site_name:'发布渠道',
+          // sentiment:'情感倾向',
+          url:'报导链接',
+          publish_time:'发布时间',
+          potiential_risks:'潜在风险',
+          // risk_grade:'风险等级',
+
+      },
+
+      detailData_table1: [
+      { order: 735, risk_grade: '积极' },
+        { order: 735, risk_grade: '消极' }],                  
+
+
+
+      detailData_table2: [],
+
+      // 详情页事件内容
+      detail_content:'作者：周立 张昕迎8月31日晚间8点左右，中国人民银行、国家金融监督管理总局联合发布《关于降低存量首套住房贷款利率有关事项的通知》。据有关负责人介绍，符合条件的存量首套住房贷款是指，2023年8月31日前金融机构已发放，已签订合同但未发放的，以及借款人实际住房情况符合所在城市首套住房标准的存量住房商业性个人住房贷款。对于符合条件的存量住房贷款，自2023年9月25日起，可由借款人主动向承贷银行提出申请，也鼓励银行以发布公告、批量办理等方式，为借款人提供更为便利的服务。调整方式上，既可以变更合同约定的住房贷款利率加点幅度，也可以由银行新发放贷款置换存量贷款。具体利率调整幅度由借贷双方协商确定，但调整后的利率，不能低于原贷款发放时所在城市的首套住房贷款利率政策下限。新发放贷款只能用于偿还存量贷款，仍纳入商业性个人住房贷款管理。“恨不得明天就是9月25日”对于“高位站岗”买房者来说，这是不亚于过年的好消息。8月31日晚间，广州市民唐轩（化名）告诉时代财经，其在2020年下半年购置首套房，当时贷款利率是LPR+30BP，而当时了解到最低的是LPR+15BP。面对高BP，唐轩看到无数人通过其他途径置换房贷时总会忍不住心动，但又觉得风险太大，于是静静等待存量降的消息。看到今天政策发布的那一刻，除了兴奋，唐轩内心还有一丝担忧，“恨不得明天就是9月25日，我现在就担心到时候要排队。”家里有首套房贷款的张威（化名）也关注到了这个重磅消息，连夜微信询问银行个贷经理，当前是否有资格办理相关业务，对方表示，“目前无法回答，我们银行还没出政策呢。”但对于2021年成为“站岗者”的刘颖（化名）来说，兴奋程度并不如前几位买房者，“这是件好事，但估计比较难申请，协商也会很麻烦，而且肯定是要排队的。”刘颖告诉时代财经，自己是LPR+20BP，广州2021年首套房最低利率应该就是LPR，“申请的话，可能最多低0.2BP，估计能降0.1BP就不错了。”不过，也有买房者研究完政策后，感觉自己没有“捡到便宜”。“当时我是LPR+35BP，也是当年北京执行的首套房的最低利率，现在执行的是LPR+55BP。”不论如何，近年来我国房地产市场供求关系发生了重大变化，借款人和银行对于有序调整优化资产负债均有诉求。存量住房贷款利率的下降，对借款人来说，可节约利息支出，有利于扩大消费和投资。对银行来说，可有效减少提前还贷现象，减轻对银行利息收入的影响。同时，还可压缩违规使用经营贷、消费贷置换存量住房贷款的空间，减少风险隐患。事实上，对于存量房贷利率调整，近期国内多家银行早有预热。8月28日，招商银行召开上半年业绩会，该行行长助理彭家文表示，央行对于存量房贷利率调整从鼓励和支持变为了指导，所以存量房贷利率下调是大概率事件，招行已经制定了相应的预案，但因为有较多因素需要兼顾，所以尚未确定最终方案。8月31日，邮储银行零售业务总监梁世栋也回应称，重定价对包括该行在内的整个银行业个人住房贷款会有一定影响，但利率下调之后，对提前还款会有一定抵补作用，同时对提振市场信心也有一定作用。工商银行、农业银行均在8月31日晚公告称，正在积极依法有序开展存量首套个人住房贷款利率调整的准备工作。有效缓解提前还贷问题若存量房贷利率调整在9月25日起全面落实，会给银行带来什么影响？8月31日晚间，开源证券银行首席分析师刘呈祥在接受时',
+   
+
+      // 图数据
+      // 查看详情-card2-事件热度分析
+      circularData1: [
+                  { value: 735, name: '积极' },
+                  { value: 735, name: '消极' }
+                  // { value: 580, name: 'Email' },
+                  // { value: 484, name: 'Union Ads' },
+                  // { value: 300, name: 'Video Ads' }
+        ],
+      circularData2: [
+                { value: 4445, name: '积极' },
+                { value: 735, name: '消极' }
+                // { value: 580, name: 'Email' },
+                // { value: 484, name: 'Union Ads' },
+                // { value: 300, name: 'Video Ads' }
+      ],
+
+
+  }
+}, 
+    mounted(){
+    // if ( JSON.stringify(sessionStorage.getItem('eventData')) !== "{}")
+    //   this.tableData=JSON.parse(sessionStorage.getItem('eventData'))
+    //
+    //   let target=JSON.parse(sessionStorage.getItem('target'))
+    //   if (target.length!==0) {
+    //     // console.log(1)
+    //     console.log(target)
+    //     this.formInline1.company = target[0]
+    //     this.formInline1.event_type = target[1]
+    //     this.formInline1.start_date = target[2]
+    //     this.formInline1.end_date = target[3]
+    //   }
+
+          
+    },
+
+    
+
+  methods:{
+    // 调整表格列宽
+    calculateColumnWidth(prop) {
+      console.log(prop)
+      const text = String(this.tableData[0][prop]); // 使用第一行的数据作为示例
+      const calculatedWidth = text.length;
+      console.log(calculatedWidth)
+      // console.log('console.log(calculatedWidth):',calculatedWidth)
+      if(calculatedWidth>10 && calculatedWidth<=50){
+        const baseWidth= 20 + calculatedWidth * 0.9
+        return `${baseWidth}px`;
+      }
+      if(calculatedWidth<=10){
+        const baseWidth= 20
+        return `${baseWidth}px`;
+      }
+      else{
+        const baseWidth= 20 + calculatedWidth * 0.5
+        return `${baseWidth}px`;
+      }
+    },
+
+    widthDict(key){
+      let dic={'title':200,
+              'type':80,
+        'objects': 150,
+
+        'abstract':800,
+        'keyword':100,
+        // content:'事件正文',
+        // site_name:'发布渠道',
+        // sentiment:'情感倾向',
+        // url:'报导链接',
+        publish_time:'发布时间',
+        potiential_risks:'潜在风险',
+
+
+      }
+return `${dic[key]}px`;
+
+    },
+  
+    //新闻联想搜索
+    querySearch(queryString, cb) {
+      // console.log(queryString)
+      // console.log(cb)
+      http.get(
+          "/search/search_news/?name=?"+queryString,
+
+          // paramsSerializer: params => {
+          //   return qs.stringify(params, { indices: false })
+      ).then(response => {
+        // console.log(response.data)
+        // console.log(cb)
+        let result=response.data
+        let re=[]
+        for (let i of result){
+          re.push({"value":i})
+        }
+        cb(re)
+      })},
+    // 1、表
+    onSubmit1(){//事件分析
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
+        http.get(
+                "/event2/event_analyse/",
+                {params:{
+                    name: this.formInline1.company,
+                    event_type:this.formInline1.event_type,
+                    start:this.formInline1.start_date,
+                    end:this.formInline1.end_date,
+                    need:0
+        }}).then(response => {
+          if(response.data.data.length!==0)
+          { this.tableData = response.data.data
+              this.noNews=false}
+          else {
+            this.tableData= [
+              { order: 1,
+                type: '',
+                objects: [
+
+                ],
+                title: '',
+                abstract:'',
+                keyword:'',
+                publish_time:'',
+                event_heat:'',
+                risk_grade:'',}
+            ]
+          this.noNews=true}
+          // sessionStorage.removeItem('eventData')
+          // sessionStorage.setItem('eventData',JSON.stringify(this.tableData))
+          // sessionStorage.removeItem('target')
+          // sessionStorage.setItem('target',JSON.stringify([this.formInline1.company,this.formInline1.event_type,this.formInline1.start_date,this.formInline1.end_date]))
+          // console.log(this.tableData)
+          //关系图
+          //基于准备好的dom，初始化echarts实例
+          // var ROOT_PATH = 'https://echarts.apache.org/examples';
+         
+      loadingInstance.close()
+          }).finally(()=>loadingInstance.close())
+       },
+
+
+// 3、查看详情-card1（表）表格点击查看详情
+    detail(row){
+      let tmp=[]
+      this.option_detail_company.length=0
+      // console.log(row.order)//返回银行id
+      this.targetId=row.order
+      for (let i in this.tableData)
+        if (this.targetId===this.tableData[i].order)
+          tmp=this.tableData[i].objects
+      for (let i in tmp)
+      this.option_detail_company.push({value:tmp[i],label:tmp[i]})
+      // console.log(this.option_detail_company)
+      //这个地方需要连一个新接口
+      //提供弹窗的数据
+      this.detailsdialog = true//打开弹窗
+      http.get(
+                "/event2/event_detail/",
+                {params:{
+                    event_id: row.order,//新闻id 是吗？
+
+        }}).then(response => {
+            this.detailData_table1 = Array(response.data.data[this.targetId])
+            this.detail_content=response.data.data[this.targetId].content[0]
+            console.log(response.data.data)
+            // console.log(response.data)
+        http.get(
+            "/event2/event_clout_analyse/",//修改接口名称
+            {params:{
+                company: this.formInline1.company,
+                // delta:this.formInline2.detail_time,
+                event_id:this.targetId
+              }}).then(response => {
+          this.clout = response.data.data
+          // console.log(this.clout)
+          // 详情页的，面积图
+          const echarts2 = echarts.init(this.$refs.echarts_2)
+          const option_2={
+            // 右上角存图
+            toolbox: {
+              feature: {
+                saveAsImage: {}
+              }
+            },
+            title: {
+              text: '事件热度分析'
+            },
+            tooltip: {
+              trigger: 'axis',
+              axisPointer: {
+                type: 'cross',
+                label: {
+                  backgroundColor: '#6a7985'
+                }
+              }
+            },
+            // legend: {
+            //   data: ['渠道1', '渠道2', '渠道3']
+            // },
+            grid: {
+              left: '3%',
+              right: '4%',
+              bottom: '3%',
+              containLabel: true
+            },
+            xAxis: [
+              {
+                type: 'category',
+                boundaryGap: false,
+                data: this.clout.date,
+                name: '日'
+              }
+            ],
+            yAxis: [
+              {
+                type: 'value'
+              }
+            ],
+            series: [
+              {
+                name: '渠道1',
+                type: 'line',
+                stack: 'Total',
+                areaStyle: {},
+                emphasis: {
+                  focus: 'series'
+                },
+                data: this.clout.value
+              }
+
+            ]
+          }
+          echarts2.setOption(option_2)
+        })
+          })
+
+      
+    },
+
+// 4、5-查看详情-card2（面积图、环形图）（缺）
+    detail_onSubmit1(){//详情页表单查询-事件热度分析(待修改)
+          // })
+      if (this.sentiment.length!==0)
+        this.sentiment.length=0
+        //5、查看详情-card2（环形图）
+        http.get(
+                "/event2/sentiment_analyse/",
+                {params:{//修改接口
+                    delta: this.formInline2.detail_time,//选择时间：间隔时间
+                    other_name:this.formInline2.detail_company,//关联公司名
+                    detail:0
+        }}).then(response => {
+          if (JSON.stringify(response.data.data)==='{}')
+            alert('暂无数据')
+          else
+            // console.log(Array(response.data.data))
+            for(let i in response.data.data)
+            { if (i==='FAVOR')
+              this.sentiment.push({name:'赞成',value:response.data.data[i]})
+              if (i==='NONE')
+            this.sentiment.push({name:'中立',value:response.data.data[i]})
+              if (i==='AGAINST')
+            this.sentiment.push({name:'反对',value:response.data.data[i]})}
+            // console.log(this.sentiment)
+            this.initEcharts1()
+          })
+       },
+
+
+
+ 
+// 6、查看详情-card3（表）
+       detail_onSubmit2(){//详情页表单查询-其他关联事件
+        // console.log('其他关联事件-表格')
+        http.get(
+                "/event2/other_events/",
+                {params:{
+                    delta: this.formInline3.detail_time,
+                    event_id:this.targetId,
+                    other_name:this.formInline3.detail_company,
+        }}).then(response => {
+            // console.log(response.data)
+          if (response.data.data.length===0)
+            alert('暂无数据')
+          else
+            this.detailData_table2=response.data.data
+          })
+       },
+// 7、8 查看详情-card4（曲线图、环形图）
+       detail_onSubmit3(){//详情页表单查询-总体情感分析(待修改)
+        console.log('总体情感分析-曲线图')
+        http.get(
+            "/event2/sentiment_analyse/",
+                {params:{
+                    other_name: this.formInline4.detail_company,
+                    delta:this.formInline4.detail_time,
+                    detail:1
+        }}).then(response => {
+          if (response.data.data.time.length === 0)
+            alert('暂无数据')
+          else {
+            let time = response.data.data.time
+            let favor = response.data.data.favor
+            let none = response.data.data.none
+            let against = response.data.data.against
+            const echarts4 = echarts.init(this.$refs.echarts_4)
+            const option_4 =
+
+                {
+                  title: {
+                    text: '总体情感趋势',
+                    x: 'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+
+                  },
+                  // tooltip: {
+                  //   trigger: 'axis'
+                  // },
+                  legend: {
+                    data: [
+                      {name: '积极', itemStyle: {opacity: 0}},
+                      {name: '中性', itemStyle: {opacity: 0}},
+                      {name: '消极', itemStyle: {opacity: 0}}
+                    ],
+
+                    x: 'right',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    y: "top",
+                    padding: 40,
+                  },
+                  grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true//用来防止数值过大而超出视图
+                  },
+                  toolbox: {
+                    feature: {
+                      saveAsImage: {}
+                    }
+                  },
+                  xAxis: {
+                    data: time,
+                    axisLabel: {//横坐标倾斜
+                      interval: 0,
+                      rotate: 40
+                    }
+                  },
+                  yAxis: {
+                    type: 'value',
+
+
+                  },
+                  series: [
+                    {
+                      name: '积极',
+                      type: 'line',
+                      data: favor,
+                      showSymbol: false,//每个点不用圆圈突出显示
+                      smooth: true,//平滑折线图
+                      // 折线样式
+                      lineStyle: {
+                        color: '#6ac96e'//红色
+                      },
+                    },
+                    {
+                      name: '中性',
+                      type: 'line',
+                      data: none,
+                      showSymbol: false,//每个点不用圆圈突出显示
+                      smooth: true,//平滑折线图
+                      // 折线样式
+                      lineStyle: {
+                        color: '#ffe96c'//蓝色'
+                      },
+                    },
+                    {
+                      name: '消极',
+                      type: 'line',
+                      data: against,
+                      showSymbol: false,//每个点不用圆圈突出显示
+                      smooth: true,//平滑折线图
+                      // 折线样式
+                      lineStyle: {
+                        color: '#f6572e'//蓝色'
+                      },
+                    },
+
+                  ]
+                }
+            echarts4.setOption(option_4)
+          }
+        }
+        )
+        console.log('总体情感分析-环形图')
+        // http.get(
+        //         "/",
+        //         {params:{
+        //             com_name: this.formInline.detail_company,
+        //             issue_type:this.formInline.detail_time,
+
+        // }}).then(response => {
+        //     this.tableData = response.data
+        //     console.log(response)
+        //     console.log(response.data)
+
+        //   })
+       },
+
+       
+
+
+
+       initEcharts1() {
+
+          // 详情页的环形图
+          const echarts3 = echarts.init(this.$refs.echarts_3)
+          const option_3={
+            // 右上角存图
+            toolbox: {
+              feature: {
+                saveAsImage: {}
+              }
+            },
+            tooltip: {
+              // trigger: 'item'
+            },
+            legend: {
+              top: '5%',
+              left: 'center'
+            },
+            series: [
+              {
+                // name: 'Access From',
+                type: 'pie',
+                radius: ['40%', '70%'],
+                avoidLabelOverlap: false,
+                itemStyle: {
+                  borderRadius: 10,
+                  borderColor: '#fff',
+                  borderWidth: 2
+                },
+                label: {
+                  show: false,
+                  position: 'center'
+                },
+                emphasis: {
+                  label: {
+                    show: true,
+                    fontSize: 40,
+                    fontWeight: 'bold'
+                  }
+                },
+                labelLine: {
+                  show: false
+                },
+                data: this.sentiment
+              }
+            ]
+          }
+          echarts3.setOption(option_3)
+
+      },
+      
+
+      open(){
+        this.$nextTick(() => {
+        //  执行echarts方法
+          this.initEcharts1()
+          // this.initEcharts2()
+        })
+      },
+
+  }
+}
+
+</script>
+
+<style lang="less" scoped>
+// 调整表头间隔、设置表头下方边框颜色
+.table{
+margin-top: 15px;
+margin-right: 0px;
+margin-left: 5px;
+padding: 0px;
+
+}
+.detail_table1{
+  margin-top: 15px;
+  margin-left: 10px;
+
+}
+.detail_table2{
+  margin-top: 0px;
+  margin-left: 10px;
+
+
+  
+}
+/deep/ .el-table {
+  width: 98.5% !important;
+}
+/deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+      border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
+      padding: 0px 0 !important;
+      min-width: 0 !important;
+    }
+    .el-table .el-table__cell {
+      padding: 12px 0; 
+      min-width: 0;
+    }
+    /deep/ .active_header{//表头
+      color: #333333;
+      font-size: 13px;
+      text-align: center !important;
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      font-size: 13px;
+    }
+
+
+.one{
+  .form{//产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:5px; 
+    margin-bottom: 0px;
+    // height: 40px;
+    padding-left: 20px;
+
+  }
+  .content{
+    margin-top: 20px;
+    padding: 0px 20px 2px 20px;//返回表格添加间隙 上 右
+    font-size: 12px;
+
+
+    
+    }
+  .text{
+    color:rgba(2, 167, 240, 0.729411764705882);
+  }
+.card{
+  margin-bottom: 10px;
+}
+  }
+  .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+
+</style>
diff --git a/src_old/views/事件图谱.vue b/src_old/views/事件图谱.vue
new file mode 100644
index 0000000..10b499c
--- /dev/null
+++ b/src_old/views/事件图谱.vue
@@ -0,0 +1,931 @@
+<!-- 事件分析-事件图谱 -->
+<!-- 11.6合并版 -->
+<template>
+  <div>
+    <!-- 关系图/知识图谱：笛卡尔坐标系上的 Graph -->
+    <div class="two">
+      
+      <div class="form">
+                                                        <!-- inline="true"表单域在一行 -->
+          <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+            <el-form-item label="公司名称">
+              <el-input  v-model="formInline1.company" placeholder="公司名称：" size="mini"></el-input>
+<!--              搜索联想-->
+<!--              <el-autocomplete-->
+<!--                  class="inline-input"-->
+<!--                  v-model="formInline1.company"-->
+<!--                  :fetch-suggestions="querySearch"-->
+<!--                  placeholder="公司名称"-->
+<!--                  size="mini"-->
+<!--              ></el-autocomplete>-->
+            </el-form-item>
+
+            <el-form-item label="事件类型">
+              <el-select   v-model="formInline1.event_type" placeholder="事件类型：" size="mini">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="开始时间">
+              <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="结束时间">
+              <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+            </el-form-item>
+<!--            <el-form-item>-->
+<!--              <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>-->
+<!--            </el-form-item>-->
+          </el-form>
+        </div>
+      <el-card :body-style={padding:0} style='height: 510px;'>
+         <!-- 1、上标 -->
+         <span class="superscript" style="width: 20px; height: 40px;">事件图谱</span>
+         <div>
+          <div ref="echarts_1" style="height: 500px"></div>
+         </div>
+        <!-- 2、产品搜索栏 -->
+      </el-card>
+    </div>
+    <el-dialog  :visible.sync="dialogVisible" width="100%" >
+      <!-- 详细信息 -->
+      <el-card style=" height:100%;margin-bottom:10px ; " :body-style={padding:0} >
+        <div style="display:flex;">
+          <el-divider direction="vertical" class="sublabel"></el-divider>
+          <span class='title'>事件详情</span>
+        </div>
+    <el-table :data="detailData"
+              style="width: 100%"
+              :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+              border
+              :row-style="{height:'28px'}"
+              :cell-style="{padding:'0px'}"
+              header-row-class-name="active_header"
+              header-cell-class-name="active_header"
+              cell-class-name="content_center"
+    >
+      <el-table-column
+          width="500"
+          prop="事件名称"
+          label="事件名称">
+      </el-table-column>
+      <el-table-column
+          width="300"
+          prop="法人代表"
+          label="法人代表">
+      </el-table-column>
+      <el-table-column
+          width="200"
+          prop="事件日期"
+          label="事件日期">
+      </el-table-column>
+      <el-table-column
+          width="50"
+          prop="分歧度"
+          label="分歧度">
+      </el-table-column>
+      <el-table-column
+          width="80"
+          prop="等级"
+          label="风险等级">
+      </el-table-column>
+    </el-table>
+
+      </el-card>
+    </el-dialog>
+
+  </div>
+
+
+
+
+  
+</template>
+
+<script >
+import qs from 'qs'
+// import { getData } from "../api";
+import * as echarts from "echarts"
+import http from '../utils/request'
+import {Loading} from "element-ui";
+export default {
+  components:{
+
+  },
+  data() {
+    return {
+      dialogVisible:false,
+      detailData:[],
+      tableData:[],
+// 【接收数据】
+      sentiment:[],
+      clout:[],
+      targetId:'',
+      formInline1: {
+          company: '',
+          event_type: '',
+          start_date:'',
+          end_date:'',
+        },
+        
+
+
+// 【选择框】
+      options:[
+        {
+          value: '',
+          label: '全部'
+        },
+          {
+        value: '股权增持',
+        label: '股权增持'
+      }, {
+        value: '股东减持',
+        label: '股东减持'
+      }, {
+        value: '股权质押',
+        label: '股权质押'
+      }, {
+        value: '其他',
+        label: '其他'
+      },
+        {
+          value: '重大财产损失',
+          label: '重大财产损失'
+        },
+        {
+          value: '重大安全事故',
+          label: '重大安全事故'
+        },
+        {
+          value: '股权冻结',
+          label: '股权冻结'
+        },
+        {
+          value: '高层死亡',
+          label: '高层死亡'
+        },
+        {
+          value: '破产清算',
+          label: '破产清算'
+        },
+        {
+          value: '重大对外赔付',
+          label: '重大对外赔付'
+        },
+
+      ]
+      ,
+    
+      option_detail_company: [{
+        value: '公司1',
+        label: '公司1'
+      }, {
+        value: '公司2',
+        label: '公司2'
+      }],
+      option_detail_time: [{
+        value: '一天内',
+        label: '一天内'
+      }, {
+        value: '近三天',
+        label: '近三天'
+      }
+      , {
+        value: '一周内',
+        label: '一周内'
+      }
+      , {
+        value: '一个月内',
+        label: '一个月内'
+      }
+      , {
+        value: '一年内',
+        label: '一年内'
+      }
+    ],
+      option_prediction: [
+      {
+          value: '一小时内',
+          label: '一小时内'
+        }, {
+          value: '三小时内',
+          label: '三小时内'
+        }
+        , {
+          value: '六小时内',
+          label: '六小时内'
+        }
+        , 
+        {
+          value: '一天内',
+          label: '一天内'
+        }, {
+          value: '近三天',
+          label: '近三天'
+        }
+        , {
+          value: '一周内',
+          label: '一周内'
+        }
+        , {
+          value: '一个月内',
+          label: '一个月内'
+        }
+        , {
+          value: '一年内',
+          label: '一年内'
+        }
+      ],
+
+
+
+
+
+// 【知识图谱】
+      old_data:[
+           {事件标题:"XX股东XX时间增持XX股票事件",
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/1/4",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"积极",
+            事件热度:"30",
+            时间:"2022/1/4",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"消极",
+            事件热度:"45",
+            时间:"2022/1/4",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"消极",
+            事件热度:"30",
+            时间:"2022/1/4",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"中性",
+            事件热度:"30",
+            时间:"2022/1/4",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"积极",
+            事件热度:"30",
+            时间:"2022/3/8",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/3/10",},
+             { 事件标题: "XX股东XX时间增持XX股票事件",
+            情感倾向:"消极",
+            事件热度:"45",
+            时间:"2022/3/10",},
+             { 事件标题: 8,
+            情感倾向:"中性",
+            事件热度:"30",
+            时间:"2022/3/10",},
+             { 事件标题: 9,
+            情感倾向:"消极",
+            事件热度:"30",
+            时间:"2022/3/14",},
+             { 事件标题: 10,
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/3/14",},
+             { 事件标题:11,
+            情感倾向:"积极",
+            事件热度:"45",
+            时间:"2022/3/18",},
+             { 事件标题: 12,
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/3/18",},
+             { 事件标题: 13,
+            情感倾向:"积极",
+            事件热度:"45",
+            时间:"2022/3/18",},
+             { 事件标题: 14,
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/3/18",},
+             { 事件标题: 15,
+            情感倾向:"消极",
+            事件热度:"45",
+            时间:"2022/3/30",},
+             { 事件标题: 16,
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/3/26",},
+             { 事件标题: 17,
+            情感倾向:"消极",
+            事件热度:"30",
+            时间:"2022/3/26",},
+             { 事件标题: 18,
+            情感倾向:"中性",
+            事件热度:"45",
+            时间:"2022/3/26",},],
+
+
+
+      // 图数据
+      // 查看详情-card2-事件热度分析
+      circularData1: [
+                  { value: 735, name: '积极' },
+                  { value: 735, name: '消极' }
+                  // { value: 580, name: 'Email' },
+                  // { value: 484, name: 'Union Ads' },
+                  // { value: 300, name: 'Video Ads' }
+        ],
+      circularData2: [
+                { value: 4445, name: '积极' },
+                { value: 735, name: '消极' }
+                // { value: 580, name: 'Email' },
+                // { value: 484, name: 'Union Ads' },
+                // { value: 300, name: 'Video Ads' }
+      ],
+
+
+  }
+},
+
+    mounted(){
+          //关系图
+          //基于准备好的dom，初始化echarts实例
+          // var ROOT_PATH = 'https://echarts.apache.org/examples';
+          // console.log(this.old_data.情感倾向)
+          const echarts1 = echarts.init(this.$refs.echarts_1)
+          var legends = ['消极', '中性', '积极'];
+          var colors=[ "#D9001B","#009DD9","#90F204"]
+          const markLineList=[] //垂直线
+          const timeList=[]//存不重复的时间
+          const nor_time=[]//存所有的时间
+          const nodeid=[]
+          const new_data=[]
+
+
+
+          var count=0
+          for(let {时间: time} of this.old_data){
+              nor_time.push(time)
+          // 返回值等于-1 说明数组timeList中不存在time,则存入
+              if(timeList.indexOf(time)==-1 ){
+                timeList.push(time)
+                nodeid.push(count)
+                markLineList.push({xAxis: count})
+                count=count+1
+              }
+
+          }
+
+          timeList.sort(function (a, b) {
+            return a - b; //a - b < 0: 代表后一个比前一个大，就是升序
+          })
+
+          const x_y=[]
+          // console.log(timeList.length)
+          for (var i = 0; i < timeList.length; i++) {
+
+            var x=i
+            var y=1//初始为1让坐标轴暴露更明显
+            for (var item of nor_time){
+              if(item===timeList[i] ){
+                y+=1
+                x_y.push([x,y])
+            }
+          }
+
+
+
+          // console.log(x_y)
+          }
+
+          for (var i = 0; i < this.old_data.length; i++) {
+              var index=legends.indexOf(this.old_data[i].情感倾向)
+
+              new_data.push({
+                  id:i,
+                  name:this.old_data[i].事件标题,
+          // label注释掉，tooltip才会正常显示
+          //         label: {
+          //
+          //               show: true,
+          //               position: "bottom",
+          //                 fontSize: 13,
+          //             width:2,
+          //             overflow:'break',
+          //           formatter:'{b}:',
+          //           // data:legends[index],
+          //           // color: "rgb(0, 0, 0)",
+          //         },
+                  // color: colors[index],
+                  symbolSize:this.old_data[i].事件热度,
+                  // symbolSize:20,
+                  value: x_y[i],
+                  itemStyle: {
+                      borderColor: '#fff',
+                      borderWidth: 2,
+                      shadowBlur: 2,
+                      shadowColor: '#999999',
+                      color: colors[index],
+                  },
+                tooltip:{show:true,
+                  trigger:'axis',
+                  triggeron:'mousemove',
+                  formatter:'event'
+                },
+
+          })}
+
+
+          // console.log(new_data)
+          const option = {
+            // 右上角存图
+              toolbox: {
+                feature: {
+                  saveAsImage: {}
+                }
+              },
+              // title: {
+              //     text: '笛卡尔坐标系上的 Graph'
+              // },
+              xAxis:[ {
+                  // type : 'category',
+                  // boundaryGap : false,
+                  data : timeList
+              }
+              ],
+              yAxis: {
+                  show:false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+                  // type : 'category',//注释后，数轴0开始，不然点会遮住坐标轴
+                  // boundaryGap : false,//位于点还是位于区域
+                  // data: ['a','b','c','d']
+              },
+              legend: {
+                data: ['消极', '中性', '积极'],  //图例的数据
+                top: "15%",   //图例的位置
+                icon:"circle",  //图例的形状
+                x: 'right',        //图例在右侧
+                orient: 'vertical',  //图例纵向排布   horizontal为横向排布
+                textStyle: {         //图例字体的颜色
+                    color: "#ffffff"
+                }},
+              series: [
+                {
+                  type: 'graph',
+                  // layout: 'none',
+                  coordinateSystem: 'cartesian2d',
+
+                  // 垂直线
+                  markLine: {
+                      symbol: ['none', 'none'],
+                      label: { show: false },
+                      data: markLineList,
+                      lineStyle: {//标注线样式
+                          type: 'dashed',//虚线
+                          color: '#999999',//标注线颜色
+                    },
+                  },
+                  // label: {
+                  //
+                  //   show: true,
+                  //   position: "bottom",
+                  //   fontSize: 13,
+                  //   width:5,
+                  //   overflow:'truncate',
+                  //   formatter:'{b}:',
+                  //   // data:legends[index],
+                  //   // color: "rgb(0, 0, 0)",
+                  // },
+                  // 边两段的类型和大小
+                  edgeSymbol: ['circle', 'circle'],
+                  edgeSymbolSize: [4,4],
+                  //
+                  data:new_data,
+                  //显示节点备注
+                  // itemStyle : {
+                  //   normal: {label : {show: true}},
+                  //   textStyle: {
+                  //   color: '#000'
+                  // }
+                  //   },
+                //  边
+                  links: [
+                      {source: 0, target: 5},
+                      {source: 5, target: 6},
+                      {source: 1, target: 7},
+                      {source: 2, target: 8},
+                      {source: 3, target: 13},
+                      {source: 8, target: 9},
+                      ],
+                  lineStyle: {//关系线样式
+                      type: 'solid',//实线
+                      color: "rgb(0, 0, 0,80%)",//标注线颜色
+                      width: "2",
+                  },
+                }]
+          }
+          echarts1.setOption(option)
+      console.log(echarts1.getOption())
+          echarts1.on('click',function (params){
+            // console.log(params.name)
+      })
+      // this.tableData=JSON.parse(sessionStorage.getItem('eventData'))
+      if (this.tableData.length!==0)
+        this.changeChart()
+      // let target=JSON.parse(sessionStorage.getItem('target'))
+      // this.formInline1.company=target[0]
+      // this.formInline1.event_type=target[1]
+      // this.formInline1.start_date=target[2]
+      // this.formInline1.end_date=target[3]
+    },
+
+    
+
+  methods:{
+
+    test(){
+      console.log('test')
+    },
+    // 调整表格列宽
+    calculateColumnWidth(prop) {
+      const text = String(this.tableData[0][prop]); // 使用第一行的数据作为示例
+      const calculatedWidth = text.length;
+      console.log('console.log(calculatedWidth):',calculatedWidth)
+      if(calculatedWidth>10 && calculatedWidth<=50){
+        const baseWidth= 20 + calculatedWidth * 0.3
+        return `${baseWidth}px`;
+      }
+      if(calculatedWidth>50){
+        const baseWidth= 20 + calculatedWidth * 0.5
+        return `${baseWidth}px`;
+      }
+      else{
+        return "20px";
+      }
+    },
+  
+    //新闻联想搜索
+    querySearch(queryString, cb) {
+      // console.log(queryString)
+      // console.log(cb)
+      http.get(
+          "/search/search_news/?name=?"+queryString,
+
+          // paramsSerializer: params => {
+          //   return qs.stringify(params, { indices: false })
+      ).then(response => {
+        // console.log(response.data)
+        // console.log(cb)
+        let result=response.data
+        let re=[]
+        for (let i of result){
+          re.push({"value":i})
+        }
+        cb(re)
+      })},
+    // 1、表
+    onSubmit1(){//事件分析
+       this.tableData.length=0
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
+        http.get(
+                "/event2/event_analyse/",
+                {params:{
+                    name: this.formInline1.company,
+                    event_type:this.formInline1.event_type,
+                    start:this.formInline1.start_date,
+                    end:this.formInline1.end_date,
+                    need:1
+        }}).then(response => {
+            this.tableData = response.data.data.data
+          let links= response.data.data.edges
+          let intLink=[]
+          // for (let i in links){
+          //   intLink.push({source:parseInt(links[i]['source']),target:parseInt(links[i]['target'])})
+          // }
+
+
+          for (let i in links){
+            intLink.push({source:this.tableData.find(function(obj) {
+              return obj.order === parseInt(links[i]['source'])}).title,
+            target:this.tableData.find(function(obj) {
+              return obj.order === parseInt(links[i]['target'])}).title
+
+            })
+
+          }
+          console.log(intLink)
+            this.changeChart(intLink)
+          })
+      loadingInstance.close()
+       },
+    changeChart(links){
+      // console.log(this.tableData)
+      //关系图
+      //基于准备好的dom，初始化echarts实例
+      // var ROOT_PATH = 'https://echarts.apache.org/examples';
+      const echarts1 = echarts.init(this.$refs.echarts_1)
+      const markLineList=[] //垂直线
+      const timeList=[]//存不重复的时间
+      const nor_time=[]//存所有的时间
+      const nodeid=[]
+      const new_data=[]
+      var count=0
+      for(let {publish_time: time} of this.tableData){
+        // console.log(time)
+        nor_time.push(time)
+        // 返回值等于-1 说明数组timeList中不存在time,则存入
+        if(timeList.indexOf(time)===-1 ){
+          timeList.push(time)
+          nodeid.push(count)
+          markLineList.push({xAxis: count})
+          count=count+1
+        }
+
+      }
+      // console.log(timeList)
+      timeList.sort(function (a, b) {
+        if( a.split(' ')[0]<b.split(' ')[0]  || a.split(' ')[0]===b.split(' ')[0] && a.split(' ')[1]<b.split(' ')[1])
+          return -1; //a - b < 0: 代表后一个比前一个大，就是升序
+        else if ( a.split(' ')[0]>b.split(' ')[0] || a.split(' ')[0]===b.split(' ')[0] && a.split(' ')[1]>b.split(' ')[1])
+          return 1
+        else return 0
+      })
+      // console.log(timeList)
+      let tmp=[]
+      // 仅显示部分新闻
+      if (this.tableData.length>20) {
+        var p = 20 / this.tableData.length
+        this.$notify.info({
+          title: '提示',
+          message: '事件图谱仅显示部分数据'
+        });
+        for (let i = 0; i < this.tableData.length; i++) {
+          // let index=legends.indexOf(this.old_data[i].情感倾向)
+          let y = Math.floor(Math.random() * 10 ) + 1 //随机散列开
+          if (Math.random() < p) {
+            let x = timeList.indexOf(this.tableData[i].publish_time)
+            while (tmp.find(value => value === [x, y]))
+              y=Math.floor(Math.random() * 10 ) + 1 //随机散列开
+            tmp.push([x, y])
+            // console.log(x, y)
+            new_data.push({
+              id: parseInt(this.tableData[i].order),
+              name: this.tableData[i].title, //根据name连边
+              // name: this.tableData[i].title,
+              // label: {
+              //   normal: {
+              //     show: true,
+              //     position: "bottom",
+              //     textStyle: {
+              //       fontSize: 8
+              //     },},
+              //
+              //   // data:legends[index],
+              //   color: "rgb(0, 0, 0)",
+              // },
+              // color: colors[index],
+              symbolSize: this.tableData[i].clout * 30,
+              // symbolSize:20,
+              value: [x, y],
+              itemStyle: {
+                borderColor: '#fff',
+                borderWidth: 2,
+                shadowBlur: 2,
+                shadowColor: '#999999',
+                color: 'green',
+
+              },
+              tooltip: {
+                show: true,
+                trigger: 'axis',
+                triggeron: 'mousemove',
+                formatter: 'event'
+              },
+
+            })
+          }
+        }
+      }
+      else {
+        for (let i = 0; i < this.tableData.length; i++) {
+          // let index=legends.indexOf(this.old_data[i].情感倾向)
+          let y = Math.floor(Math.random() * 10) + 1
+          let x = timeList.indexOf(this.tableData[i].publish_time)
+          while (tmp.find(value => value === [x, y]))
+            y=Math.floor(Math.random() * 10) + 1
+          tmp.push([x, y])
+          console.log(x, y)
+          new_data.push({
+            id: parseInt(this.tableData[i].order),
+            name: this.tableData[i].title, //根据name连边
+            // label: {
+            //   normal: {
+            //     show: true,
+            //     position: "bottom",
+            //     textStyle: {
+            //       fontSize: 8
+            //     },},
+            //
+            //   // data:legends[index],
+            //   color: "rgb(0, 0, 0)",
+            // },
+            // color: colors[index],
+            symbolSize: this.tableData[i].clout * 30,
+            // symbolSize:20,
+            value: [x, y],
+            itemStyle: {
+              borderColor: '#fff',
+              borderWidth: 2,
+              shadowBlur: 2,
+              shadowColor: '#999999',
+              color: 'green',
+
+            },
+            tooltip: {
+              show: true,
+              trigger: 'axis',
+              triggeron: 'mousemove',
+              formatter: 'event'
+            },
+          })
+        }
+      }
+      const option = {
+        // 右上角存图
+        toolbox: {
+          feature: {
+            saveAsImage: {}
+          }
+        },
+        // title: {
+        //     text: '笛卡尔坐标系上的 Graph'
+        // },
+        xAxis:[ {
+          // type : 'category',
+          // boundaryGap : false,
+          data : timeList
+        }
+        ],
+        yAxis: {
+          show:false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+          // type : 'category',//注释后，数轴0开始，不然点会遮住坐标轴
+          // boundaryGap : false,//位于点还是位于区域
+          // data: ['a','b','c','d']
+        },
+        legend: {
+          data: ['消极', '中性', '积极'],  //图例的数据
+          top: "15%",   //图例的位置
+          icon:"circle",  //图例的形状
+          x: 'right',        //图例在右侧
+          orient: 'vertical',  //图例纵向排布   horizontal为横向排布
+          textStyle: {         //图例字体的颜色
+            color: "#ffffff"
+          }},
+        // legend: {
+        //       normal: {
+        //         data: ['消极', '中性', '积极'],
+        //         show: true,}
+        //     },
+        series: [
+          {
+            type: 'graph',
+            // layout: 'none',
+            coordinateSystem: 'cartesian2d',
+
+            // 垂直线
+            markLine: {
+              symbol: ['none', 'none'],
+              label: { show: false },
+              data: markLineList,
+              lineStyle: {//标注线样式
+
+                type: 'dashed',//虚线
+                color: '#999999',//标注线颜色
+
+              },
+            },
+
+            // 边两段的类型和大小
+            edgeSymbol: ['circle', 'circle'],
+            edgeSymbolSize: [4,4],
+            //
+            data:new_data,
+
+            //显示节点备注
+            // itemStyle : {
+            //   normal: {label : {show: true}},
+            //   textStyle: {
+            //     color: '#000'
+            //   }
+            // },
+            //  边
+            links: links,
+
+                // [
+            //   {source: 0, target: 5},
+            //   {source: 5, target: 6},
+            //   {source: 1, target: 7},
+            //   {source: 2, target: 8},
+            //   {source: 3, target: 13},
+            //   {source: 8, target: 9},
+            // ],
+            lineStyle: {//关系线样式
+              type: 'solid',//实线
+              color: "rgb(0, 0, 0,80%)",//标注线颜色
+              width: "2",
+            }
+          }]
+      }
+      echarts1.setOption(option)
+      console.log(echarts1.getOption())
+      // 点击事件弹窗
+      echarts1.on('click',(parms)=>{
+        console.log(parms)
+        http.get('/event2/event_graph/',
+            {params:{
+              id:parms.data.id
+              }}
+        ).then((res)=>{
+          console.log(res.data)
+          this.detailData.length=0
+          this.detailData.push(res.data)
+          this.dialogVisible=true
+        })
+      })
+    },
+
+
+       open(){
+        this.$nextTick(() => {
+        //  执行echarts方法
+        //   this.initEcharts1()
+          this.initEcharts2()
+        })
+      },
+
+  }
+}
+
+</script>
+
+<style lang="less" scoped>
+// 调整表头间隔、设置表头下方边框颜色
+/deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+      border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
+      padding: 0px 0 !important;
+      min-width: 0 !important;
+    }
+    .el-table .el-table__cell {
+      padding: 12px 0; 
+      min-width: 0;
+    }
+    /deep/ .active_header{//表头
+      color: #333333;
+      font-size: 13px;
+      text-align: center !important;
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      font-size: 13px;
+    }
+
+
+.one{
+  .form{//产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:5px; 
+    // height: 40px;
+    padding-left: 20px;
+
+  }
+  .content{
+    padding: 0px 20px 2px 20px;//返回表格添加间隙 上 右
+    font-size: 12px;
+
+
+    
+    }
+  .text{
+    color:rgba(2, 167, 240, 0.729411764705882);
+  }
+
+  }
+.two{
+  margin-top:10px; 
+}
+// 详情页
+.flex-charts{//并列图
+    // margin-top:20px; 
+    display:flex;
+    justify-content:space-between;
+    // padding:20px;
+}
+.grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+</style>
diff --git a/src_old/views/健康指数.vue b/src_old/views/健康指数.vue
new file mode 100644
index 0000000..aa4d641
--- /dev/null
+++ b/src_old/views/健康指数.vue
@@ -0,0 +1,1029 @@
+<template>
+    <div>
+      <!-- 卡片化的标签页 -->
+      <el-tabs type="card">
+        <!-- 1、健康指数 -->
+            <el-tab-pane label="健康指数">
+                <el-card style=" height:80px; border: 1px solid #7f7f7f;" :body-style={padding:0} >         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+                  <div class="card_label" style=" height: 28px;width: 100%; text-align: center;">健康指数</div>
+
+                  <div class="form">                                                         <!-- inline="true"表单域在一行 -->
+                    <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+                      <el-form-item label="公司名称" style=" margin-right: 40px;">
+                          <el-autocomplete
+                              class="inline-input"
+                              v-model="formInline1.company"
+                              :fetch-suggestions="querySearch"
+                              placeholder="公司名称"
+                              size="mini"
+                          ></el-autocomplete>
+
+                        <el-input  v-model="formInline1.company" placeholder="请输入公司名称" size="mini"></el-input>
+                      </el-form-item>
+
+                      <el-form-item label="日期 " style=" margin-right: 40px;">
+                        <quter-component v-model="formInline1.quarter_year" placeholder="选择季度" />
+                      </el-form-item>
+                      <el-form-item>
+                        <el-button class="grayish_btn" @click="onSubmit1"  size="mini" style=" margin-right: 20px;">查询</el-button>
+                      </el-form-item>
+                      <el-form-item>
+                        <el-button class="grayish_btn" @click="onSubmit2"  size="mini">清空</el-button>
+                      </el-form-item>
+                    </el-form>
+                  </div>
+                </el-card>
+
+              <!-- 第一栏"健康指数"的表格 -->
+            <div class="table">
+              <el-table :data="tableData_1" :header-cell-style="{background: 'rgba(242, 242, 242)'}"
+                      border  
+                      height="250" 
+                      :row-style="{height:'28px'}"
+                      :cell-style="{padding:'3px'}"
+                      header-row-class-name="active_header"
+                      header-cell-class-name="active_header"
+                      cell-class-name="content_center"
+                      style="width: 100%; border: 1px solid #7f7f7f;">          <!-- style="width: 40%"               height="215"  -->
+                    <el-table-column v-for='(val,key) in tableLabel_short' :prop="key" :label="val" /><!--插槽里面没有东西就可以用单标签  -->
+                    <el-table-column
+                            prop="scale"
+                            label="操作">
+                            <template slot-scope="scope">
+                              <el-button type="primary" v-on:click="onSubmit3"  size="mini" >雷达图</el-button>
+                              <el-button type="primary" @click="onSubmit4"  size="mini" >加入对比</el-button>
+                              <el-button type="primary" @click="onSubmit5"  size="mini" >加入管理</el-button>
+                            </template>
+                    </el-table-column>
+              </el-table>
+              </div>
+                <!--  第一栏"健康指数"的弹窗-单雷达图 -->
+                <el-dialog  :visible.sync="detailsdialog"  width="80%" @open="open()">
+                <el-card style=";">
+                  <el-card style=" height:740px; border: 1px solid #7f7f7f;" :body-style={padding:0} >         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+                      <div class="card_label" style=" height: 24px;width: 100%;text-align: left; padding-left:10px">雷达图对比</div>
+
+                      <!-- 搜索框 -->
+<!--                      <div class="form">                                                         &lt;!&ndash; inline="true"表单域在一行 &ndash;&gt;-->
+<!--                        <el-form :inline="true"  :model="formInline_1" class="demo-form-inline">-->
+<!--                          <el-form-item label="公司:" style=" margin-right: 40px;">-->
+<!--                            <el-autocomplete-->
+<!--                                class="inline-input"-->
+<!--                                v-model="formInline2.company1"-->
+<!--                                :fetch-suggestions="querySearch"-->
+<!--                                placeholder="公司名称"-->
+<!--                                size="mini"-->
+<!--                            ></el-autocomplete>-->
+<!--                          </el-form-item>-->
+<!--                          <el-form-item>-->
+<!--                            <el-button   class="grayish_btn" @click="onSubmit6"  size="mini" style=" margin-right: 20px;">查询</el-button>-->
+<!--                          </el-form-item>-->
+<!--                          -->
+<!--                        </el-form>-->
+<!--                      </div>-->
+                  <!-- 雷达图 -->
+                  <div class='radar' >
+<!--                        <div class="quarter_change">-->
+<!--                          <i class="el-icon-arrow-left"  border style="font-size: 50px;color:#7f7f7f"></i>-->
+<!--                          <div>上一季度</div>-->
+<!--                        </div>-->
+                      
+                        <div ref="echarts_3" style="height:500px;width:500px"></div>
+                    </div>
+
+                    <!-- "雷达图"表格 -->
+                    <div class="table"  style="padding:20px">
+                      <el-table :data="tableData_1"
+                              border  
+                              :row-style="{height:'28px'}"
+                              :cell-style="{padding:'3px'}"
+                              header-row-class-name="active_header"
+                              header-cell-class-name="active_header"
+                              cell-class-name="content_center"
+                              style="width: 100%; border: 1px solid #7f7f7f">          <!-- style="width: 40%"               height="215"  -->
+                              <el-table-column prop="name" label="名称"></el-table-column>
+                            <el-table-column v-for='(val,key) in tableLabel_long' :prop="key" :label="val"><!--插槽里面没有东西就可以用单标签  -->
+                          </el-table-column>
+                      </el-table>
+                    </div>
+
+                  </el-card>
+                  <!-- 历史健康指数 -->
+                  <el-card style=" height:680px; border: 1px solid #7f7f7f;" :body-style={padding:0} >         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+                      <div class="card_label" style=" height: 24px;width: 100%;text-align: left; padding-left:10px">历史健康指数</div>
+
+                      <!-- 搜索框 -->
+                      <div class="form">                                                         <!-- inline="true"表单域在一行 -->
+                        <el-form :inline="true"  :model="formInline_2" class="demo-form-inline">
+                          <el-form-item label="开始时间 " style=" margin-right: 40px;">
+                          <quter-component label="开始时间" v-model="formInline_2.start_quarter" placeholder="选择季度" />
+                          </el-form-item>
+                          <el-form-item label="结束时间 " style=" margin-right: 40px;">
+                          <quter-component label="结束时间" v-model="formInline_2.end_quarter" placeholder="选择季度" />
+                          </el-form-item>
+<!--                          <el-form-item label="起止时间 " style=" margin-right: 40px;">-->
+<!--                            <el-select   v-model="formInline_2.start_quarter" placeholder="请选择开始时间" size="mini">-->
+<!--                              <el-option v-for="item in options_quarter_year" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+<!--                            </el-select>-->
+
+<!--                            <el-select   v-model="formInline_2.end_quarter" placeholder="请选择结束时间" size="mini">-->
+<!--                              <el-option v-for="item in options_quarter_year" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+<!--                            </el-select>-->
+<!--                          </el-form-item>-->
+
+                          <el-form-item>
+                            <el-button   class="grayish_btn" @click="onSubmit7"  size="mini" style=" margin-right: 20px;">查询</el-button>
+                          </el-form-item>
+                          
+                        </el-form>
+                      </div>
+                      
+                      <!-- 折线图 -->
+                      <div class='line' >
+                      
+                      <div ref="echarts_4" style="height:500px;width:800px"></div>
+                    </div>
+
+                    
+
+                </el-card>
+              </el-card>
+        
+              </el-dialog>
+              <!-- 加入对比还不知道怎么写,跳转吗 -->
+              <!-- 加入管理,把这一行数据存入管理tab -->
+
+
+          </el-tab-pane>
+
+        <!-- 2、对比 -->
+            <el-tab-pane label="对比">
+                <!-- 2-1-雷达图对比 -->
+                <el-card style=" height:850px; border: 1px solid #7f7f7f;" :body-style={padding:0} >         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+                    <div class="card_label" style=" height: 24px;width: 100%;text-align: left; padding-left:10px">雷达图对比</div>
+
+                    <!-- 搜索框 -->
+                    <div class="form">                                                         <!-- inline="true"表单域在一行 -->
+                      <el-form :inline="true"  :model="formInline2" class="demo-form-inline">
+                        <el-form-item label="公司1:" style=" margin-right: 40px;">
+                          <el-autocomplete
+                              class="inline-input"
+                              v-model="formInline2.company1"
+                              :fetch-suggestions="querySearch"
+                              placeholder="公司名称"
+                          ></el-autocomplete>
+                        </el-form-item>
+                        <el-form-item label="公司2:" style=" margin-right: 40px;">
+                          <el-autocomplete
+                              class="inline-input"
+                              v-model="formInline2.company2"
+                              :fetch-suggestions="querySearch"
+                              placeholder="公司名称"
+                          ></el-autocomplete>
+                          <el-form-item label="时间 " style=" margin-right: 40px;margin-left: 40px;">
+                          <quter-component label="开始时间" v-model="formInline2.quarter_year" placeholder="选择季度" />
+                          </el-form-item>
+                        </el-form-item>
+                        <el-form-item>
+                          <el-button   class="grayish_btn" @click="onSubmit6"  size="mini" style=" margin-right: 20px;">查询</el-button>
+                        </el-form-item>
+                        
+                      </el-form>
+                    </div>
+                
+                    <!-- 雷达图 -->
+                    <div class='radar' >
+<!--                      <div class="quarter_change">-->
+<!--                        <i class="el-icon-arrow-left"  border style="font-size: 50px;color:#7f7f7f"></i>-->
+<!--                        <div>上一季度</div>-->
+<!--                      </div>-->
+                    
+                      <div ref="echarts_1" style="height:500px;width:500px"></div>
+                    </div>
+
+                    <!-- "对比"表格 -->
+                    <div class="table"  style="padding:20px">
+                      <el-table :data="tableData_2_1" :header-cell-style="{background: 'rgba(242, 242, 242)'}"
+                              border  
+                              :row-style="{height:'28px'}"
+                              :cell-style="{padding:'3px'}"
+                              header-row-class-name="active_header"
+                              header-cell-class-name="active_header"
+                              cell-class-name="content_center"
+                              style="width: 100%; border: 1px solid #7f7f7f">          <!-- style="width: 40%"               height="215"  -->
+                              <el-table-column prop="name" label="名称"></el-table-column>
+                            <el-table-column v-for='(val,key) in tableLabel_long' :prop="key" :label="val"><!--插槽里面没有东西就可以用单标签  -->
+                          </el-table-column>
+                      </el-table>
+              </div>
+
+                </el-card>
+                <!-- 2-2-健康指数对比 -->
+                <el-card style=" height:680px; border: 1px solid #7f7f7f;" :body-style={padding:0} >         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+                    <div class="card_label" style=" height: 24px;width: 100%;text-align: left; padding-left:10px">健康指数对比</div>
+
+                    <!-- 搜索框 -->
+                    <div class="form">                                                         <!-- inline="true"表单域在一行 -->
+                      <el-form :inline="true"  :model="formInline3" class="demo-form-inline">
+<!--                        <el-form-item label="公司1:" style=" margin-right: 40px;">-->
+<!--                          <el-input  v-model="formInline3.company1" placeholder="请输入公司名称" ></el-input>-->
+<!--                        </el-form-item>-->
+
+<!--                        <el-form-item label="公司2:" style=" margin-right: 40px;">-->
+<!--                          <el-input  v-model="formInline3.company2" placeholder="请输入公司名称" ></el-input>-->
+<!--                        </el-form-item>-->
+                        <el-form-item label="开始时间 " style=" margin-right: 40px;">
+                          <quter-component v-model="formInline3.start_quarter" placeholder="选择季度" />
+                        </el-form-item>
+                        <el-form-item label="结束时间 " style=" margin-right: 40px;">
+                          <quter-component v-model="formInline3.end_quarter" placeholder="选择季度" />
+                        </el-form-item>
+<!--                        <el-form-item label="起止时间 " style=" margin-right: 40px;">-->
+<!--                          <el-select   v-model="formInline3.start_quarter" placeholder="请选择开始时间" size="mini">-->
+<!--                            <el-option v-for="item in options_quarter_year" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+<!--                          </el-select>-->
+
+<!--                          <el-select   v-model="formInline3.end_quarter" placeholder="请选择结束时间" size="mini">-->
+<!--                            <el-option v-for="item in options_quarter_year" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+<!--                          </el-select>-->
+<!--                        </el-form-item>-->
+
+                        <el-form-item>
+                          <el-button   class="grayish_btn" @click="onSubmit10"  size="mini" style=" margin-right: 20px;">查询</el-button>
+                        </el-form-item>
+                        
+                      </el-form>
+                    </div>
+                    <!-- 折线图 -->
+                    <div class='line' >
+                      <div ref="echarts_2" style="height:500px;width:800px"></div>
+                    </div>
+
+                    
+
+                </el-card>
+                <!-- 2-3-交叉对比 -->
+                <el-card style=" height:740px; border: 1px solid #7f7f7f;" :body-style={padding:0} >         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+                    <div class="card_label" style=" height: 24px;width: 100%;text-align: left; padding-left:10px;">交叉对比</div>
+                    <el-tabs type="card" style='padding-top:10px;padding-left:10px;'>
+                    <!-- 2-3-1 行业-->
+                      <el-tab-pane label="行业">
+                        <el-card style=" height:80px; border: 1px solid #7f7f7f;" :body-style={padding:0} >
+                          <div class="card_label" style=" height: 24px;width: 100%;text-align: left; padding-left:10px;">条件查询</div>
+                          <!-- 搜索框 -->
+                          <div class="form">                                                         <!-- inline="true"表单域在一行 -->
+                            <el-form :inline="true"  :model="formInline4" class="demo-form-inline">
+                              <el-form-item label="日期 " style=" margin-right: 40px;">
+                                <quter-component v-model="formInline4.quarter_year" placeholder="选择季度" />
+                              </el-form-item>
+                                <el-form-item label="行业名称 " style=" margin-right: 40px;">
+                                  <el-select   v-model="formInline4.industry" placeholder="请选择行业名称" >
+                                    <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                                  </el-select>
+                                </el-form-item>
+                                <el-form-item>
+                                  <el-button   class="grayish_btn" @click="onSubmit8"  size="mini" style=" margin-right: 20px;">查询</el-button>
+                                </el-form-item>
+                            </el-form>
+                          </div>
+                        </el-card>
+                        <!-- "对比-交叉对比-行业"表格 -->
+                        <div class="table"  style="  padding: 20px 10px 2px 0px;"><!--返回表格添加间隙 上 右 -->
+                          <el-table :data="tableData_2_2" :header-cell-style="{background: 'rgba(242, 242, 242)'}"
+                                  border  
+                                  :row-style="{height:'28px'}"
+                                  :cell-style="{padding:'3px'}"
+                                  header-row-class-name="active_header"
+                                  header-cell-class-name="active_header"
+                                  cell-class-name="content_center"
+                                  style="width: 100%; border: 1px solid #7f7f7f">          <!-- style="width: 40%"               height="215"  -->
+                                
+                                  <el-table-column prop="name" label="名称"></el-table-column>
+                                  <el-table-column v-for='(val,key) in tableLabel_long' :prop="key" :label="val"  sortable><!--插槽里面没有东西就可以用单标签  -->
+                                  </el-table-column>
+                          </el-table>
+                        </div>
+                      </el-tab-pane>
+                    <!-- 2-3-2 地域 -->
+                      <el-tab-pane label="地域">
+                        <el-card style=" height:80px; border: 1px solid #7f7f7f;" :body-style={padding:0} >
+                          <div class="card_label" style=" height: 24px;width: 100%;text-align: left; padding-left:10px;">条件查询</div>
+                          <!-- 搜索框 -->
+                          <div class="form">                                                         <!-- inline="true"表单域在一行 -->
+                            <el-form :inline="true"  :model="formInline5" class="demo-form-inline">
+                              <el-form-item label="开始时间">
+                                <el-date-picker  v-model="formInline5.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+                              </el-form-item>
+
+                              <el-form-item label="结束时间">
+                                <el-date-picker v-model="formInline5.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+                              </el-form-item>
+
+                              <el-form-item label="省份 " style=" margin-right: 40px;">
+                                <el-select   v-model="formInline5.province" placeholder="请选择省份" size="mini">
+                                  <el-option v-for="item in options_province" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                                </el-select>
+                              </el-form-item>
+
+                              <el-form-item>
+                                <el-button   class="grayish_btn" @click="onSubmit9"  size="mini" style=" margin-right: 20px;">查询</el-button>
+                              </el-form-item>
+                              
+                            </el-form>
+                          </div>
+                        </el-card>
+                        
+                        <!-- "对比-交叉对比-地域"表格 -->
+                        <div class="table"  style="  padding: 20px 10px 2px 0px;"><!--返回表格添加间隙 上 右 -->
+                          <el-table :data="tableData_2_3" :header-cell-style="{background: 'rgba(242, 242, 242)'}"
+                                  border  
+                                  :row-style="{height:'28px'}"
+                                  :cell-style="{padding:'3px'}"
+                                  header-row-class-name="active_header"
+                                  header-cell-class-name="active_header"
+                                  cell-class-name="content_center"
+                                  style="width: 100%; border: 1px solid #7f7f7f">          <!-- style="width: 40%"               height="215"  -->
+                                
+                                  <el-table-column prop="name" label="名称"></el-table-column>
+                                  <el-table-column v-for='(val,key) in tableLabel_long' :prop="key" :label="val"  sortable><!--插槽里面没有东西就可以用单标签  -->
+                                  </el-table-column>
+                          </el-table>
+                        </div>
+                      </el-tab-pane>
+                      
+                    </el-tabs>
+                </el-card>
+            </el-tab-pane><!-- 2对比-end -->
+
+             <!-- 3、我的管理 -->
+            <el-tab-pane label="我的管理">
+            <!-- 第三栏"我的管理"的表格 -->
+            <div class="table">
+              <el-table :data="tableData_3" :header-cell-style="{background: 'rgba(242, 242, 242)'}"
+
+
+                      border  
+                      height="250" 
+                      :row-style="{height:'28px'}"
+                      :cell-style="{padding:'3px'}"
+                      header-row-class-name="active_header"
+                      header-cell-class-name="active_header"
+                      cell-class-name="content_center"
+                      style="width: 100%; border: 1px solid #7f7f7f;">          <!-- style="width: 40%"               height="215"  -->
+                    <el-table-column v-for='(val,key) in tableLabel_short' :prop="key" :label="val" /><!--插槽里面没有东西就可以用单标签  -->
+                    <el-table-column
+                            prop="scale"
+                            label="操作">
+                            <template slot-scope="scope">
+                              <el-button type="primary" v-on:@click="onSubmit3"  size="mini" >雷达图</el-button>
+                              <el-button type="primary" @click="onSubmit4"  size="mini" >加入对比</el-button>
+                              <el-button type="primary" @click="onSubmit5"  size="mini" >加入管理</el-button>
+          
+                            </template>
+                    </el-table-column>
+              </el-table>
+
+            </div>
+              
+
+          </el-tab-pane>
+
+       
+      </el-tabs>
+    </div>
+  </template>
+  
+<script>
+import quterComponent from "@/components/quterComponent";
+import * as echarts from "echarts"
+import http from '../utils/request'
+export default {
+  components:{
+    quterComponent
+},
+  data() {
+    return {
+      // 雷达图数据
+      radarData:[],
+// 雷达图弹窗
+  detailsdialog:false,
+// 【分页组件的数据】
+        total:10,
+        page_size:1,
+        currentPage:2,
+// 【整合接收数据】
+      formInline1: {
+      // 第1栏"健康指数"
+        company: '',
+        quarter_year: '',
+      },
+      formInline2: {
+      // 第2栏"对比"-"雷达图对比、健康指数共用"
+        tableData1:[],
+        tableData2:[],
+        radarData1:[],
+        radarData2:[],
+        company1: '',
+        company2: '',
+        quarter_year: '',
+      },
+      formInline3: {
+      // 第2栏"对比"-"健康指数对比"
+        company1: '',
+        company2: '',
+        start_quarter:'',
+        end_quarter:'',
+      },
+      formInline4: {
+      // 第2栏"对比"-"交叉对比"- 行业
+        quarter_year:'',
+        end_date:'',
+        industry:'',//行业独有
+    },
+    formInline5: {
+      // 第2栏"对比"-"交叉对比"-地域共用
+        start_date:'',
+        end_date:'',
+        province:'',//地域独有
+    },
+    // 健康指数点击雷达图后显示弹窗
+    formInline_1: {
+      company:'',
+    },
+    formInline_2: {
+      start_quarter:'',
+      end_quarter:'',
+    },
+// 【搜索栏】
+
+    // 第2栏"对比"-"交叉对比"搜索栏(行业)
+      options_industry: [
+        {value: "房地产业",
+        label: "房地产业"}, 
+        {value: "信息传输、软件和信息技术服务业",
+        label: "信息传输、软件和信息技术服务业"}, 
+        {value: "水利、环境和公告设施管理业",
+        label: "水利、环境和公告设施管理业"}, 
+        {value: "制造业",
+        label: "制造业"}, 
+        {value: "综合",
+        label: "综合"}, 
+        {value: "建筑业",
+        label: "建筑业"}, 
+        {value: "批发和零售业",
+        label: "批发和零售业"}, 
+        {value: "电力、热力、燃气及水生产和供应业",
+        label: "电力、热力、燃气及水生产和供应业"}, 
+        {value: "银行",
+        label: "银行"}, 
+      ],
+    // 第2栏"对比"-"交叉对比"搜索栏(地域省份)
+      options_province:[
+      {value: "北京市",
+      label: "北京市"}, 
+      {value: "山西省",
+      label: "山西省"}, 
+      {value: "河北省",
+      label: "河北省"}, 
+      {value: "河南省",
+      label: "河南省"}, 
+      {value: "山东省",
+      label: "山东省"}, 
+      {value: "安徽省",
+      label: "安徽省"}, 
+      ],
+
+// 【表格】
+// [table-label]
+tableLabel_short: {
+        name: '公司名称',
+        level: '健康等级',
+        健康指数: '健康指数',
+      },
+tableLabel_long: {
+        // name: '名称',
+      健康指数: '健康指数',
+  财务状态:'财务状态',
+  运行状态:'运行状态',
+  规模扩张:'规模扩张',
+  声誉风险:'声誉风险',
+  外部环境:'外部环境',
+  操盘模式:'操盘模式',
+      },
+// [table-data]
+      // 第1栏"健康指数"表格
+      tableData_1: [
+        // { name: '中国银行',
+        //   index: 1,
+        //   level: "中等",},
+      ],
+      // 第2栏"对比"表格
+      tableData_2_1: [
+
+      ],
+      // 第2栏"对比"-"交叉对比"表格_行业
+      tableData_2_2: [
+        { name: '中国银行',
+          index: 1,},
+
+        { name: '北京银行',
+          index: 3,},
+      ],
+      // 第2栏"对比"-"交叉对比"表格_地域
+      tableData_2_3: [
+        { name: '中国银行',
+          index: 1,},
+
+        { name: '北京银行',
+          index: 3,},
+      ],
+      // 第3栏"我的管理"
+      tableData_3: [
+      {   name: '中国银行',
+          index: 1,
+          level: "中等",},
+      ],
+      // 第1栏"健康指数"-点击“雷达图”
+      tableData_4: [
+      {   name: '中国银行',
+          index: 1,
+          level: "中等",},
+      ],
+
+
+    }
+  },
+
+  methods:{
+// 联想
+    querySearch(queryString, cb) {
+      console.log(queryString)
+      // console.log(cb)
+      http.get(
+          "/search/search_health/?keyword="+queryString,
+
+          // paramsSerializer: params => {
+          //   return qs.stringify(params, { indices: false })
+      ).then(response => {
+        // console.log(response.data)
+        // console.log(cb)
+        let result=response.data
+        let re=[]
+        for (let i of result){
+          re.push({"value":i})
+        }
+        cb(re)
+      })},
+    // 健康指数
+    onSubmit1(){
+      console.log("健康指数查询")
+        http.get(
+                "/health/health_search/",
+                {params:{
+                    name: this.formInline1.company,//公司名
+                    date: this.formInline1.quarter_year,//时间（年份+季度）
+        }}).then(response => {
+            this.tableData_1= Array(response.data.data)
+          if (this.tableData_1['等级']===1)
+            this.tableData_1[0].level='严重'
+          else if (this.tableData_1['等级']===2)
+            this.tableData_1[0].level='中等'
+          else
+            this.tableData_1[0].level='良好'
+            // console.log(response)
+          this.tableData_1[0].name=this.formInline1.company
+          console.log(this.tableData_1)
+          if (this.radarData){
+            this.radarData.length=0
+          }
+          for (let i in response.data.data) {
+            // console.log(i)
+            if (i !== '健康指数' && i !== '等级' && typeof response.data.data[i] === 'number') this.radarData.push(response.data.data[i])
+          }
+          // console.log(this.radarData)
+          })
+    },
+    // 
+
+    onSubmit2(){
+      console.log("清空")
+    },
+
+    onSubmit3(){
+      console.log("雷达图")
+      this.detailsdialog = true//打开弹窗
+    },
+    onSubmit4(){
+            console.log("加入对比")      
+    },
+    onSubmit5(){
+            console.log("加入管理")
+    },
+    
+    onSubmit6(){
+      if (this.tableData_2_1 || this.formInline2.radarData1 ||this.formInline2.radarData2){
+        this.formInline2.radarData1.length=0
+        this.formInline2.radarData2.length=0
+        this.tableData_2_1.length=0
+      }
+      http.get(
+          "/health/health_search/",
+          {params:{
+              name: this.formInline2.company1,//公司名
+              date: this.formInline2.quarter_year,//时间（年份+季度）
+            }}).then(response => {
+            this.formInline2.tableData1= response.data.data
+            if (this.formInline2.tableData1['等级']===1)
+              this.formInline2.tableData1.level='严重'
+            else if (this.formInline2.tableData1['等级']===2)
+              this.formInline2.tableData1.level='中等'
+            else
+              this.formInline2.tableData1.level='良好'
+            this.formInline2.tableData1.name=this.formInline2.company1
+            this.tableData_2_1.push( this.formInline2.tableData1)
+        for (let i in response.data.data){
+          if (i !=='健康指数' && i !=='等级' && typeof response.data.data[i]==='number') this.formInline2.radarData1.push(response.data.data[i])}
+      },
+      http.get(
+          "/health/health_search/",
+          {params:{
+              name: this.formInline2.company2,//公司名
+              date: this.formInline2.quarter_year,//时间（年份+季度）
+            }}).then(response => {
+        this.formInline2.tableData2= response.data.data
+        if (this.formInline2.tableData2['等级']===1)
+          this.formInline2.tableData2.level='严重'
+        else if (this.formInline2.tableData2['等级']===2)
+          this.formInline2.tableData2.level='中等'
+        else
+          this.formInline2.tableData2.level='良好'
+        // console.log(response)
+        this.formInline2.tableData2.name=this.formInline2.company2
+        for (let i in response.data.data)
+          if (i !=='健康指数' && i !=='等级' && typeof response.data.data[i]==='number') this.formInline2.radarData2.push(response.data.data[i])
+        console.log(this.formInline2.radarData2)
+        console.log(this.formInline2.radarData1)
+        const echarts1 = echarts.init(this.$refs.echarts_1)
+
+        this.tableData_2_1.push( this.formInline2.tableData2)
+        console.log(this.tableData_2_1)
+        const option1 = {
+          // 右上角存图
+          toolbox: {
+            feature: {
+              saveAsImage: {}
+            }
+          },
+          title: {
+            text: this.formInline2.quarter_year,
+            x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+            y:"bottom",
+            padding:[ 0,10,10,10],
+
+          },
+          legend: {
+            data: ['中国银行']
+          },
+          radar: {
+            // shape: 'circle',
+            indicator: [
+              { name: '投资关系', max: 100 },
+              { name: '操盘模式', max: 100 },
+              { name: '财务状态', max: 100 },
+              { name: '运行状态', max: 100 },
+              { name: '规模扩张', max: 100 },
+              { name: '声誉风险', max: 100 },
+              { name: '外部环境', max: 100 }
+            ]
+          },
+          series: [
+            {
+              name: 'Budget vs spending',
+              type: 'radar',
+              data: [
+                {
+                  value:  this.formInline2.radarData1,
+                  name:   this.formInline2.company1
+                },
+                {
+                  value:  this.formInline2.radarData2,
+                  name:   this.formInline2.company2
+                },
+              ]
+            }
+          ]
+        };
+        echarts1.setOption(option1)
+      })
+      )
+
+
+    },
+    onSubmit10(){
+      let echarts1 = echarts.init(this.$refs.echarts_2)
+      http.get(
+          "/health/line_chart/",
+          {params:{
+              name1: this.formInline2.company1,//公司名
+              name2:this.formInline2.company2,
+              sdate: this.formInline3.start_quarter,//时间（年份+季度）
+              edate:this.formInline3.end_quarter,
+            }}).then(response => {
+        let time=response.data.data['date']
+        let index1=response.data.data['value1']
+        let index2=response.data.data['value2']
+        // 折线图
+        const option= {
+          // 右上角存图
+          toolbox: {
+            feature: {
+              saveAsImage: {}
+            }
+          },
+          title: {
+            text: '健康指数',
+            x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+
+          },
+          tooltip: {
+            trigger: 'axis'
+          },
+          legend: {
+            data: [this.formInline2.company1,this.formInline2.company2],
+            x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+            y:"bottom",
+            padding:0,
+          },
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
+          xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            data: time,
+            axisLabel: {
+              interval:0,
+              rotate:40}
+          },
+          yAxis: {
+            type: 'value',
+          },
+          series: [
+            {
+              name: this.formInline2.company1,
+              type: 'line',
+              stack: 'Total',
+              data: index1
+            },
+            {
+              name: this.formInline2.company2,
+              type: 'line',
+              stack: 'Total',
+              data: index2
+            },
+          ]
+        };
+        echarts1.setOption(option)
+      })
+    },
+    onSubmit7(){
+            console.log("健康 历史")
+      http.get(
+          "/health/line_chart/",
+          {params:{
+              name1: this.formInline1.company,//公司名
+              sdate: this.formInline_2.start_quarter,//时间（年份+季度）
+              edate:this.formInline_2.end_quarter,
+            }}).then(response => {
+              let time=response.data.data['date']
+              let index=response.data.data['value1']
+        // 折线图
+        const echarts4 = echarts.init(this.$refs.echarts_4)
+        const option_4 = {
+          // 右上角存图
+          toolbox: {
+            feature: {
+              saveAsImage: {}
+            }
+          },
+          title: {
+            text: '健康指数',
+            x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+
+          },
+          tooltip: {
+            trigger: 'axis'
+          },
+          legend: {
+            data: [this.formInline1.company],
+            x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+            y:"bottom",
+            padding:0,
+          },
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
+          xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            data: time,
+            axisLabel: {
+              interval:0,
+              rotate:40}
+          },
+          yAxis: {
+            type: 'value',
+
+
+          },
+          series: [
+            {
+              name: this.formInline1.company,
+              type: 'line',
+              stack: 'Total',
+              data: index
+            },
+            // {
+            //   name: '北京银行',
+            //   type: 'line',
+            //   stack: 'Total',
+            //   data: [220, 182, 191, 234, 290, 330, 310]
+            // },
+
+          ]
+        };
+        echarts4.setOption(option_4)
+      })
+
+
+    },
+    onSubmit8(){
+            console.log("交叉对比-行业 查询")
+      http.get(
+          "/health/health_indus/",
+          {params:{
+              ind: this.formInline4.industry,//公司名
+              date: this.formInline4.quarter_year,//时间（年份+季度）
+            }}).then(response => {
+            this.tableData_2_2= Array(response.data.data)
+             console.log(this.tableData_2_2)})
+            // if (this.formInline2.tableData1['等级']===1)
+            //   this.formInline2.tableData1.level='严重'
+            // else if (this.formInline2.tableData1['等级']===2)
+            //   this.formInline2.tableData1.level='中等'
+            // else
+            //   this.formInline2.tableData1.level='良好'
+            // this.formInline2.tableData1.name=this.formInline2.company1
+            // this.tableData_2_1.push( this.formInline2.tableData1)
+    },
+    onSubmit9(){
+            console.log("交叉对比-地域 查询")
+    },
+
+    // 弹窗显示echarts
+    initEcharts() {
+        // 弹窗的雷达图与折线图
+          // 雷达图
+          const echarts3 = echarts.init(this.$refs.echarts_3)
+          const option_3 = {
+            // 右上角存图
+            toolbox: {
+              feature: {
+                saveAsImage: {}
+              }
+            },
+            title: {
+              text: this.formInline1.quarter_year.slice(0,4)+'年第'+this.formInline1.quarter_year.slice(6,)+'季度',
+              x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+              y:"bottom",
+              padding:[ 0,10,10,10],
+              
+            },
+            legend: {
+              data: ['中国银行']
+            },
+            radar: {
+              // shape: 'circle',
+              indicator: [
+                { name: '投资关系', max: 100 },
+                { name: '操盘模式', max: 100 },
+                { name: '财务状态', max: 100 },
+                { name: '运行状态', max: 100 },
+                { name: '规模扩张', max: 100 },
+                { name: '声誉风险', max: 100 },
+                { name: '外部环境', max: 100 }
+              ]
+            },
+            series: [
+              {
+                name: 'Budget vs spending',
+                type: 'radar',
+                data: [
+                  {
+                    value:  this.radarData,
+                    name:   this.formInline1.company
+                  },
+                ]
+              }
+            ]
+          };
+          echarts3.setOption(option_3)
+      },
+      open(){
+        this.$nextTick(() => {
+        //  执行echarts方法
+          this.initEcharts()
+        })
+      },
+
+  }
+};
+</script>
+  
+<style lang="less" scoped>
+
+.grayish_btn{//浅灰色按钮
+  color: #fff;//文字颜色
+  background-color: #aaaaaa;//背景颜色
+}
+.card_label{
+  font-size: 13px;
+  // padding:10px; 
+  color:#fff;
+  background-color: #7f7f7f;
+}
+.form{//产品搜索栏
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:5px; 
+    // height: 40px;
+    padding-left: 40px;
+    // padding: 30px;
+
+  }
+  .table{
+    // 和选项框隔开
+    margin-top:10px;
+    font-size: 12px;
+
+
+    // 调整表头间隔、设置表头下方边框颜色
+    /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #333333 !important;
+    padding: 1px 0; 
+    min-width: 0;
+    }
+    // 去除表格cell间隔
+    .el-table .el-table__cell {
+      padding: 0px 0; 
+      min-width: 0;
+      border-color:#333333;
+
+    }
+    /deep/ .active_header{//表头
+      color: #333333;
+      font-size: 13px;
+      text-align: center !important;
+      border-color:#333333;
+
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      font-size: 13px;
+      border-color:#333333;
+    }
+  }
+
+  // 雷达图
+  .radar{
+    display:flex;
+    justify-content:center;
+    margin-right: 200px;
+        
+        /deep/ .quarter_change{
+          display:column;
+          justify-content:center;
+          margin-top: 200px;
+          margin-left: 0px;
+          margin-right: 150px;
+          margin-bottom: 20px;
+
+    }
+  }
+  .line{
+    display:flex;
+    justify-content:center;
+  }
+  .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+</style>
+  
\ No newline at end of file
diff --git a/src_old/views/压力测试.vue b/src_old/views/压力测试.vue
new file mode 100644
index 0000000..8a5f4b1
--- /dev/null
+++ b/src_old/views/压力测试.vue
@@ -0,0 +1,115 @@
+<template>
+    <div>
+       <!-- 搜索栏 -->
+
+       <div class="form">
+                                                        <!-- inline="true"表单域在一行 -->
+          <el-form :inline="true"  :model="formInline" class="demo-form-inline">
+            <el-form-item label="市场">
+              <el-select   v-model="formInline.market" placeholder="选择市场" size="mini">
+                <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="行业">
+              <el-select   v-model="formInline.industry" placeholder="选择行业" size="mini">
+                <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+          
+            <el-form-item label="压力模型">
+              <el-select   v-model="formInline.pressure" placeholder="选择压力模型" size="mini">
+                <el-option v-for="item in options_pressure" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item>
+              <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">测试</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+
+    </div>
+  </template>
+  
+  <script>
+  import * as echarts from "echarts"
+  export default {
+    data() {
+      return {
+
+         // 搜索栏——1市场选项
+         options_market: [{
+          value: '市场1',
+          label: '市场1'
+        }, {
+          value: '市场2',
+          label: '市场2'
+        }, {
+          value: '市场3',
+          label: '市场3'
+        }],
+
+        // 搜索栏——2行业选项
+        options_industry: [{
+          value: '行业1',
+          label: '行业1'
+        }, {
+          value: '行业2',
+          label: '行业2'
+        }, {
+          value: '行业3',
+          label: '行业3'
+        }],
+        
+        // 搜索栏——3压力选项
+        options_pressure: [{
+          value: '压力1',
+          label: '压力1'
+        }, 
+      ],
+        // 搜索栏——整合收据进行接收
+        formInline: {
+            market: '',
+            industry: '',
+            pressure:'',
+            // start_date:'',
+            // end_date:'',
+        },
+          }          
+  },
+    computed:{
+      isLogin(){
+        return this.$store.state.isLogin
+      }
+    },
+    mounted(){
+          
+  },
+    methods:{
+      
+      onSubmit1(){
+          console.log()
+
+  }
+
+
+  
+  }
+
+
+}
+
+  </script>
+  
+<style lang="less" scoped>
+
+.grayish_btn{//浅灰色按钮
+  color: #fff;//文字颜色
+  background-color: #aaaaaa;//背景颜色
+}
+</style>
+
+
+
+
diff --git a/src_old/views/市场主体分析.vue b/src_old/views/市场主体分析.vue
new file mode 100644
index 0000000..e8b6ef3
--- /dev/null
+++ b/src_old/views/市场主体分析.vue
@@ -0,0 +1,100 @@
+<template>
+  <div>
+
+    <graph-view-v4></graph-view-v4>
+<!--      <div class="form">-->
+<!--                                                        &lt;!&ndash; inline="true"表单域在一行 &ndash;&gt;-->
+<!--          <el-form :inline="true"  class="demo-form-inline" :model="formInline">-->
+<!--            <el-form-item label="主体名称">-->
+<!--              <el-input  v-model="formInline.main_name" placeholder="请输入主体名称" size="mini"></el-input>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item>-->
+<!--              <el-button class="grayish_btn" @click="onSubmit" size="mini">查询</el-button>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item>-->
+<!--              <el-button class="grayish_btn" @click="onSubmit" size="mini">清空</el-button>-->
+<!--            </el-form-item>-->
+<!--        </el-form>-->
+<!--      </div>-->
+
+<!--      <el-card style='height: 550px;' :body-style={padding:0}> -->
+<!--       &lt;!&ndash; height:400px &ndash;&gt;-->
+<!--       &lt;!&ndash; 1、上标 &ndash;&gt;-->
+<!--        <span class="superscript" style="width: 20px; height: 40px;">系统风险分析</span>-->
+<!--        &lt;!&ndash; 2、知识图谱&选项器 &ndash;&gt;-->
+<!--        <el-row :gutter="20">-->
+<!--          <el-col :span="16">-->
+<!--            <div style="margin-top: 20px;">-->
+<!--&lt;!&ndash;            知识图谱&ndash;&gt;-->
+<!--           -->
+<!--            </div>-->
+
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-card style="height: 550px;">-->
+<!--              <el-form label-position='top' label-width="80px" :model="formInline">-->
+<!--              <el-form-item label="更改布局">-->
+<!--                <el-button  @click="onSubmit" size="mini">CoSE</el-button>-->
+<!--                <el-button  @click="onSubmit" size="mini">fCoSE</el-button>-->
+<!--                <el-button  @click="onSubmit" size="mini">Cola</el-button>-->
+<!--                <el-button  @click="onSubmit" size="mini">euler</el-button>-->
+
+<!--              </el-form-item>-->
+
+<!--             -->
+<!--            </el-form>-->
+<!--            </el-card>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+
+
+
+<!--    </el-card>-->
+  </div>
+</template>
+
+<script>
+import graphViewV4 from "@/views/graphViewV4";
+import http from '../utils/request'
+  export default {
+    //引入组件
+  components: {
+    graphViewV4
+  },
+    data() {
+      return {
+// 【整合接收数据】
+    formInline: {
+      main_name:'',
+
+    },
+      }
+    },
+    mounted(){
+
+    },
+    methods: {
+      onSubmit() {
+        console.log('submit!');
+      }
+    }
+};
+</script>
+
+<style lang="less" scoped>
+.form{//搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    // margin-top:5px; 
+    // height: 40px;
+    padding-bottom:0; 
+    padding-left: 10px;
+
+  }
+  
+.grayish_btn{//浅灰色按钮
+  color: #fff;//文字颜色
+  background-color: #aaaaaa;//背景颜色
+}
+</style>
diff --git a/src_old/views/异常检测.vue b/src_old/views/异常检测.vue
new file mode 100644
index 0000000..963fabd
--- /dev/null
+++ b/src_old/views/异常检测.vue
@@ -0,0 +1,1161 @@
+<!-- 预警服务-异常检测 -->
+<template>
+    <div>
+    <!-- 卡片化的标签页 -->
+    <el-tabs type="border-card">
+    <!-- 【1】股市 -->
+    <el-tab-pane label="股市">
+      <el-card style='height: 1050px;margin-bottom: 10px;' :body-style={padding:0}>
+      <!-- height:400px -->
+      <!-- 1、上标 -->
+      <span class="superscript" style="width: 20px; height: 40px;">股票异常检测</span>
+      <!-- 2、产品搜索栏 -->
+  
+      <div class="form">
+                                                          <!-- inline="true"表单域在一行 -->
+          <el-form :inline="true"  class="demo-form-inline" :model="formInline1" ref="formInline2">
+  
+<!--              <el-form-item label="行业" prop="行业">-->
+<!--              <el-select  size="mini" v-model="formInline1.industry">-->
+<!--                  <el-option label="行业1" value="行业1"></el-option>-->
+<!--                  <el-option label="行业2" value="行业2"></el-option>-->
+<!--              </el-select>-->
+<!--              </el-form-item>-->
+              <el-form-item label="开始时间" prop="开始时间">
+              <el-date-picker
+                  v-model="formInline1.start_date"
+                  type="date"
+                  placeholder="年/月/日" 
+                  size="mini">
+              </el-date-picker>
+              </el-form-item>
+  
+              <el-form-item label="结束时间" prop="结束时间">
+              <el-date-picker
+                  v-model="formInline1.end_date"
+                  type="date"
+                  placeholder="年/月/日" 
+                  size="mini">
+              </el-date-picker>
+          </el-form-item>
+              <el-form-item>
+              <el-button class="grayish_btn" @click="onSubmit1" size="mini">查询</el-button>
+              </el-form-item>
+  
+  
+          </el-form>
+      </div>
+      <!-- 添加半圆饼图 -->
+      <half-doughnut :key='1' :myHalfData="myHalfData1"></half-doughnut>
+      <!-- <half-doughnut/ :prop=""> -->
+      <!-- 表格 -->
+      <div class="table">
+              <el-table :data="tableData1.slice((currentPage-1)*pageSize,currentPage*pageSize)" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border  
+                    height="500"
+                    :row-style="{height:'30px'}"
+                    :cell-style="{padding:'5px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center"
+                    style="width: 100px">          <!-- style="width: 40%"               height="215"  -->
+                <template v-for="(val,key) in tableLabel1">
+<!--                  You should not mix 'v-for' with 'v-if'-->
+<!--                  条件渲染-->
+                <el-table-column  :prop="key"  :key='key'
+                                 :label='typeof val === "object" ? val.label : val'
+                                 :filters=filterText
+                                 :filter-method="filterTag"
+                                 v-if=' val.special'
+                />
+                  <el-table-column  :prop="key"  :key='key'
+                                    :label='typeof val === "object" ? val.label : val'
+
+                                    v-if=' !val.special'
+                  />
+                </template>
+                <!--插槽里面没有东西就可以用单标签  -->
+                  <el-table-column
+                          prop="scale"
+                          label="操作">
+                          <template slot-scope="scope">
+<!--                            <span class="text"  v-on:click="detail(scope.row,this.formInline1.start_date)">查看详情</span>-->
+                            <span class="text"  v-on:click="testDeatil(scope.row)">查看详情</span>
+                          </template>
+                      </el-table-column>
+              </el-table>
+            </div>
+
+<!--        分页-->
+        <div class="block" style="margin-top:15px;">
+          <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                         :current-page="currentPage"
+
+                         :page-size="10"
+                         layout="total, prev, pager, next, jumper"
+                         :total="tableData1.length">
+          </el-pagination>
+
+        </div>
+  
+      </el-card>
+    </el-tab-pane>
+    <!-- 【2】债市 -->
+    <el-tab-pane label="债市">
+      <el-card style='height: 1050px;margin-bottom: 10px;' :body-style={padding:0}>
+      <!-- height:400px -->
+      <!-- 1、上标 -->
+      <span class="superscript" style="width: 20px; height: 40px;">债市异常检测</span>
+      <!-- 2、产品搜索栏 -->
+  
+      <div class="form">
+                                                          <!-- inline="true"表单域在一行 -->
+          <el-form :inline="true"  class="demo-form-inline" :model="formInline2" ref="formInline2">
+<!--              <el-form-item label="行业" prop="行业">-->
+<!--              <el-select  size="mini" v-model="formInline2.industry">-->
+<!--                  <el-option label="行业1" value="行业1"></el-option>-->
+<!--                  <el-option label="行业2" value="行业2"></el-option>-->
+<!--              </el-select>-->
+<!--              </el-form-item>-->
+              <el-form-item label="开始时间" prop="开始时间">
+              <el-date-picker
+                  v-model="formInline2.start_date"
+                  type="date"
+                  placeholder="年/月/日" 
+                  size="mini">
+              </el-date-picker>
+              </el-form-item>
+  
+              <el-form-item label="结束时间" prop="结束时间">
+              <el-date-picker
+                  v-model="formInline2.end_date"
+                  type="date"
+                  placeholder="年/月/日" 
+                  size="mini">
+              </el-date-picker>
+          </el-form-item>
+              <el-form-item>
+              <el-button class="grayish_btn" @click="onSubmit2" size="mini">查询</el-button>
+              </el-form-item>
+  
+  
+          </el-form>
+      </div>
+      <!-- 添加半圆饼图 -->
+      <half-doughnut :key='2' :myHalfData="myHalfData3"></half-doughnut>
+      <!-- 表格 -->
+      <div class="table">
+              <el-table :data="tableData2.slice((currentPage-1)*pageSize,currentPage*pageSize)" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border  
+                    height="500"
+                    :row-style="{height:'30px'}"
+                    :cell-style="{padding:'5px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center"
+                    style="width: 100px">          <!-- style="width: 40%"               height="215"  -->
+                <template v-for="(val,key) in tableLabel2">
+                  <!--                  You should not mix 'v-for' with 'v-if'-->
+                  <!--                  条件渲染-->
+                  <el-table-column  :prop="key"  :key='key'
+                                    :label='typeof val === "object" ? val.label : val'
+                                    :filters=filterText
+                                    :filter-method="filterTag"
+                                    v-if=' val.special'
+                  />
+                  <el-table-column  :prop="key"  :key='key'
+                                    :label='typeof val === "object" ? val.label : val'
+
+                                    v-if=' !val.special'
+                  />
+                </template>
+                  <el-table-column
+                          prop="scale"
+                          label="操作">
+                          <template slot-scope="scope">
+                            <span class="text"  v-on:click="detail(scope.row,formInline2.start_date)">查看详情</span>
+                          </template>
+                      </el-table-column>
+              </el-table>
+            </div>
+        <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                       :current-page="currentPage"
+
+                       :page-size="10"
+                       layout="total, prev, pager, next, jumper"
+                       :total="tableData2.length">
+        </el-pagination>
+      
+      
+  
+  
+      </el-card>
+    </el-tab-pane>
+    <!-- 【3】期货 -->
+    <el-tab-pane label="期货">
+      <el-card style='height: 1050px;margin-bottom: 10px;' :body-style={padding:0}>
+      <!-- height:400px -->
+      <!-- 1、上标 -->
+      <span class="superscript" style="width: 20px; height: 40px;">合约交易异常</span>
+      <!-- 2、产品搜索栏 -->
+  
+      <div class="form">
+                                                          <!-- inline="true"表单域在一行 -->
+          <el-form :inline="true"  class="demo-form-inline" :model="formInline3" ref="formInline3">
+<!--              <el-form-item label="商品种类" prop="商品种类">-->
+
+<!--                  <el-select   v-model="formInline3.industry" placeholder="选择商品" size="mini">-->
+<!--                    <el-option v-for="item in futureOption" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+<!--                  </el-select>-->
+
+<!--              </el-form-item>-->
+              <el-form-item label="开始时间" prop="开始时间">
+              <el-date-picker
+                  v-model="formInline3.start_date"
+                  type="date"
+                  placeholder="年/月/日" 
+                  size="mini">
+              </el-date-picker>
+              </el-form-item>
+  
+              <el-form-item label="结束时间" prop="结束时间">
+              <el-date-picker
+                  v-model="formInline3.end_date"
+                  type="date"
+                  placeholder="年/月/日" 
+                  size="mini">
+              </el-date-picker>
+          </el-form-item>
+              <el-form-item>
+              <el-button class="grayish_btn" @click="onSubmit3" size="mini">查询</el-button>
+              </el-form-item>
+  
+  
+          </el-form>
+      </div>
+      <!-- 添加半圆饼图 -->
+      <half-doughnut :key='3' :myHalfData="myHalfData2"></half-doughnut>
+      <!-- 表格 -->
+      <div class="table">
+              <el-table :data="tableData3.slice((currentPage-1)*pageSize,currentPage*pageSize)" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border  
+                    height="500"
+                    :row-style="{height:'30px'}"
+                    :cell-style="{padding:'5px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center"
+                    style="width: 100px">          <!-- style="width: 40%"               height="215"  -->
+                <template v-for="(val,key) in tableLabel3 ">
+                  <!--                  You should not mix 'v-for' with 'v-if'-->
+                  <!--                  条件渲染-->
+                  <el-table-column  :prop="key"  :key='key'
+                                    :label='typeof val === "object" ? val.label : val'
+                                    :filters=filterText
+                                    :filter-method="filterTag"
+                                    v-if=' val.special'
+                  />
+                  <el-table-column  :prop="key"  :key='key'
+                                    :label='typeof val === "object" ? val.label : val'
+
+                                    v-if=' !val.special'
+                  />
+                </template>
+                <!--插槽里面没有东西就可以用单标签  -->
+                  <el-table-column
+                          prop="scale"
+                          label="操作">
+                          <template slot-scope="scope">
+                            <span class="text"  v-on:click="detail(scope.row,formInline3.start_date)">查看详情</span>
+                          </template>
+                      </el-table-column>
+              </el-table>
+            </div>
+
+        <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                       :current-page="currentPage"
+
+                       :page-size="10"
+                       layout="total, prev, pager, next, jumper"
+                       :total="tableData3.length">
+        </el-pagination>
+
+      </el-card>
+    </el-tab-pane>
+  </el-tabs>
+    <!-- #1弹窗：股价波动异常、高频交易 -->
+    <el-dialog  :visible.sync="detailsdialog1" width="100%" @open="open()" >
+            <!-- 详细信息 -->
+            <el-card style=" height:100%;margin-bottom:10px ; " :body-style={padding:0} >
+              <div style="display:flex;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title'>异常统计</span>
+              </div>
+
+                <Histogram :x-data="xData" :y-data="yData" :legend="legend" :title="titleText"/>
+<!--              <span style="display:block;text-indent:2em;line-height: 25px;margin: 10px;">-->
+<!--                股票1在2021-01-01至2021-02-01时间段内，在2021-1-8内达到股价峰值，为26元/每股，比该公司该段时间内平均股价（9元/每股），上涨15元，涨幅188.8%。在股价过高的情况下可能会导致风险增加、股票泡沫、不良收购等多种导致经济不稳定的风险因素的增加，在2021-01-09达到交易量峰值，为231支，比该公司该段时间内平均交易量（121股），上涨110股，涨幅为90.9%。在交易量过高的情况下可能会在一定程度上可能对市场稳定性、公平竞争和投资者信心造成负面影响。-->
+
+<!--              </span>-->
+
+            </el-card>
+          </el-dialog>
+      <!-- #2弹窗：资产泡沫 -->
+      <el-dialog  :visible.sync="detailsdialog2" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:100%;margin-bottom:10px ; " :body-style={padding:0} >
+          <div style="display:flex;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title'>异常统计</span>
+              </div>
+              <div style="height:100px;margin-left: 20px;">图谱</div>
+              <el-table class='detail_table'
+                    :data="tableData_detail_1_2"
+                    style="width: 100%"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center"
+                    height="215" >
+                    <el-table-column v-for='(val,key) in tableLabel_detail_1_2' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_2)">
+
+                    </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+
+
+                </el-table>
+                <DifferentialChart/>
+<!--              <span style="display:block;text-indent:2em;line-height: 25px;margin: 10px;">-->
+<!--                股票1在2021-01-01至2021-02-01时间段内，在2021-1-8内达到股价峰值，为26元/每股，比该公司该段时间内平均股价（9元/每股），上涨15元，涨幅188.8%。在股价过高的情况下可能会导致风险增加、股票泡沫、不良收购等多种导致经济不稳定的风险因素的增加，在2021-01-09达到交易量峰值，为231支，比该公司该段时间内平均交易量（121股），上涨110股，涨幅为90.9%。在交易量过高的情况下可能会在一定程度上可能对市场稳定性、公平竞争和投资者信心造成负面影响。-->
+
+<!--              </span>-->
+
+        </el-card>
+      </el-dialog>
+
+      <!-- #3弹窗：事件风险波及、风险事件时长、事件热度异常 -->
+      <el-dialog  :visible.sync="detailsdialog3" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:100%;margin-bottom:10px ; " :body-style={padding:0} >
+          <div style="display:flex;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title'>异常统计</span>
+              </div>
+              <div style="height:100px;margin-left: 20px;">图谱</div>
+              <el-table class='detail_table'
+                    :data="tableData_detail_1_3"
+                    style="width: 100%"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+
+
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center"
+                    height="215" >
+                    <el-table-column v-for='(val,key) in tableLabel_detail_1_3' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_3)">
+
+                    </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                </el-table>
+
+                <AreaChart :key='1' :myAreaChart="myAreaChart1"></AreaChart>
+
+
+<!--              <span style="display:block;text-indent:2em;line-height: 25px;margin: 10px;">-->
+<!--                股票1在2021-01-01至2021-02-01时间段内，在2021-1-8内达到股价峰值，为26元/每股，比该公司该段时间内平均股价（9元/每股），上涨15元，涨幅188.8%。在股价过高的情况下可能会导致风险增加、股票泡沫、不良收购等多种导致经济不稳定的风险因素的增加，在2021-01-09达到交易量峰值，为231支，比该公司该段时间内平均交易量（121股），上涨110股，涨幅为90.9%。在交易量过高的情况下可能会在一定程度上可能对市场稳定性、公平竞争和投资者信心造成负面影响。-->
+
+<!--              </span>-->
+
+        </el-card>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import HalfDoughnut from "../components/echarts/HalfDoughnut.vue";
+import DifferentialChart from "@/components/echarts/DifferentialChart.vue";
+import Histogram from "@/components/echarts/Histogram.vue";
+import AreaChart from "@/components/echarts/AreaChart.vue";
+import http from "@/utils/request";
+import {Loading} from "element-ui";
+
+
+export default {
+
+  components:{
+    HalfDoughnut,
+    DifferentialChart,
+    Histogram,
+    AreaChart,
+
+  },
+  data () {
+      return {
+        currentPage: 1, // 当前页码
+        total: 20, // 总条数
+        pageSize: 10, // 每页的数据条数
+        filterText:[],
+        titleText:'',
+        legend:'',
+        xData:[],
+        yData:[],
+        //记录当前所选的市场
+        selectedIndustry:'',
+// 期货
+        futureOption:[{'value': 'NIZL.SHF', 'label': '沪镍'}, {'value': 'RRZL.DCE', 'label': '粳米'}, {'value': 'LHZL.DCE', 'label': '生猪'}, {'value': 'CSZL.DCE', 'label': '玉米淀粉'}, {'value': 'RBZL.SHF', 'label': '螺纹钢'}, {'value': 'APZL.CZC', 'label': '苹果'}, {'value': 'CFZL.CZC', 'label': '棉花'}, {'value': 'BZL.DCE', 'label': '豆二'}, {'value': 'URZL.CZC', 'label': '尿素'}, {'value': 'AUZL.SHF', 'label': '沪金'}, {'value': 'BCZL.SHF', 'label': '国际铜'}, {'value': 'PBZL.SHF', 'label': '沪铅'}, {'value': 'AZL.DCE', 'label': '豆一'}, {'value': 'SPZL.SHF', 'label': '纸浆'}, {'value': 'LZL.DCE', 'label': '塑料'}, {'value': 'SFZL.CZC', 'label': '硅铁'}, {'value': 'BUZL.SHF', 'label': '沥青'}, {'value': 'TAZL.CZC', 'label': 'PTA'}, {'value': 'HCZL.SHF', 'label': '热卷'}, {'value': 'SRZL.CZC', 'label': '白糖'}, {'value': 'CJZL.CZC', 'label': '红枣'}, {'value': 'SAZL.CZC', 'label': '纯碱'}, {'value': 'WRZL.SHF', 'label': '线材'}, {'value': 'CZL.DCE', 'label': '玉米'}, {'value': 'ZNZL.SHF', 'label': '沪锌'}, {'value': 'EBZL.DCE', 'label': '苯乙烯'}, {'value': 'RSZL.CZC', 'label': '菜籽'}, {'value': 'FBZL.DCE', 'label': '纤维板'}, {'value': 'MAZL.CZC', 'label': '甲醇'}, {'value': 'PPZL.DCE', 'label': '聚丙烯'}, {'value': 'IZL.DCE', 'label': '铁矿石'}, {'value': 'PZL.DCE', 'label': '棕榈油'}, {'value': 'FGZL.CZC', 'label': '玻璃'}, {'value': 'RUZL.SHF', 'label': '橡胶'}, {'value': 'AGZL.SHF', 'label': '沪银'}, {'value': 'SNZL.SHF', 'label': '沪锡'}, {'value': 'FUZL.SHF', 'label': '燃油'}, {'value': 'PGZL.DCE', 'label': 'LPG'}, {'value': 'PFZL.CZC', 'label': '短纤'}, {'value': 'SCZL.SHF', 'label': '原油'}, {'value': 'EGZL.DCE', 'label': '乙二醇'}, {'value': 'JMZL.DCE', 'label': '焦煤'}, {'value': 'MZL.DCE', 'label': '豆粕'}, {'value': 'NRZL.SHF', 'label': '20号胶'}, {'value': 'VZL.DCE', 'label': 'PVC'}, {'value': 'YZL.DCE', 'label': '豆油'}, {'value': 'JDZL.DCE', 'label': '鸡蛋'}, {'value': 'AOZL.SHF', 'label': '氧化铝'}, {'value': 'SSZL.SHF', 'label': '不锈钢'}, {'value': 'RMZL.CZC', 'label': '菜粕'}, {'value': 'CYZL.CZC', 'label': '棉纱'}, {'value': 'LUZL.SHF', 'label': '低硫燃油'}, {'value': 'OIZL.CZC', 'label': '菜油'}, {'value': 'JZL.DCE', 'label': '焦炭'}, {'value': 'ALZL.SHF', 'label': '沪铝'}, {'value': 'CUZL.SHF', 'label': '沪铜'}, {'value': 'SMZL.CZC', 'label': '锰硅'}, {'value': 'PKZL.CZC', 'label': '花生'}],
+        // 判断是否弹窗打开
+  // 判断是否弹窗打开
+      detailsdialog1:false,
+      detailsdialog2:false,
+      detailsdialog3:false,
+      // detailsdialog4:false,
+
+  // 【图表数据】
+  //半圆图
+      myHalfData1: [
+            // { value: 300, name: "股价波动异常" },
+            // { value: 350, name: "高频交易" },
+            // { value: 200, name: "资产泡沫" },
+            // { value: 120, name: "事件风险波及" },
+            // { value: 110, name: "风险事件时长" },
+            // { value: 280, name: "事件热度异常" },
+            // {
+            //   // make an record to fill the bottom 50%
+            //   value: 300+350+200+120+110+280,
+            //   itemStyle: {
+            //     color: "none",
+            //   },
+            // },
+          ],
+        myHalfData3:[],
+        myHalfData2:[
+            // { value: 300, name: "股价波动异常" },
+            // { value: 350, name: "高频交易" },
+            // { value: 200, name: "资产泡沫" },
+            // {
+            //   // make an record to fill the bottom 50%
+            //   value: 300+350+200,
+            //   itemStyle: {
+            //     // stop the chart from rendering this piece
+            //     color: "none",
+            //   },
+            // },
+          ],
+  // 面积图
+      myAreaChart1:[],
+
+
+
+  // 【整合接收数据】
+      formInline1: {
+          industry:'',
+          start_date:'',
+          end_date:'',
+      },
+      formInline2: {
+          industry:'',
+          start_date:'',
+          end_date:'',
+      },
+      formInline3: {
+          industry:'',
+          start_date:'',
+          end_date:'',
+      },
+  // 【表格】
+      tableData1: [
+          { 
+              异常关联类型: '股价波动异常',
+              涉及股票: '股票1',
+              },
+          { 
+              异常关联类型: '高频交易',
+              涉及股票: '股票1',
+          },
+          { 
+              异常关联类型: '资产泡沫',
+              涉及股票: '股票1',
+          },
+            
+          ],
+      tableData2: [
+          { 
+              异常关联类型: '股价波动异常',
+              涉及股票: '债券1',
+              },
+          { 
+              异常关联类型: '高频交易',
+              涉及股票: '债券2',
+          },
+          { 
+              异常关联类型: '资产泡沫',
+              涉及股票: '债券3',
+          },
+            
+          ],
+      tableData3: [
+          { 
+              异常关联类型: '股价波动异常',
+              涉及商品: '玉米',
+              },
+          { 
+              异常关联类型: '高频交易',
+              涉及商品: '大豆',
+          },
+          { 
+              异常关联类型: '资产泡沫',
+              涉及商品: '棕榈油',
+          },
+            
+          ],
+      tableLabel1: {
+          编码: '编号',
+        异常关联类型: {label:'异常关联类型' ,
+          special:true
+        },
+          名称: '涉及股票',
+          监测时间: '监测时间',
+          股票价格: '股票价格',
+          交易数量: '交易数量',
+          风险等级: '风险等级',
+
+      },
+      tableLabel2: {
+        编码: '编号',
+        异常关联类型: {label:'异常关联类型' ,
+          special:true
+        },
+        名称: '涉及主体',
+          监测时间: '监测时间',
+          股票价格: '债券价格',
+          交易数量: '交易数量',
+          风险等级: '风险等级',
+
+
+      },
+      tableLabel3: {
+        编码: '编号',
+          异常关联类型: {label:'异常关联类型' ,
+            special:true
+  },
+          涉及商品: '涉及商品',
+          合约名称: '合约名称',
+          监测时间: '监测时间',
+          股票价格: '股票价格',
+          交易数量: '交易数量',
+          风险等级: '风险等级',
+
+      },
+      tableLabel_detail_1_1:
+      {
+        编号: '编号',
+        异常主体:'异常主体',
+        关联对象:'关联对象',
+        异常关联类型:'异常关联类型',
+        关联相似度:'关联相似度',
+        涉及事件详情:'涉及事件详情',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'风险等级',
+      },
+      tableData_detail_1_1:[
+      {
+        编号: '',
+        异常主体:'股票1',
+        关联对象:'股票2',
+        异常关联类型:'高频交易',
+        关联相似度:'关联相似度',
+        涉及事件详情:'事件分析',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'',
+      },
+
+      ],
+      tableLabel_detail_1_2:
+      {
+        编号: '编号',
+        异常主体:'异常主体',
+        关联对象:'关联对象',
+        异常关联类型:'异常关联类型',
+        关联相似度:'关联相似度',
+        涉及事件详情:'涉及事件详情',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'风险等级',
+      },
+      tableData_detail_1_2:[
+      {
+        编号: '',
+        异常主体:'股票1',
+        关联对象:'股票2',
+        异常关联类型:'高频交易',
+        关联相似度:'关联相似度',
+        涉及事件详情:'事件分析',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'',
+      },
+
+      ],
+      tableLabel_detail_1_3:
+      {
+        编号: '编号',
+        异常主体:'异常主体',
+        关联对象:'关联对象',
+        异常关联类型:'异常关联类型',
+        关联相似度:'关联相似度',
+        涉及事件详情:'涉及事件详情',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'风险等级',
+      },
+      tableData_detail_1_3:[
+      {
+        编号: '',
+        异常主体:'股票1',
+        关联对象:'股票2',
+        异常关联类型:'高频交易',
+        关联相似度:'关联相似度',
+        涉及事件详情:'事件分析',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'',
+      },
+
+      ],
+  }
+    },
+    mounted(){
+    },
+    methods:{
+
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`);
+        this.currentPage = 1;
+        this.pageSize = val;
+      },
+      //当前页改变时触发 跳转其他页
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`);
+        this.currentPage = val;
+      },
+
+
+
+      filterTag(value, row) {
+        return row.异常关联类型 === value;
+      },
+
+      onSubmit1(){
+        // console.log(this.formInline1.start_date,this.formInline1.end_date)
+        console.log()
+        if (String(this.formInline1.start_date)===String(this.formInline1.end_date)){
+          this.$message({
+            showClose: true,
+            message: '请重新选择时间',
+            type: 'warning'
+          });
+
+        }
+        else {
+          let options={
+            text:'请稍等'
+          }
+          let loadingInstance = Loading.service(options);
+          this.selectedIndustry = 'stock'
+          if (this.myHalfData1.length !== 0)
+            this.myHalfData1.length = 0
+          this.currentPage=1
+          http.get('/anomaly/all_anomaly/', {
+            params: {
+              sc: 'stock',
+              indus: this.formInline1.industry,
+              sdate: this.formInline1.start_date,
+              edate: this.formInline1.end_date
+            }
+          }).then((res) => {
+            // console.log(res.data.date)
+            // this.$notify.info({
+            //   title: '提示',
+            //   message: '仅显示部分结果'
+            // });
+            let total = 0
+            for (let i in res.data.date) {
+              if (res.data.date[i]!==0){
+                total += Number(res.data.date[i])
+
+                this.myHalfData1.push({value: Number(res.data.date[i]), name: i})
+              }
+            }
+            if (total!==0){
+              this.myHalfData1.push({
+                value: total,
+                itemStyle: {
+                  color: "none",
+                }
+              })
+
+            }
+
+
+          })
+          http.get('/anomaly/item_anomaly/', {
+            params: {
+              sc: 'stock',
+              indus: this.formInline1.industry,
+              sdate: this.formInline1.start_date,
+              edate: this.formInline1.end_date
+            }
+          }).then((res) => {
+            this.filterText=[]
+            this.tableData1 = res.data.data
+            const unique =  Array.from(new Set(this.tableData1.map(item => item.异常关联类型)));
+            console.log(unique)
+            for (let i in unique)
+            {
+             let  tmp={ text: unique[i], value: unique[i] }
+            if ( !this.filterText.some(item => JSON.stringify(item) === JSON.stringify(tmp)))
+              this.filterText.push(tmp)
+            }
+            console.log(this.filterText)
+
+          })
+          loadingInstance.close()
+        }
+
+      },
+      onSubmit2(){
+        if (String(this.formInline2.start_date)===String(this.formInline2.end_date)){
+          this.$message({
+            showClose: true,
+            message: '请重新选择时间',
+            type: 'warning'
+          });
+        }
+        else {
+          let options={
+            text:'请稍等'
+          }
+          this.currentPage=1
+          let loadingInstance = Loading.service(options);
+          this.selectedIndustry = 'bond'
+          if (this.myHalfData3.length !== 0)
+            this.myHalfData3.length = 0
+          http.get('/anomaly/all_anomaly/', {
+            params: {
+              sc: 'bond',
+              indus: this.formInline2.industry,
+              sdate: this.formInline2.start_date,
+              edate: this.formInline2.end_date
+            }
+          }).then((res) => {
+            // this.$notify.info({
+            //   title: '提示',
+            //   message: '仅显示部分结果'
+            // });
+            console.log(res.data.date)
+            let total = 0
+            for (let i in res.data.date) {
+              if (res.data.date[i]!==0){
+                total += Number(res.data.date[i])
+                this.myHalfData3.push({value: Number(res.data.date[i]), name: i})
+              }
+            }
+
+            if (total!==0){
+              this.myHalfData3.push({
+                value: total,
+                itemStyle: {
+                  color: "none",
+                }
+              })
+
+            }
+
+            http.get('/anomaly/item_anomaly/', {
+              params: {
+                sc: 'bond',
+                indus: this.formInline2.industry,
+                sdate: this.formInline2.start_date,
+                edate: this.formInline2.end_date
+              }
+            }).then((res) => {
+              this.filterText=[]
+              this.tableData2 = res.data.data
+              const unique =  Array.from(new Set(this.tableData2.map(item => item.异常关联类型)));
+              console.log(unique)
+              for (let i in unique)
+              {
+                let  tmp={ text: unique[i], value: unique[i] }
+                if ( !this.filterText.some(item => JSON.stringify(item) === JSON.stringify(tmp)))
+                  this.filterText.push(tmp)
+              }
+            })
+          })
+          loadingInstance.close()
+        }
+      },
+      onSubmit3(){
+        if (String(this.formInline3.start_date)===String(this.formInline3.end_date)){
+          this.$message({
+            showClose: true,
+            message: '请重新选择时间',
+            type: 'warning'
+          });
+        }
+        else {
+          this.currentPage=1
+          let options={
+            text:'请稍等'
+          }
+          let loadingInstance = Loading.service(options);
+          this.selectedIndustry = 'future'
+          if (this.myHalfData2.length !== 0)
+            this.myHalfData2.length = 0
+          http.get('/anomaly/all_anomaly/', {
+            params: {
+              sc: 'future',
+              indus: this.formInline3.industry,
+              sdate: this.formInline3.start_date,
+              edate: this.formInline3.end_date
+            }
+          }).then((res) => {
+            // this.$notify.info({
+            //   title: '提示',
+            //   message: '仅显示部分结果'
+            // });
+            console.log(res.data.date)
+            let total = 0
+            for (let i in res.data.date) {
+              if (res.data.date[i]!==0){
+                total += Number(res.data.date[i])
+                this.myHalfData2.push({value: Number(res.data.date[i]), name: i})
+              }
+            }
+            if (total!==0){
+
+              this.myHalfData2.push({
+                value: total,
+                itemStyle: {
+                  color: "none",
+                }
+              })
+            }
+
+            http.get('/anomaly/item_anomaly/', {
+              params: {
+                sc: 'future',
+                indus: this.formInline3.industry,
+                sdate: this.formInline3.start_date,
+                edate: this.formInline3.end_date
+              }
+            }).then((res) => {
+              this.filterText=[]
+              this.tableData3 = res.data.data
+              const unique =  Array.from(new Set(this.tableData3.map(item => item.异常关联类型)));
+              console.log(unique)
+              for (let i in unique)
+              {
+                let  tmp={ text: unique[i], value: unique[i] }
+                if ( !this.filterText.some(item => JSON.stringify(item) === JSON.stringify(tmp)))
+                  this.filterText.push(tmp)
+              }
+            })
+          })
+          loadingInstance.close()
+        }
+      },
+      // 调整表格列宽
+      calculateColumnWidth(prop,data) {
+          const text = String(data[0][prop]); // 使用第一行的数据作为示例
+          const calculatedWidth = text.length;
+          // console.log('console.log(calculatedWidth):',calculatedWidth)
+          if(calculatedWidth>10 && calculatedWidth<=50){
+            const baseWidth= 20 + calculatedWidth * 0.5
+            return `${baseWidth}px`;
+          }
+          if(calculatedWidth<=10){
+            const baseWidth= 15
+            return `${baseWidth}px`;
+          }
+          else{
+            const baseWidth= 20 + calculatedWidth * 0.5
+            return `${baseWidth}px`;
+          }
+    },
+      //股
+      testDeatil(row){
+        let that=this
+        if(row.异常关联类型==='价格波动异常'||row.异常关联类型==='高频交易异常' ||row.异常关联类型==='资产泡沫异常') {
+          this.detailsdialog1 = true//打开弹窗
+          http.get('/anomaly/sc_anomaly/', {
+            params: {
+              date: this.formInline1.start_date,
+              sc: that.selectedIndustry,
+              id: row.名称,
+              type: row.异常关联类型
+            }
+          }).then((res) => {
+            let name=res.data.name!==''?res.data.name:row.名称
+            let y = []
+            let x = []
+            if (row.异常关联类型 === '价格波动异常')
+              for (let i in res.data.data) {
+
+                y.push(res.data.data[i].价格波动异常值)
+                x.push(res.data.data[i].监测时间)
+                this.legend = '价格波动'
+                this.titleText = name+'价格波动情况'
+              }
+            if (row.异常关联类型 === '高频交易异常')
+              for (let i in res.data.data) {
+                y.push(res.data.data[i].高频交易值)
+                x.push(res.data.data[i].监测时间)
+                this.legend = '交易量波动'
+                this.titleText = name+'交易量变化情况'
+              }
+            if (row.异常关联类型 === '资产泡沫异常')
+              for (let i in res.data.data) {
+                y.push(res.data.data[i].资产泡沫值)
+                x.push(res.data.data[i].监测时间)
+                this.legend = '资产泡沫值'
+                this.titleText = name+'资产泡沫'
+              }
+
+            this.xData = x.reverse()
+            this.yData = y.reverse()
+            // this.lineData['yData']=y
+            // console.log(this.lineData)
+          })
+          http.get('/anomaly/anomaly_event/', {
+            params: {
+              time: this.formInline1.start_date,
+              market: that.selectedIndustry,
+              subject: row.名称,
+              type: row.异常关联类型
+            }
+          }).then((res) => {
+            console.log(res.data)
+          })
+        }
+
+
+
+        if (row.异常关联类型==='资产泡沫') {
+          this.detailsdialog2 = true//打开弹窗
+        }
+        if (row.异常关联类型==='事件风险波及'||row.异常关联类型==='风险事件时长'||row.异常关联类型==='事件热度异常') {
+          this.detailsdialog3 = true//打开弹窗
+        }
+        // console.log(row)
+        // http.get('/anomaly/anomaly_relevant_analyse/', {
+        //   params: {
+        //     subject: row.名称,
+        //     time: row.监测时间,
+        //     market: this.selectedIndustry,
+        //     type: row.异常关联类型
+        //   }
+        // }).then((res) => {
+        //   console.log(res.data)
+        // })
+      },
+      detail(row,date) {
+
+        let that = this
+        if (this.selectedIndustry !== 'future') {
+          if (row.异常关联类型 === '价格波动异常' || row.异常关联类型 === '高频交易异常' || row.异常关联类型 === '资产泡沫异常') {
+            this.detailsdialog1 = true//打开弹窗
+            http.get('/anomaly/sc_anomaly/', {
+              params: {
+                date: date,
+                sc: that.selectedIndustry,
+                id: row.名称,
+                type: row.异常关联类型
+              }
+            }).then((res) => {
+              let name=res.data.name!==''?res.data.name:row.名称
+              console.log(name)
+              let y = []
+              let x = []
+              if (row.异常关联类型 === '价格波动异常')
+                for (let i in res.data.data) {
+                  y.push(res.data.data[i].价格波动异常值)
+                  x.push(res.data.data[i].监测时间)
+                  this.legend = '价格波动'
+                  this.titleText = name+'价格波动情况'
+                }
+              if (row.异常关联类型 === '高频交易异常')
+                for (let i in res.data.data) {
+                  y.push(res.data.data[i].高频交易值)
+                  x.push(res.data.data[i].监测时间)
+                  this.legend = '交易量波动'
+                  this.titleText = name+'交易量变化情况'
+                }
+              if (row.异常关联类型 === '资产泡沫异常')
+                for (let i in res.data.data) {
+                  y.push(res.data.data[i].资产泡沫值)
+                  x.push(res.data.data[i].监测时间)
+                  this.legend = '资产泡沫值'
+                  this.titleText = name+'资产泡沫'
+                }
+              this.xData = x.reverse()
+              this.yData = y.reverse()
+              // this.lineData['yData']=y
+              // console.log(this.lineData)
+            })
+          }
+          if (row.异常关联类型 === '资产泡沫') {
+            this.detailsdialog2 = true//打开弹窗
+
+          }
+          if (row.异常关联类型 === '事件风险波及' || row.异常关联类型 === '风险事件时长' || row.异常关联类型 === '事件热度异常') {
+            this.detailsdialog3 = true//打开弹窗
+
+          }
+        } else {
+          if (row.异常关联类型 === '价格波动异常' || row.异常关联类型 === '高频交易异常') {
+            this.detailsdialog1 = true//打开弹窗
+            http.get('/anomaly/sc_anomaly/', {
+              params: {
+                sc: 'future',
+                date: date,
+                id: row.合约名称,
+                type: row.异常关联类型
+              }
+            }).then((res) => {
+              let y = []
+              let x = []
+              if (row.异常关联类型 === '价格波动异常')
+                for (let i in res.data.data) {
+                  y.push(res.data.data[i].价格波动异常值)
+                  x.push(res.data.data[i].监测时间)
+                }
+              this.legend = '价格波动率'
+              if (row.异常关联类型 === '高频交易异常')
+                for (let i in res.data.data) {
+                  y.push(res.data.data[i].高频交易值)
+                  x.push(res.data.data[i].监测时间)
+                }
+              this.legend = '交易量波动'
+              this.xData = x.reverse()
+              this.yData = y.reverse()
+            })
+          }
+          if (row.异常关联类型 === '资产泡沫') {
+            this.detailsdialog2 = true//打开弹窗
+
+          }
+          if (row.异常关联类型 === '事件风险波及' || row.异常关联类型 === '风险事件时长' || row.异常关联类型 === '事件热度异常') {
+            this.detailsdialog3 = true//打开弹窗
+
+          }
+        }
+        //关联实体
+        // http.get('/anomaly/anomaly_relevant_analyse/', {
+        //   params: {
+        //     subject: row.合约名称,
+        //     monitoring_time: row.监测时间,
+        //     market: this.selectedIndustry,
+        //     type: row.异常关联类型
+        //   }
+        // }).then((res) => {
+        //   console.log(res.data)
+        // })
+      },
+
+    // 打开弹窗图像
+      open(){
+              // this.$nextTick(() => {
+              // //  执行echarts方法
+              //   this.initEcharts()
+              // })
+      },
+
+
+    },
+  }
+</script>
+
+<style lang='less' scoped>
+.form{//产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:10px; 
+    // height: 40px;
+    padding-left: 20px;
+  
+   }
+   .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+   // 调整表头间隔、设置表头下方边框颜色
+  .table{
+    padding: 0px 20px 2px 20px;//返回表格添加间隙 上 右
+    // font-size: 12px;
+    // color: #606266;
+
+    // 调整表头间隔、设置表头下方边框颜色
+    .text{
+      color:rgba(2, 167, 240, 0.729411764705882);
+    }
+
+}
+.detail_table{
+  margin-top: 15px;
+  margin-left: 10px;
+  margin-right: 0px;
+/deep/ .el-table {
+  width: 98.5% !important;
+}
+}
+ // 右侧空只能这样调整，左侧必须用margin
+ /deep/ .el-table {
+    width: 97.5% !important;
+    // margin-right: 10px;
+  }
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 1px 1px 1px;
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0;
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #333333;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+.sublabel{ // 小标签标识
+    // font-size: 13px;
+    // padding:2px;
+    margin-top:10px;
+    background-color: rgba(2, 167, 240, 0.5);
+    width: 5px;
+    height: 35px;
+}
+.title{
+    padding-left: 4px;
+    margin-top:15px;
+    font-weight: bold;//字体加粗
+    display:flex;
+    justify-content:flex-start
+}
+
+
+</style>
diff --git a/src_old/views/系统性风险分析.vue b/src_old/views/系统性风险分析.vue
new file mode 100644
index 0000000..6a95f1d
--- /dev/null
+++ b/src_old/views/系统性风险分析.vue
@@ -0,0 +1,203 @@
+<!-- 系统风险分析，原市场分析拆分、新增、11.6合并-->
+<template>
+    <div>
+      <div class="one">
+        <!-- 卡片化的标签页 -->
+
+
+            <el-card style='height: 440px;margin-bottom:10px;' :body-style={padding:0}>
+            <!-- height:400px -->
+            <!-- 1、上标 -->
+            <span class="superscript" style="width: 20px; height: 40px;">资本市场系统性风险指数监测
+</span>
+
+            <!-- 添加折线图 -->
+
+              <component :is="compName" :zoom="datazoom" @datazoom="changeComp" ></component>
+<!--            <system-risk-component/>-->
+
+            </el-card>
+
+            <el-card style="height: 550px;margin-top: 10px" :body-style={padding:0}>
+              <span class="superscript" style="width: 20px; height: 20px;">维度时序</span>
+              <dimension-component :zoom="datazoom"/>
+
+
+            </el-card>
+            <el-card style='height: 600px;margin-top: 10px;' :body-style={padding:0}>
+              <!-- height:400px -->
+              <!-- 1、上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">系统性影响指标分析</span>
+
+              <!-- 3、tab -->
+              <el-tabs type="border-card" style='margin: 20px 20px 0 20px;' @tab-click="handleClick">
+
+                <!-- 收益率传染 -->
+                <el-tab-pane label="个体风险状态" :lazy='true'>
+                <market-risk-component :zoom="datazoom" :title="'个体风险状态'"/>
+                </el-tab-pane>
+
+<!--                延迟渲染  lazy true-->
+                <!-- 波动传染 -->
+                <el-tab-pane label="风险关联与溢出" :lazy='true'>
+                  <market-risk-component :zoom="datazoom" :title="'风险关联与溢出'"/>
+                </el-tab-pane>
+
+                <el-tab-pane label="市场系统结构" :lazy='true'>
+                  <market-risk-component :zoom="datazoom" :title="'市场系统结构'"/>
+                </el-tab-pane>
+
+                <el-tab-pane label="市场波动和趋势" :lazy='true'>
+                  <market-risk-component :zoom="datazoom" :title="'市场波动和趋势'"/>
+                </el-tab-pane>
+              </el-tabs>
+<!--              <div class="warning-component">-->
+<!--                <div class="warning-dates">-->
+<!--                  <div class="date-item">前日：<span>{{ prevDayIndex }}</span></div>-->
+<!--                  <div class="date-item">昨日：<span>{{ yesterdayIndex }}</span></div>-->
+<!--                  <div class="date-item">今日：<span>{{ todayIndex }}</span></div>-->
+<!--                  <div class="date-item">明日：<span>{{ tomorrowIndex }}</span></div>-->
+<!--                </div>-->
+<!--              </div>-->
+            </el-card>
+
+        <el-card style="height: 450px;margin-top: 10px" :body-style={padding:0}>
+          <span class="superscript" style="width: 20px; height: 20px;">宏观经济指标</span>
+          <system-risk-future/>
+
+
+        </el-card>
+
+            <!--            <market-risk-component/>-->
+<!--            <MarketRisk/>-->
+
+
+      </div>
+
+
+    </div>
+  </template>
+  
+  <script>
+import systemRiskComponent from '@/components/systemRiskComponent';
+import marketRiskComponent from "@/components/riskIndexComponent";
+import dimensionComponent from "@/components/dimensionComponent";
+import systemRiskFuture from "@/components/systemRiskFuture";
+export default {
+    name:'systemRisk',
+    components:{
+      systemRiskFuture,
+      dimensionComponent,
+      systemRiskComponent,
+      marketRiskComponent
+},
+    data () {
+      return {
+        datazoom:[],
+        compName:'systemRiskComponent',
+        prevDayIndex:'',
+        yesterdayIndex:'',
+        todayIndex:'',
+        tomorrowIndex:'',
+  state:'个体风险状态'
+  }
+    },
+    mounted(){
+
+    },
+    methods:{
+      changeComp(mesg){
+        this.datazoom=mesg
+        console.log(mesg)
+      },
+      // handleClick(tab, event) {
+      //   this.state=tab.label
+      // }
+      changeState(){
+        let lis=['个体风险状态','风险关联与溢出','市场系统结构','市场波动和趋势']
+        this.state=lis.indexOf(this.state)+1>3? '个体风险状态':lis[lis.indexOf(this.state)+1]
+      }
+    },
+  }
+  </script>
+  
+  <style lang="less" scoped>
+  .button {
+    border-radius: 7px;
+    width: 160px;
+    height: 30px;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    gap: 12px;
+    cursor: pointer;
+    border: 3px solid rgb(94, 255, 209);
+    background-color: rgb(94, 255, 209);
+    box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.137);
+  }
+
+  .text {
+
+    width: 70%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    //background-color: rgb(255, 255, 255);
+    color: black;
+  }
+
+  .arrow path {
+    fill: rgb(19, 19, 19);
+  }
+
+  .button:hover .arrow {
+    animation: slide-in-left 0.6s cubic-bezier(0.250, 0.460, 0.450, 0.940) both;
+  }
+
+  @keyframes slide-in-left {
+    0% {
+      transform: translateX(-8px);
+      opacity: 0;
+    }
+
+    100% {
+      transform: translateX(0px);
+      opacity: 1;
+    }
+  }
+
+  .button:active {
+    transform: scale(0.97);
+  }
+  .warning-component {
+    background-color: #ffffff;
+    border: 1px solid #ddd;
+    border-radius: 8px;
+    padding: 10px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    max-width: 100%;
+    text-align: center;
+
+    margin: auto;
+  }
+
+  .warning-dates {
+    display: flex;
+    justify-content: space-between;
+    //margin-bottom: 10px;
+  }
+
+  .date-item {
+    margin: 0 10px;
+    font-weight: bold;
+  }
+
+  .warning-recent {
+    color: #ff4d4f;
+    font-weight: bold;
+    margin-bottom: 10px;
+  }
+
+  </style>
+  
\ No newline at end of file
diff --git a/src_old/views/系统性风险分析old.vue b/src_old/views/系统性风险分析old.vue
new file mode 100644
index 0000000..456fe2c
--- /dev/null
+++ b/src_old/views/系统性风险分析old.vue
@@ -0,0 +1,303 @@
+<!-- 系统风险分析，原市场分析拆分、新增、11.6合并-->
+<template>
+    <div>
+      <!-- 图谱，之前的在risk -->
+      <div class="one">
+        <!-- 卡片化的标签页 -->
+        <el-tabs type="border-card">
+          <!-- 【1】股市 -->
+          <el-tab-pane label="股市">
+            <el-card style='height: 420px;margin-bottom:10px;' :body-style={padding:0}>
+            <!-- height:400px -->
+            <!-- 1、上标 -->
+            <span class="superscript" style="width: 20px; height: 40px;">股票市场系统性风险分析</span>
+            <!-- 2、产品搜索栏 -->
+
+            <div class="form">
+                                                                <!-- inline="true"表单域在一行 -->
+                <el-form :inline="true"  class="demo-form-inline" :model="formInline1" ref="formInline1">
+
+                    <el-form-item label="开始时间" prop="开始时间">
+                      <el-date-picker
+                          v-model="formInline1.start_date"
+                          type="date"
+                          placeholder="年/月/日"
+                          size="mini"
+                          >
+                      </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="结束时间" prop="结束时间">
+                    <el-date-picker
+                        v-model="formInline1.end_date"
+                        type="date"
+                        placeholder="年/月/日"
+                        size="mini"
+                        >
+                    </el-date-picker>
+                </el-form-item>
+                    <el-form-item>
+                    <el-button class="grayish_btn" @click="onSubmit1" size="mini" >查询</el-button>
+                    </el-form-item>
+
+
+                </el-form>
+            </div>
+            <!-- 添加折线图 -->
+            <DynamicLine/>
+            <!-- <half-doughnut :key='1' :myHalfData="myHalfData1"></half-doughnut> -->
+            </el-card>
+            <MarketRisk/>
+          </el-tab-pane>
+
+        <!-- 【2】债市 -->
+        <el-tab-pane label="债市">
+          <el-card style='height: 420px;margin-bottom: 10px;' :body-style={padding:0}>
+            <!-- height:400px -->
+            <!-- 1、上标 -->
+            <span class="superscript" style="width: 20px; height: 40px;">债市异常检测</span>
+            <!-- 2、产品搜索栏 -->
+
+            <div class="form">
+                                                                <!-- inline="true"表单域在一行 -->
+                <el-form :inline="true"  class="demo-form-inline" :model="formInline2" ref="formInline2">
+                    <el-form-item label="开始时间" prop="开始时间">
+                    <el-date-picker
+                        v-model="formInline2.start_date"
+                        type="date"
+                        placeholder="年/月/日"
+                        size="mini">
+                    </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="结束时间" prop="结束时间">
+                    <el-date-picker
+                        v-model="formInline2.end_date"
+                        type="date"
+                        placeholder="年/月/日"
+                        size="mini">
+                    </el-date-picker>
+                </el-form-item>
+                    <el-form-item>
+                    <el-button class="grayish_btn" @click="onSubmit2" size="mini">查询</el-button>
+                    </el-form-item>
+
+
+                </el-form>
+            </div>
+            <!-- 添加折线图 -->
+          <DynamicLine/>
+            <!-- <half-doughnut :key='1' :myHalfData="myHalfData1"></half-doughnut> -->
+          </el-card>
+          <MarketRisk/>
+        </el-tab-pane>
+
+          <!-- 【3】期货 -->
+          <el-tab-pane label="期货">
+            <el-card style='height: 800px;margin-bottom: 10px;' :body-style={padding:0}>
+            <!-- height:400px -->
+            <!-- 1、上标 -->
+            <span class="superscript" style="width: 20px; height: 40px;">期货市场分析</span>
+              <!-- 添加关系图谱 -->
+              <el-row :gutter="20">
+                <el-col :span="18">
+                  <div style="margin:20px">
+                    <!-- 图谱待定 -->
+                    <QiPao></QiPao>
+                  </div>
+                </el-col>
+                <el-col :span="6">
+                  <div style="margin-right: 10px;">
+                      <!-- 表 -->
+                      <el-table class='table' :data="tableData1"
+
+                          :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)',marginright:'20px'}"
+                          header-row-class-name="active_header"
+                          header-cell-class-name="active_header"
+                          cell-class-name="content_center"
+
+                          :row-style="{height:'28px',marginright:'20px'}"
+                          :cell-style="{padding:'0px',marginright:'20px'}"
+                          style="margin-right:20px;">
+                        <!-- border -->
+                          <el-table-column
+                              prop="value_label"
+                              label="行情风险评估"
+                              width='200px'>
+                          </el-table-column>
+                          <el-table-column
+                              prop="value"
+                              label="评估值"
+                              width='100px'
+                              >
+                          </el-table-column>
+
+                      </el-table>
+                  </div>
+                </el-col>
+              </el-row>
+            </el-card>
+            <MarketRisk/>
+          </el-tab-pane>
+        </el-tabs>
+
+      </div>
+
+
+    </div>
+  </template>
+  
+  <script>
+import MarketRisk from "/src/views/MarketRisk.vue";
+import DynamicLine from "@/components/echarts/DynamicLine.vue";
+import QiPao from "@/components/QiPao";
+  export default {
+    name:'systemRisk',
+    components:{
+    MarketRisk,
+    DynamicLine,
+      QiPao,
+
+},
+    data () {
+      return {
+  // 【整合接收数据】
+          formInline1: {
+          market:'',
+          industry:'',
+          start_date:'',
+          end_date:'',
+      },
+      formInline2: {
+          market:'',
+          industry:'',
+          start_date:'',
+          end_date:'',
+      },
+  // 【表格】
+      tableData1: [
+  {
+      value_label:'沪银主连',
+      value:0.25
+  },
+  {
+      value_label:'沪铝主连',
+      value:0.18
+  },
+  {
+      value_label:'氧化铝主连',
+      value:0.17
+  },
+  {
+      value_label:'苹果主连',
+      value:0.17
+  },
+  {
+      value_label:'沪金主连',
+      value:0.14
+  },
+  {
+      value_label:'国际铜主连',
+      value:0.14
+  },
+  {
+      value_label:'合成橡胶主连',
+      value:0.14
+  },
+  {
+      value_label:'综合评估',
+      value:"良好"
+  },
+  ],
+      tableData2: [
+          { 
+              异常关联类型: '股价波动异常',
+              涉及股票: '股票1',
+              },
+          { 
+              异常关联类型: '高频交易',
+              涉及股票: '股票1',
+          },
+          { 
+              异常关联类型: '资产泡沫',
+              涉及股票: '股票1',
+          },
+            
+          ],
+      tableLabel: {
+          编号: '编号',
+          异常关联类型: '异常关联类型',
+          涉及股票: '涉及股票',
+          监测时间: '监测时间',
+          股票价格: '股票价格',
+          交易数量: '交易数量',
+          风险等级: '风险等级',
+      },
+  }
+    },
+    mounted(){
+
+    },
+    methods:{
+
+      onSubmit1(){},
+      onSubmit2(){},
+      detail(row){}
+    },
+  }
+  </script>
+  
+  <style lang="less" scoped>
+  /deep/ .form{//产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:10px; 
+    // height: 40px;
+    margin-left: 20px;
+    margin-bottom: 0px !important;
+    padding-bottom: 0px !important;
+
+  
+   }
+   .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+   // 调整表头间隔、设置表头下方边框颜色
+   .table{
+  // 和选项框隔开
+  // margin:10px;
+  // font-size: 12px;
+  padding: 0px 5px 2px 5px;//返回表格添加间隙 上 右
+
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 1px 1px 1px; 
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0; 
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #333333;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+}
+  </style>
+  
\ No newline at end of file
diff --git a/src_old/views/行情分析.vue b/src_old/views/行情分析.vue
new file mode 100644
index 0000000..9692552
--- /dev/null
+++ b/src_old/views/行情分析.vue
@@ -0,0 +1,991 @@
+<template>
+    <div >
+      <!-- 卡片化的标签页 -->
+      <el-tabs type="card">
+        <!-- 1、大盘指数 -->
+            <el-tab-pane label="大盘指数">
+              <el-card style=" height:80px; border: 1px solid #7f7f7f;" :body-style={padding:0} >         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+                  <div class="card_label" style=" height: 26px;width: 100%; text-align: center;">条件查询</div>
+
+                  <div class="form">                                                         <!-- inline="true"表单域在一行 -->
+                    <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+                      <el-form-item label="开始时间">
+                        <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+                      </el-form-item>
+                      <el-form-item label="结束时间">
+                        <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+                      </el-form-item>
+                      <el-form-item>
+                        <el-button class="grayish_btn" @click="onSubmit1"  size="mini" style=" margin-right: 20px;">查询</el-button>
+                      </el-form-item>
+
+                    </el-form>
+                  </div>
+              </el-card>
+              <div class="line_labels">
+                  <span style="margin-left:10px;margin-right:370px">上证指数</span>
+                  <span style="margin-right:370px">深成指数</span>
+                  <span>创业指数</span>
+              </div>
+
+              <div class="line_charts">
+                        <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+                        <!-- margin-right可以改距离，但padding不行 -->
+   
+
+                  <div ref="echarts_1" style="height:300px;width:390px; border: 10px solid #e0e0e0;margin-right:20px"></div>
+
+                  <div ref="echarts_2" style="height:300px;width:390px; border: 10px solid #e0e0e0;margin-right:20px"></div>
+
+                  <div ref="echarts_3" style="height:300px;width:390px; border: 10px solid #e0e0e0"></div>
+              </div>
+            </el-tab-pane>
+
+        <!-- 2、板块 -->
+            <el-tab-pane label="板块">
+              <el-card style=" height:80px; border: 1px solid #7f7f7f;" :body-style={padding:0} >         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+                  <div class="card_label" style=" height: 26px;width: 100%; text-align: center;">条件查询</div>
+
+                  <div class="form">                                                         <!-- inline="true"表单域在一行 -->
+                    <el-form :inline="true"  :model="formInline2" class="demo-form-inline">
+                      <!-- <el-form-item label="开始时间">
+                        <el-date-picker  v-model="formInline.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+                      </el-form-item>
+                      <el-form-item label="结束时间">
+                        <el-date-picker v-model="formInline.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+                      </el-form-item> -->
+                      <el-form-item label="板块 " style=" margin-right: 40px;">
+                        <el-select   v-model="formInline2.sector" placeholder="请选择板块" size="mini">
+                          <el-option v-for="item in options_sector" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                        </el-select>
+                                </el-form-item>
+                      <el-form-item>
+                        <el-button class="grayish_btn" @click="onSubmit2"  size="mini" style=" margin-right: 20px;">查询</el-button>
+                      </el-form-item>
+
+                    </el-form>
+                  </div>
+              </el-card>
+              <div class="table"  style="  padding: 20px 10px 2px 0px;"><!--板块表格 -->
+                          <el-table :data="tableData_sector" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                                  border  
+                                  :row-style="{height:'28px'}"
+                                  :cell-style="{padding:'3px'}"
+                                  header-row-class-name="active_header"
+                                  header-cell-class-name="active_header"
+                                  cell-class-name="content_center"
+                                  style="width: 100%; border: 1px solid #7f7f7f">          <!-- style="width: 40%"               height="215"  -->
+                                
+                                  <el-table-column prop="ranking" label="排名" sortable></el-table-column>
+                                  <el-table-column v-for='(val,key) in tableLabel_sector' :prop="key" :label="val" ><!--插槽里面没有东西就可以用单标签  -->
+                                  </el-table-column>
+                          </el-table>
+              </div>
+
+
+            </el-tab-pane>
+
+        <!-- 3、查询 -->
+            <el-tab-pane label="查询">
+              <el-tabs type="card">
+                  <!-- 股票 -->
+                  <el-tab-pane label="股票">
+                      <el-card style=" height:80px; border: 1px solid #7f7f7f;" :body-style={padding:0} >         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+                      <div class="card_label" style=" height: 26px;width: 100%; text-align: center;">条件查询</div>
+
+                      <div class="form">                                                         <!-- inline="true"表单域在一行 -->
+                        <el-form :inline="true"  :model="formInline3_1" class="demo-form-inline">
+                          <el-form-item label="开始时间">
+                            <el-date-picker  v-model="formInline3_1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+                          </el-form-item>
+                          <el-form-item label="结束时间">
+                            <el-date-picker v-model="formInline3_1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+                          </el-form-item>
+                          <el-form-item label="股票名称 " style=" margin-right: 40px;">
+                            <el-input  v-model="formInline3_1.stock" placeholder="请输入股票名称" size="mini"></el-input>
+                          </el-form-item>
+                          <el-form-item>
+                            <el-button class="grayish_btn" @click="onSubmit3_stock"  size="mini" style=" margin-right: 20px;">查询</el-button>
+                          </el-form-item>
+                          <el-form-item>
+                            <el-button class="grayish_btn" @click="chart_stock"  size="mini" style=" margin-right: 20px;">查看股票图像</el-button>
+                          </el-form-item>
+                
+
+
+                        </el-form>
+                      </div>
+                      </el-card>
+                      <div class="table"  style="  padding: 20px 10px 2px 0px;">   <!-- 股票表格 -->
+                                  <el-table :data="tableData_stock" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                                          border  
+                                          :row-style="{height:'28px'}"
+                                          :cell-style="{padding:'3px'}"
+                                          header-row-class-name="active_header"
+                                          header-cell-class-name="active_header"
+                                          cell-class-name="content_center"
+                                          style="width: 100%; border: 1px solid #7f7f7f">          <!-- style="width: 40%"               height="215"  -->
+                                        
+                                      <el-table-column v-for='(val,key) in tableLabel_inquiry' :prop="key" :label="val" ><!--插槽里面没有东西就可以用单标签  -->
+                                      </el-table-column>
+
+                                      <el-table-column prop="follow" label="关注">
+                                        <template slot-scope="scope">
+                                          <el-button type="primary" @click="follow"  size="mini" >关注</el-button>
+                                        </template>
+                                      </el-table-column>
+
+
+                                  </el-table>
+                      </div>
+                    
+
+
+                  </el-tab-pane>
+
+                  <!-- 基金 -->
+                  <el-tab-pane label="基金">
+                    <el-card style=" height:80px; border: 1px solid #7f7f7f;" :body-style={padding:0} >         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+                      <div class="card_label" style=" height: 26px;width: 100%; text-align: center;">条件查询</div>
+
+                      <div class="form">                                                         <!-- inline="true"表单域在一行 -->
+                        <el-form :inline="true"  :model="formInline3_2" class="demo-form-inline">
+                          <el-form-item label="开始时间">
+                            <el-date-picker  v-model="formInline3_2.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+                          </el-form-item>
+                          <el-form-item label="结束时间">
+                            <el-date-picker v-model="formInline3_2.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+                          </el-form-item>
+                          <el-form-item label="基金名称 " style=" margin-right: 40px;">
+                            <el-input  v-model="formInline3_2.fund" placeholder="请输入股票名称" size="mini"></el-input>
+                          </el-form-item>
+                          <el-form-item>
+                            <el-button class="grayish_btn" @click="onSubmit3_fund"  size="mini" style=" margin-right: 20px;">查询</el-button>
+                          </el-form-item>
+                          <el-form-item>
+                            <el-button class="grayish_btn" @click="chart_fund"  size="mini" style=" margin-right: 20px;">查看基金图像</el-button>
+                          </el-form-item>
+
+                        </el-form>
+                      </div>
+                    </el-card>
+                      <div class="table"  style="  padding: 20px 10px 2px 0px;"><!--基金表格 -->
+                                  <el-table :data="tableData_fund" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                                          border  
+                                          :row-style="{height:'28px'}"
+                                          :cell-style="{padding:'3px'}"
+                                          header-row-class-name="active_header"
+                                          header-cell-class-name="active_header"
+                                          cell-class-name="content_center"
+                                          style="width: 100%; border: 1px solid #7f7f7f">          <!-- style="width: 40%"               height="215"  -->
+                                        
+                                      <el-table-column v-for='(val,key) in tableLabel_inquiry' :prop="key" :label="val" ><!--插槽里面没有东西就可以用单标签  -->
+                                      </el-table-column>
+
+                                      <el-table-column prop="follow" label="关注">
+                                        <template slot-scope="scope">
+                                          <el-button type="primary" @click="follow"  size="mini" >关注</el-button>
+                                        </template>
+                                      </el-table-column>
+                                  </el-table>
+                      </div>
+                    
+
+
+                  </el-tab-pane>
+                </el-tabs>
+            </el-tab-pane>
+
+        <!-- 4、我的管理 -->
+        <el-tab-pane label="我的管理">
+            <el-tabs type="card">
+              <!-- 股票 -->
+              <el-tab-pane label="股票">
+              </el-tab-pane>
+              <!-- 基金 -->
+              <el-tab-pane label="基金">
+              </el-tab-pane>
+            </el-tabs>
+              
+          <div class="table"  style="  padding: 20px 10px 2px 0px;"><!-- 我的管理的表格 -->
+                                  <el-table :data="tableData_management" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                                          border  
+                                          :row-style="{height:'28px'}"
+                                          :cell-style="{padding:'3px'}"
+                                          header-row-class-name="active_header"
+                                          header-cell-class-name="active_header"
+                                          cell-class-name="content_center"
+                                          style="width: 100%; border: 1px solid #7f7f7f">          <!-- style="width: 40%"               height="215"  -->
+                                        
+                                      <el-table-column v-for='(val,key) in tableLabel_management' :prop="key" :label="val" ><!--插槽里面没有东西就可以用单标签  -->
+                                      </el-table-column>
+
+                                      <el-table-column prop="follow" label="关注">
+                                        <template slot-scope="scope">
+                                          <el-button type="primary" @click="follow"  size="mini" >关注</el-button>
+                                        </template>
+                                      </el-table-column>
+                                  </el-table>
+          </div>
+                    
+
+
+        </el-tab-pane>
+      </el-tabs>
+      
+        <!-- 弹窗1 -->
+        <div>
+          	<!-- 详细信息弹窗，默认关闭 -->
+         	<el-dialog 
+           :visible.sync="detailsdialog_fund" 
+           @open="open()"
+           width="80%">
+              <div ref="echarts_4" style="height:300px; border: 10px solid #e0e0e0;margin-right:20px"></div>
+              <div ref="echarts_5" style="height:300px; border: 10px solid #e0e0e0;margin-right:20px"></div>
+
+            
+          </el-dialog>
+        </div>
+
+        <!-- 弹窗2 -->
+        <div>
+          	<!-- 详细信息弹窗，默认关闭 -->
+         	<el-dialog 
+           :visible.sync="detailsdialog_stock" 
+           @open="open()"
+           width="80%">
+              <div ref="echarts_4" style="height:300px; border: 10px solid #e0e0e0;margin-right:20px"></div>
+              <div ref="echarts_5" style="height:300px; border: 10px solid #e0e0e0;margin-right:20px"></div>
+
+            
+          </el-dialog>
+        </div>
+    </div>
+</template>
+
+<script>
+import * as echarts from "echarts"
+import http from '../utils/request'
+export default {
+    //引入组件
+  components: {
+
+  },
+    data() {
+      return {
+  
+// 【详情页】
+    // 详情页是否打开的判断标签
+    detailsdialog_stock: false,
+    detailsdialog_fund: false,
+
+
+    // 详情页的图像数据
+    lineData_1:[["2000-06-05", 116], ["2000-06-06", 129], ["2000-06-07", 135], ["2000-06-08", 86], ["2000-06-09", 73], ["2000-06-10", 85], ["2000-06-11", 73], ["2000-06-12", 68], ["2000-06-13", 92], ["2000-06-14", 130], ["2000-06-15", 245], ["2000-06-16", 139], ["2000-06-17", 115], ["2000-06-18", 111], ["2000-06-19", 309], ["2000-06-20", 206], ["2000-06-21", 137], ["2000-06-22", 128], ["2000-06-23", 85], ["2000-06-24", 94], ["2000-06-25", 71], ["2000-06-26", 106], ["2000-06-27", 84], ["2000-06-28", 93], ["2000-06-29", 85], ["2000-06-30", 73], ["2000-07-01", 83], ["2000-07-02", 125], ["2000-07-03", 107], ["2000-07-04", 82], ["2000-07-05", 44], ["2000-07-06", 72], ["2000-07-07", 106], ["2000-07-08", 107], ["2000-07-09", 66], ["2000-07-10", 91], ["2000-07-11", 92], ["2000-07-12", 113], ["2000-07-13", 107], ["2000-07-14", 131], ["2000-07-15", 111], ["2000-07-16", 64], ["2000-07-17", 69], ["2000-07-18", 88], ["2000-07-19", 77], ["2000-07-20", 83], ["2000-07-21", 111], ["2000-07-22", 57], ["2000-07-23", 55], ["2000-07-24", 60]],
+
+// 【分页组件的数据】
+        total:10,
+        page_size:1,
+        currentPage:2,
+// 【整合接收数据】
+        formInline1: {
+        // 第1栏"大盘指数"
+          start_date:'',
+          end_date:'',
+          },
+          formInline2: {
+        // 第2栏"板块"
+          sector:'',
+        },
+       // 第3栏"查询"-股票
+          formInline3_1: {
+
+          start_date:'',
+          end_date:'',
+          stock: '',
+        },
+        // 第3栏"查询"-基金
+          formInline3_2: {
+          start_date:'',
+          end_date:'',
+          fund:'',
+          // industry:'',//行业独有
+          // province:'',//地域独有
+      },
+// 【搜索栏】
+      options_sector:[
+          {value: "行业板块",
+          label: "行业板块"}, 
+          {value: "地域板块",
+          label: "地域板块"}, 
+          {value: "概念板块",
+          label: "概念板块"}, 
+          ],
+// 【表格】
+// [table-label]
+      tableLabel_sector: {//第2栏"板块"的表格
+        code:'代码',
+        板块: '板块名称',
+        涨跌幅: '涨跌幅',
+        换手率: '换手率',
+        上涨家数: '上涨家数',
+        下跌家数: '下跌家数',
+        领涨股票: '领涨股票',
+        涨跌幅_: '该股涨跌幅',
+      },
+      
+
+
+      tableLabel_inquiry: {//第3栏"查询"的表格_fund and stock
+        order:'序号',
+        emcode: '板块名称',
+        emname:'名称',
+        growth: '涨跌幅',
+        date:'时间',
+        nav:'涨跌额',// change amount
+        turnover: '成交量',
+        volume : '成交额',
+        amplitude: '振幅',
+        max: '最高',
+        min: '最低',
+        open:'今开',
+        prev_close:'昨收',
+        turnoverRate: '换手率',
+
+      },
+
+      
+      tableLabel_management:{//第4栏
+        order:'序号',
+        emcode: '板块名称',
+        emname:'名称',
+        growth: '涨跌幅',
+        date:'时间',
+        nav:'涨跌额',// change amount
+        turnover: '成交量',
+        volume : '成交额',
+        amplitude: '振幅',
+        max: '最高',
+        min: '最低',
+        open:'今开',
+        prev_close:'昨收',
+        turnoverRate: '换手率',
+      },
+
+// [table-data]
+      // 第2栏"板块"表格
+      tableData_sector: [{}
+       
+      ],
+
+      // 第3栏"板块-股票"表格
+      tableData_stock: [{}
+
+      ],
+
+      // 第3栏"板块-基金"表格
+        tableData_fund: [
+          { }
+          
+
+        ],
+      // 第3栏"板块-我的管理"表格
+        tableData_management: [
+
+
+        ]
+
+      }
+    },
+    mounted(){
+
+    const echarts1 = echarts.init(this.$refs.echarts_1)
+    const echarts2 = echarts.init(this.$refs.echarts_2)
+    const echarts3 = echarts.init(this.$refs.echarts_3)
+  
+    // 折线图-1
+    let base = +new Date(1988, 9, 3);
+    let oneDay = 24 * 3600 * 1000;
+    let data = [[base, Math.random() * 300]];
+    console.log(data)
+    for (let i = 1; i < 20000; i++) {
+      let now = new Date((base += oneDay));
+      data.push([+now, Math.round((Math.random() - 0.5) * 20 + data[i - 1][1])]);
+    }
+    const option_1 = {
+      
+      tooltip: {
+        trigger: 'axis'
+      },
+      title: {
+        // left: 'center',
+        text: '上证指数',
+        textStyle: {
+          fontSize: 13,
+        },
+      },
+      // 右上角存图
+      toolbox: {
+        feature: {
+          saveAsImage: {}
+        }
+      },
+      xAxis: {
+        type: 'time',
+        boundaryGap: false
+      },
+      yAxis: {
+        type: 'value',
+        boundaryGap: [0, '100%']
+      },
+      dataZoom: [
+        {
+          type: 'inside',
+          start: 0,
+          end: 20
+        },
+        {
+          start: 0,
+          end: 20
+        }
+      ],
+      series: [
+        {
+          name: 'Fake Data',
+          type: 'line',
+          smooth: true,
+          symbol: 'none',
+          areaStyle: {},
+          data: data
+        }
+      ]
+    };
+    echarts1.setOption(option_1)
+    echarts2.setOption(option_1)
+    echarts3.setOption(option_1)
+
+
+      
+
+    },
+
+    methods: {
+
+      // 3折线图
+      onSubmit1(){//大盘指数-无数据 待完成
+        console.log("查询")
+        // 使用formInline1-两个参数
+        // start_date:this.formInline1.start_date,
+        // end_date:this.formInline1.end_date,）
+      },
+      // 表
+      onSubmit2(){//板块
+        console.log("板块查询")
+        http.get(
+                "/price/bkall/",
+                {params:{
+                    com_name: this.formInline2.sector,
+                    // start_date:this.formInline.start_date,
+                    // end_date:this.formInline.end_date,
+        }}).then(response => {
+            this.tableData_sector= response.data
+            console.log(response)
+            console.log(response.data)
+
+          })
+      },
+      // 表
+      onSubmit3_stock(){//股票
+        console.log("股票查询")
+        console.log(this.formInline3_1)
+        http.get(
+                "/price/stock/",
+                {params:{
+                    com_name: this.formInline3_1.stock,
+                    start_date:this.formInline3_1.start_date,
+                    end_date:this.formInline3_1.end_date,
+        }}).then(response => {
+            this.tableData_stock= response.data
+            // 把股票图像数据也传过去（待完成）
+            console.log(response)
+            console.log(response.data)
+
+          })
+      },
+      // 表
+      onSubmit3_fund(){//基金
+        console.log("基金查询")
+        console.log(this.formInline3_2)
+        http.get(
+                "/price/fund/",
+                {params:{
+                    com_name: this.formInline3_2.fund,
+                    start_date:this.formInline3_2.start_date,
+                    end_date:this.formInline3_2.end_date,
+        }}).then(response => {
+            this.tableData_fund = response.data
+            // 把基金图像数据也传过去（待完成）
+            console.log(response)
+            console.log(response.data)
+
+          })
+      },
+
+      follow(){
+        console.log("关注")
+      },
+
+      // 详情图像
+      chart_stock(){
+        console.log("查看详情")
+        this.detailsdialog_stock = true//打开弹窗
+      },
+      chart_fund(){
+        console.log("查看详情")
+        this.detailsdialog_fund = true//打开弹窗
+      },
+
+
+      initEcharts() {
+            // 查询、我的管理 详细页面图像
+        const echarts4= echarts.init(this.$refs.echarts_4)
+        const option_4 = {
+          // Make gradient line here
+          visualMap: [
+            {
+              show: false,
+              type: 'continuous',
+              seriesIndex: 0,
+              min: 0,
+              max: 400
+            },
+            
+          ],
+          // title: [
+          //   {
+          //   x :'center',
+          //   y:'bottom',
+              
+          //     text: '各行业风险价值（机构处于极端困难情况时）的时序变化'
+          //   },
+          // ],
+          tooltip: {
+            trigger: 'axis'
+          },
+          xAxis: [
+            {data: this.dateList(this.lineData_1)},
+          
+          ],
+          yAxis: [
+            {},
+          ],
+
+          series: [
+            {
+              type: 'line',
+              showSymbol: true,
+              // color：
+              data: this.valueList(this.lineData_1)
+            },
+          
+          ]
+        };
+        echarts4.setOption(option_4)
+
+        const echarts5= echarts.init(this.$refs.echarts_5)
+        const upColor = '#ec0000';
+        const upBorderColor = '#8A0000';
+        const downColor = '#00da3c';
+        const downBorderColor = '#008F28';
+        // Each item: open，close，lowest，highest
+        const data0 = splitData([
+          ['2013/1/24', 2320.26, 2320.26, 2287.3, 2362.94],
+          ['2013/1/25', 2300, 2291.3, 2288.26, 2308.38],
+          ['2013/1/28', 2295.35, 2346.5, 2295.35, 2346.92],
+          ['2013/1/29', 2347.22, 2358.98, 2337.35, 2363.8],
+          ['2013/1/30', 2360.75, 2382.48, 2347.89, 2383.76],
+          ['2013/1/31', 2383.43, 2385.42, 2371.23, 2391.82],
+          ['2013/2/1', 2377.41, 2419.02, 2369.57, 2421.15],
+          ['2013/2/4', 2425.92, 2428.15, 2417.58, 2440.38],
+          ['2013/2/5', 2411, 2433.13, 2403.3, 2437.42],
+          ['2013/2/6', 2432.68, 2434.48, 2427.7, 2441.73],
+          ['2013/2/7', 2430.69, 2418.53, 2394.22, 2433.89],
+          ['2013/2/8', 2416.62, 2432.4, 2414.4, 2443.03],
+          ['2013/2/18', 2441.91, 2421.56, 2415.43, 2444.8],
+          ['2013/2/19', 2420.26, 2382.91, 2373.53, 2427.07],
+          ['2013/2/20', 2383.49, 2397.18, 2370.61, 2397.94],
+          ['2013/2/21', 2378.82, 2325.95, 2309.17, 2378.82],
+          ['2013/2/22', 2322.94, 2314.16, 2308.76, 2330.88],
+          ['2013/2/25', 2320.62, 2325.82, 2315.01, 2338.78],
+          ['2013/2/26', 2313.74, 2293.34, 2289.89, 2340.71],
+          ['2013/2/27', 2297.77, 2313.22, 2292.03, 2324.63],
+          ['2013/2/28', 2322.32, 2365.59, 2308.92, 2366.16],
+          ['2013/3/1', 2364.54, 2359.51, 2330.86, 2369.65],
+          ['2013/3/4', 2332.08, 2273.4, 2259.25, 2333.54],
+          ['2013/3/5', 2274.81, 2326.31, 2270.1, 2328.14],
+          ['2013/3/6', 2333.61, 2347.18, 2321.6, 2351.44],
+          ['2013/3/7', 2340.44, 2324.29, 2304.27, 2352.02],
+          ['2013/3/8', 2326.42, 2318.61, 2314.59, 2333.67],
+          ['2013/3/11', 2314.68, 2310.59, 2296.58, 2320.96],
+          ['2013/3/12', 2309.16, 2286.6, 2264.83, 2333.29],
+          ['2013/3/13', 2282.17, 2263.97, 2253.25, 2286.33],
+          ['2013/3/14', 2255.77, 2270.28, 2253.31, 2276.22],
+          ['2013/3/15', 2269.31, 2278.4, 2250, 2312.08],
+          ['2013/3/18', 2267.29, 2240.02, 2239.21, 2276.05],
+          ['2013/3/19', 2244.26, 2257.43, 2232.02, 2261.31],
+          ['2013/3/20', 2257.74, 2317.37, 2257.42, 2317.86],
+          ['2013/3/21', 2318.21, 2324.24, 2311.6, 2330.81],
+          ['2013/3/22', 2321.4, 2328.28, 2314.97, 2332],
+          ['2013/3/25', 2334.74, 2326.72, 2319.91, 2344.89],
+          ['2013/3/26', 2318.58, 2297.67, 2281.12, 2319.99],
+          ['2013/3/27', 2299.38, 2301.26, 2289, 2323.48],
+          ['2013/3/28', 2273.55, 2236.3, 2232.91, 2273.55],
+          ['2013/3/29', 2238.49, 2236.62, 2228.81, 2246.87],
+          ['2013/4/1', 2229.46, 2234.4, 2227.31, 2243.95],
+          ['2013/4/2', 2234.9, 2227.74, 2220.44, 2253.42],
+          ['2013/4/3', 2232.69, 2225.29, 2217.25, 2241.34],
+          ['2013/4/8', 2196.24, 2211.59, 2180.67, 2212.59],
+          ['2013/4/9', 2215.47, 2225.77, 2215.47, 2234.73],
+          ['2013/4/10', 2224.93, 2226.13, 2212.56, 2233.04],
+          ['2013/4/11', 2236.98, 2219.55, 2217.26, 2242.48],
+          ['2013/4/12', 2218.09, 2206.78, 2204.44, 2226.26],
+          ['2013/4/15', 2199.91, 2181.94, 2177.39, 2204.99],
+          ['2013/4/16', 2169.63, 2194.85, 2165.78, 2196.43],
+          ['2013/4/17', 2195.03, 2193.8, 2178.47, 2197.51],
+          ['2013/4/18', 2181.82, 2197.6, 2175.44, 2206.03],
+          ['2013/4/19', 2201.12, 2244.64, 2200.58, 2250.11],
+          ['2013/4/22', 2236.4, 2242.17, 2232.26, 2245.12],
+          ['2013/4/23', 2242.62, 2184.54, 2182.81, 2242.62],
+          ['2013/4/24', 2187.35, 2218.32, 2184.11, 2226.12],
+          ['2013/4/25', 2213.19, 2199.31, 2191.85, 2224.63],
+          ['2013/4/26', 2203.89, 2177.91, 2173.86, 2210.58],
+          ['2013/5/2', 2170.78, 2174.12, 2161.14, 2179.65],
+          ['2013/5/3', 2179.05, 2205.5, 2179.05, 2222.81],
+          ['2013/5/6', 2212.5, 2231.17, 2212.5, 2236.07],
+          ['2013/5/7', 2227.86, 2235.57, 2219.44, 2240.26],
+          ['2013/5/8', 2242.39, 2246.3, 2235.42, 2255.21],
+          ['2013/5/9', 2246.96, 2232.97, 2221.38, 2247.86],
+          ['2013/5/10', 2228.82, 2246.83, 2225.81, 2247.67],
+          ['2013/5/13', 2247.68, 2241.92, 2231.36, 2250.85],
+          ['2013/5/14', 2238.9, 2217.01, 2205.87, 2239.93],
+          ['2013/5/15', 2217.09, 2224.8, 2213.58, 2225.19],
+          ['2013/5/16', 2221.34, 2251.81, 2210.77, 2252.87],
+          ['2013/5/17', 2249.81, 2282.87, 2248.41, 2288.09],
+          ['2013/5/20', 2286.33, 2299.99, 2281.9, 2309.39],
+          ['2013/5/21', 2297.11, 2305.11, 2290.12, 2305.3],
+          ['2013/5/22', 2303.75, 2302.4, 2292.43, 2314.18],
+          ['2013/5/23', 2293.81, 2275.67, 2274.1, 2304.95],
+          ['2013/5/24', 2281.45, 2288.53, 2270.25, 2292.59],
+          ['2013/5/27', 2286.66, 2293.08, 2283.94, 2301.7],
+          ['2013/5/28', 2293.4, 2321.32, 2281.47, 2322.1],
+          ['2013/5/29', 2323.54, 2324.02, 2321.17, 2334.33],
+          ['2013/5/30', 2316.25, 2317.75, 2310.49, 2325.72],
+          ['2013/5/31', 2320.74, 2300.59, 2299.37, 2325.53],
+          ['2013/6/3', 2300.21, 2299.25, 2294.11, 2313.43],
+          ['2013/6/4', 2297.1, 2272.42, 2264.76, 2297.1],
+          ['2013/6/5', 2270.71, 2270.93, 2260.87, 2276.86],
+          ['2013/6/6', 2264.43, 2242.11, 2240.07, 2266.69],
+          ['2013/6/7', 2242.26, 2210.9, 2205.07, 2250.63],
+          ['2013/6/13', 2190.1, 2148.35, 2126.22, 2190.1]
+        ]);
+        function splitData(rawData) {
+          const categoryData = [];
+          const values = [];
+          for (var i = 0; i < rawData.length; i++) {
+            categoryData.push(rawData[i].splice(0, 1)[0]);
+            values.push(rawData[i]);
+          }
+          return {
+            categoryData: categoryData,
+            values: values
+          };
+        }
+        function calculateMA(dayCount) {
+          var result = [];
+          for (var i = 0, len = data0.values.length; i < len; i++) {
+            if (i < dayCount) {
+              result.push('-');
+              continue;
+            }
+            var sum = 0;
+            for (var j = 0; j < dayCount; j++) {
+              sum += +data0.values[i - j][1];
+            }
+            result.push(sum / dayCount);
+          }
+          return result;
+        }
+        const option_5 = {
+          // title: {
+          //   text: '上证指数',
+          //   left: 0
+          // },
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'cross'
+            }
+          },
+          legend: {
+            data: ['日K', 'MA5', 'MA10', 'MA20', 'MA30']
+          },
+          grid: {
+            left: '10%',
+            right: '10%',
+            bottom: '15%'
+          },
+          xAxis: {
+            type: 'category',
+            data: data0.categoryData,
+            boundaryGap: false,
+            axisLine: { onZero: false },
+            splitLine: { show: false },
+            min: 'dataMin',
+            max: 'dataMax'
+          },
+          yAxis: {
+            scale: true,
+            splitArea: {
+              show: true
+            }
+          },
+          dataZoom: [
+            {
+              type: 'inside',
+              start: 50,
+              end: 100
+            },
+            {
+              show: true,
+              type: 'slider',
+              top: '90%',
+              start: 50,
+              end: 100
+            }
+          ],
+          series: [
+            {
+              name: '日K',
+              type: 'candlestick',
+              data: data0.values,
+              itemStyle: {
+                color: upColor,
+                color0: downColor,
+                borderColor: upBorderColor,
+                borderColor0: downBorderColor
+              },
+              markPoint: {
+                label: {
+                  formatter: function (param) {
+                    return param != null ? Math.round(param.value) + '' : '';
+                  }
+                },
+                data: [
+                  {
+                    name: 'Mark',
+                    coord: ['2013/5/31', 2300],
+                    value: 2300,
+                    itemStyle: {
+                      color: 'rgb(41,60,85)'
+                    }
+                  },
+                  {
+                    name: 'highest value',
+                    type: 'max',
+                    valueDim: 'highest'
+                  },
+                  {
+                    name: 'lowest value',
+                    type: 'min',
+                    valueDim: 'lowest'
+                  },
+                  {
+                    name: 'average value on close',
+                    type: 'average',
+                    valueDim: 'close'
+                  }
+                ],
+                tooltip: {
+                  formatter: function (param) {
+                    return param.name + '<br>' + (param.data.coord || '');
+                  }
+                }
+              },
+              markLine: {
+                symbol: ['none', 'none'],
+                data: [
+                  [
+                    {
+                      name: 'from lowest to highest',
+                      type: 'min',
+                      valueDim: 'lowest',
+                      symbol: 'circle',
+                      symbolSize: 10,
+                      label: {
+                        show: false
+                      },
+                      emphasis: {
+                        label: {
+                          show: false
+                        }
+                      }
+                    },
+                    {
+                      type: 'max',
+                      valueDim: 'highest',
+                      symbol: 'circle',
+                      symbolSize: 10,
+                      label: {
+                        show: false
+                      },
+                      emphasis: {
+                        label: {
+                          show: false
+                        }
+                      }
+                    }
+                  ],
+                  {
+                    name: 'min line on close',
+                    type: 'min',
+                    valueDim: 'close'
+                  },
+                  {
+                    name: 'max line on close',
+                    type: 'max',
+                    valueDim: 'close'
+                  }
+                ]
+              }
+            },
+            {
+              name: 'MA5',
+              type: 'line',
+              data: calculateMA(5),
+              smooth: true,
+              lineStyle: {
+                opacity: 0.5
+              }
+            },
+            {
+              name: 'MA10',
+              type: 'line',
+              data: calculateMA(10),
+              smooth: true,
+              lineStyle: {
+                opacity: 0.5
+              }
+            },
+            {
+              name: 'MA20',
+              type: 'line',
+              data: calculateMA(20),
+              smooth: true,
+              lineStyle: {
+                opacity: 0.5
+              }
+            },
+            {
+              name: 'MA30',
+              type: 'line',
+              data: calculateMA(30),
+              smooth: true,
+              lineStyle: {
+                opacity: 0.5
+              }
+            }
+          ]
+        }
+        echarts5.setOption(option_5)
+
+      },
+      open(){
+        this.$nextTick(() => {
+        //  执行echarts方法
+          this.initEcharts()
+        })
+      },
+      // 数据格式改写
+      dateList(data){
+        const dateList =data.map(function (item) {
+          return item[0];
+          });
+          return dateList
+      },
+
+      valueList(data){
+        const valueList =data.map(function (item) {
+          return item[1];
+          });
+          return valueList
+      },
+      // 接收页码
+      CurrentChange(val){
+        this.tableList(val)
+      },
+    }
+};
+</script>
+
+<style lang="less" scoped>
+.text{
+  color:rgba(2, 167, 240, 0.729411764705882);
+}
+ // 调整表头间隔、设置表头下方边框颜色
+ /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+      border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
+      padding: 8px 0 !important;//这个页面表头大，可以调整一下间距
+      min-width: 0 !important;
+    }
+    .el-table .el-table__cell {
+      padding: 12px 0; 
+      min-width: 0;
+    }
+    /deep/ .active_header{//表头
+      color: #110101;
+      font-size: 9px;
+      text-align: center !important;
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      font-size: 10px;
+    }
+  
+
+.grayish_btn{//浅灰色按钮
+  color: #fff;//文字颜色
+  background-color: #aaaaaa;//背景颜色
+}
+.card_label{
+  font-size: 13px;
+  // padding:10px; 
+  color:#fff;
+  background-color: #7f7f7f;
+}
+.form{//产品搜索栏
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:5px; 
+    // height: 40px;
+    padding-left: 40px;
+    // padding: 30px;
+
+}
+.line_labels{
+    margin-top:20px;
+    display:flex;
+    padding:5px; 
+    // justify-content:space-between;
+}
+.line_charts{//多折线图
+    // margin-top:20px; 
+    display:flex;
+    justify-content:space-between;
+    // padding:20px;
+}
+.grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+</style>
diff --git a/src_old/views/预警服务.vue b/src_old/views/预警服务.vue
new file mode 100644
index 0000000..423d068
--- /dev/null
+++ b/src_old/views/预警服务.vue
@@ -0,0 +1,1326 @@
+<!-- 预警服务主页面 -->
+<template>
+  <div>
+    <div class="one">
+      <el-card style='height: 360px;' :body-style={padding:0}> 
+       <!-- height:400px -->
+       <!-- 1、上标 -->
+        <span class="superscript" style="width: 20px; height: 40px;">整体风险概括</span>
+        <!-- 2、卡片x3 -->
+        <div class="tirCard">
+          <!-- 股票市场 -->
+          <div class="my-element" style="width: 380px; height: 250px;">
+            <h4 style="padding-left: 50px;">股票市场</h4>
+            <div class="tirCircle">
+              <div class="circle_low">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">{{ stockLow }}</div>
+              </div>
+              <div class="circle_mid">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">{{ stockMid }}</div>
+              </div>
+              <div class="circle_high">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">{{ stockHigh }}</div>
+              </div>
+            </div>
+            <div class="tirText"> 
+              <span>低风险</span>
+              <span>中风险</span>
+              <span>高风险</span>
+            </div>
+
+            <div>
+              <h5 style="display: flex;justify-content:center">综合风险水平       95</h5>
+            </div>
+
+
+          </div>
+
+          <!-- 债券市场 -->
+          <div class="my-element" style="width: 380px; height: 250px;">
+            <h4 style="padding-left: 50px;">债券市场</h4>
+            <div class="tirCircle">
+              <div class="circle_low">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">1862</div>
+              </div>
+              <div class="circle_mid">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">441</div>          
+              </div>
+              <div class="circle_high">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">87</div>
+              </div>
+            </div>
+            <div class="tirText"> 
+              <span>低风险</span>
+              <span>中风险</span>
+              <span>高风险</span>
+            </div>
+            <div>
+              <h5 style="display: flex;justify-content:center">综合风险水平       95</h5>
+            </div>
+          </div>
+          <!-- 期货市场 -->
+          <div class="my-element" style="width: 380px; height: 250px;">
+            <h4 style="padding-left: 50px;">期货市场</h4>
+            <div class="tirCircle">
+              <div class="circle_low">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">1862</div>
+              </div>
+              <div class="circle_mid">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">441</div>          
+              </div>
+              <div class="circle_high">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">87</div>
+              </div>
+            </div>
+            <div class="tirText"> 
+              <span>低风险</span>
+              <span>中风险</span>
+              <span>高风险</span>
+            </div>
+            <div>
+              <h5 style="display: flex;justify-content:center">综合风险水平       95</h5>
+            </div>
+          </div>
+
+        </div>
+        <!-- 3、总结语句 -->
+<!--        <span style="margin: 10px;padding-left:20px;padding-right:20px;display: inline-block;">-->
+<!--          &#8194 &#8194中国资本市场主要由股票市场、债券市场和期货市场组成，-->
+<!--          其中股票市场份额占比为 50%，-->
+<!--          债券市场份额占比为 30%、-->
+<!--          期货市场份额占比为20%，-->
+<!--          整体市场风险水平评估为 89，属于 低风险</span>-->
+
+          <!--  &#32; == 普通的英文半角空格
+                &#160; == &nbsp; == &#xA0; == no-break space （普通的英文半角空格但不换行）
+                &#12288; == 中文全角空格 （一个中文宽度）
+                &#8194; == &ensp; == en空格 （半个中文宽度）
+                &#8195; == &emsp; == em空格 （一个中文宽度）
+                &#8197; == 四分之一em空格 （四分之一中文宽度） -->
+      </el-card>
+    </div>
+
+  <div class="two">
+      <el-card style='height: 800px;margin-top:5px' :body-style={padding:0} > 
+       <!-- height:400px -->
+       <!-- 1、上标 -->
+        <span class="superscript" style="width: 20px; height: 40px;">预警服务</span>
+       <!-- 2、搜索栏 -->
+        <div class="form">
+          <el-form :inline="true"  class="demo-form-inline" :model="formInline1" ref="formInline">
+            <el-form-item label="预警市场">
+              <el-select  v-model="formInline1.market" size="mini">
+                <el-option label="股票" value="stock"></el-option>
+                <el-option label="债券" value="bond"></el-option>
+                <el-option label="期货" value="future"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button class="grayish_btn" @click="onSubmit1" size="mini">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <!-- 3、内容 -->
+        <div class="one_twins_card">
+          <!-- 一左 -->
+          <el-card style=" height:600px;width: 68%;" :body-style={padding:0}>         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+            <!--(1)风险预警  -->
+            <div style="display:flex;justify-content:space-between;">
+              <div style="display:flex;padding-bottom: 10px;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title' >风险预警</span>
+              </div>
+              <div style="display:flex;">
+<!--                <span class="text"  v-on:click="statistics1()">查看风险统计</span>-->
+                <span class="text"  v-on:click="detail2()">查看全部详情</span>
+              </div>
+            </div>
+            <el-table class='table' :data="tableData_main_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="215"
+                    >
+                <el-table-column v-for='(val,key) in tableLabel_main_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <!--(2)异常预警 -->
+            <div style="display:flex;justify-content:space-between;">
+              <div style="display:flex;padding-bottom: 10px;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title' >异常预警</span>
+              </div>
+              <div style="display:flex;">
+<!--                <span class="text"  v-on:click="statistics3()">查看异常统计</span>-->
+<!--                <span class="text"  v-on:click="detail3()">查看全部详情</span>-->
+              </div>
+            </div>
+<!--            v-if动态选择表类型-->
+            <el-table class='table' :data="tableData_main_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                      v-if="formInline1.market==='stock'"
+                  height="215"   >
+                <el-table-column  v-for='(val,key) in tableLabel1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_2)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <el-table class='table' :data="tableData_main_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                      border
+
+                      :row-style="{height:'28px'}"
+                      :cell-style="{padding:'0px'}"
+                      header-row-class-name="active_header"
+                      header-cell-class-name="active_header"
+                      cell-class-name="content_center"
+                      v-if="formInline1.market==='bond'"
+                      height="215"   >
+              <el-table-column  v-for='(val,key) in tableLabel2' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_2)">
+
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <el-table class='table' :data="tableData_main_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                      border
+
+                      :row-style="{height:'28px'}"
+                      :cell-style="{padding:'0px'}"
+                      header-row-class-name="active_header"
+                      header-cell-class-name="active_header"
+                      cell-class-name="content_center"
+                      v-if="formInline1.market==='future'"
+                      height="215"   >
+              <el-table-column  v-for='(val,key) in tableLabel3' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_2)">
+
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+
+
+          </el-card>
+          
+          <!-- 一右 -->
+          <el-card style=" height:600px;width: 31%;" :body-style={padding:0} overflow:hidden >
+            <div style="display:flex;margin-bottom: 10px;">
+              <el-divider direction="vertical" class="sublabel"></el-divider>
+              <span class='title'>预警提示</span>
+            </div>
+            
+
+
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/29 16:00股票1监测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/2916:00股票1检测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/29 16:00股票1检测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/29 16:00股票1检测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/29 16:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/2916:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/2916:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/29 16:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+
+            <vue-seamless-scroll v-if="contentList.length>0" :data="contentList" class="wrap"  >
+<!--            <div v-for="(val,key) in contentList" :key="key" style="padding: 5px;">【{{warning_type2}}】{{val.time}},{{val.entity}}检测到{{val.type}}<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+              <ul class="item">
+                <li v-for="(item, index) in contentList" :key="index">
+                  <span class="time" v-text="item.time"></span>
+                  <span class="entity" v-text="item.entity"></span>
+                  <span class="type" v-text="item.type"></span>
+<!--                 <span class="text_detail"  v-on:click="detail1(item.type)">[详情]</span>-->
+                </li>
+              </ul>
+            </vue-seamless-scroll>
+<!--            <vue-seamless-scroll :data="listData" class="warp">-->
+<!--              <ul class="item">-->
+<!--                <li v-for="(item, index) in listData" :key="index">-->
+<!--                  <span class="title" v-text="item.title"></span>-->
+<!--                  <span class="date" v-text="item.date">检测大</span>-->
+<!--                  <span class="t" v-text="item.t"></span>-->
+<!--                </li>-->
+<!--              </ul>-->
+<!--            </vue-seamless-scroll>-->
+          </el-card>
+        </div>
+      </el-card>
+
+      <!-- #1跳转-风险预警-查看风险统计 -->
+      <!-- 待完成 -->
+      <!-- #3跳转-异常预警-查看异常统计 -->
+      <!-- 待完成 -->
+
+      <!-- #1弹窗-风险预警-查看单条信息详情 -->
+      <el-dialog  :visible.sync="detailsdialog1" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:100% ;margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">预警详情-风险个体</span>
+          <el-table class='detail_table' :data="tableData_detail_1_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="215"   >
+                <el-table-column v-for='(val,key) in tableLabel_detail_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+          </el-table>
+            <div>
+                <el-table class='detail_table'
+                    :data="tableData_detail_1_2"
+                    style="width: 100%"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+
+
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center">
+
+                    <el-table-column
+                    prop="name"
+                    label="公司名称"
+                    width="100">
+                  </el-table-column>
+                  <el-table-column label="风险水平">
+                    <el-table-column
+                      prop="财务杠杆"
+                      label="财务杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="经营杠杆"
+                      label="经营杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="综合杠杆"
+                      label="综合杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="流动比率"
+                      label="流动比率"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                  </el-table-column>
+                    <el-table-column label="（一）流动风险">
+                      <el-table-column
+                        prop="速动比率"
+                        label="速动比率"
+                        sortable
+                        width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="应收账款周转天数(天)"
+                        label="应收账款周转天数（天）"
+                        width="100">
+                      </el-table-column>
+                      <el-table-column
+                        prop="流动风险综合指数"
+                        label="流动风险综合指数"
+                        width="120"
+                        sortable>
+                      </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（二）市场风险">
+                      <el-table-column
+                        prop="在险价值"
+                        label="在险价值"
+                        sortable
+                        width="120">
+                      </el-table-column>
+                    </el-table-column>
+
+                      <el-table-column label="（三）经营风险">
+                        <el-table-column
+                          prop="资产收益率标准差"
+                          label="资产收益率标准差"
+                          sortable
+                          width="120">
+                        </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（四）信用风险">
+                        <el-table-column
+                          prop="资产负债率"
+                          label="资产负债率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                        <el-table-column
+                          prop="投资盈利率"
+                          label="投资盈利率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                    </el-table-column>
+                  <el-table-column
+                      prop="声誉风险综合指数"
+                      label="声誉风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="政策风险综合指数"
+                      label="政策风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="法律风险综合指数"
+                      label="法律风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="操作风险综合指数"
+                      label="操作风险"
+                      width="100">
+                  </el-table-column>
+                    <el-table-column
+                    prop="综合风险等级"
+                    label="综合风险等级"
+                    width="100">
+                  </el-table-column>
+                </el-table>
+            </div>
+        </el-card>
+      </el-dialog>      
+      <!-- #2弹窗-异常预警-查看单条信息详情 -->
+      <el-dialog  :visible.sync="detailsdialog2" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:100%;margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">预警详情-风险个体</span>
+          <el-table class='detail_table' :data="tableData_detail_2_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="215"   >
+                <el-table-column v-for='(val,key) in tableLabel_detail_2_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+          </el-table>
+          <div style="display:flex;">
+              <el-divider direction="vertical" class="sublabel"></el-divider>
+              <span class='title'>异常关联分析</span>
+          </div>
+          <div style="height:300px;margin-left: 20px;">图谱</div>
+          <el-table class='detail_table'
+                    :data="tableData_detail_2_2"
+                    style="width: 100%"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+
+
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center"
+                    height="215" >
+                    <el-table-column v-for='(val,key) in tableLabel_detail_2_2' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+                    </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                 
+                  
+                </el-table>
+                <Histogram/>
+              <span style="display:block;text-indent:2em;line-height: 25px;margin: 10px;">
+                股票1在2021-01-01至2021-02-01时间段内，在2021-1-8内达到股价峰值，为26元/每股，比该公司该段时间内平均股价（9元/每股），上涨15元，涨幅188.8%。在股价过高的情况下可能会导致风险增加、股票泡沫、不良收购等多种导致经济不稳定的风险因素的增加，在2021-01-09达到交易量峰值，为231支，比该公司该段时间内平均交易量（121股），上涨110股，涨幅为90.9%。在交易量过高的情况下可能会在一定程度上可能对市场稳定性、公平竞争和投资者信心造成负面影响。
+                
+              </span>
+
+
+
+        </el-card>
+      </el-dialog>
+      <!-- #3弹窗-风险预警-查看全部详情 -->
+      <el-dialog  :visible.sync="detailsdialog_all_1"    width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">预警详情</span>
+          <el-table class='detail_table' :data="tableData_detail_all_risk_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="300"   >
+                <el-table-column v-for='(val,key) in tableLabel_detail_all_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+          </el-table>
+        </el-card>
+
+<!--        暂不需要-->
+<!--          <div style="display:flex;padding-bottom: 10px;">-->
+<!--            <el-divider direction="vertical" class="sublabel"></el-divider>-->
+<!--            <span class='title' >个体风险指数分析</span>-->
+<!--          </div>-->
+<!--          <el-table class='detail_table'-->
+<!--                    :data="tableData_detail_1_2"-->
+<!--                    style="width: 100%"-->
+<!--                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"-->
+<!--                    border-->
+
+
+<!--                    :row-style="{height:'28px'}"-->
+<!--                    :cell-style="{padding:'0px'}"-->
+<!--                    header-row-class-name="active_header"-->
+<!--                    header-cell-class-name="active_header"-->
+<!--                    cell-class-name="content_center">-->
+
+<!--                    <el-table-column-->
+<!--                    prop="name"-->
+<!--                    label="公司名称"-->
+<!--                    width="100">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column label="风险水平">-->
+<!--                    <el-table-column-->
+<!--                      prop="财务杠杆"-->
+<!--                      label="财务杠杆"-->
+<!--                      sortable-->
+<!--                      width="70">-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column-->
+<!--                      prop="经营杠杆"-->
+<!--                      label="经营杠杆"-->
+<!--                      sortable-->
+<!--                      width="70">-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column-->
+<!--                      prop="综合杠杆"-->
+<!--                      label="综合杠杆"-->
+<!--                      sortable-->
+<!--                      width="70">-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column-->
+<!--                      prop="流动比率"-->
+<!--                      label="流动比率"-->
+<!--                      sortable-->
+<!--                      width="70">-->
+<!--                    </el-table-column>-->
+<!--                  </el-table-column>-->
+<!--                    <el-table-column label="（一）流动风险">-->
+<!--                      <el-table-column-->
+<!--                        prop="速动比率"-->
+<!--                        label="速动比率"-->
+<!--                        sortable-->
+<!--                        width="70">-->
+<!--                      </el-table-column>-->
+<!--                      <el-table-column-->
+<!--                        prop="应收账款周转天数(天)"-->
+<!--                        label="应收账款周转天数（天）"-->
+<!--                        width="100">-->
+<!--                      </el-table-column>-->
+<!--                      <el-table-column-->
+<!--                        prop="流动风险综合指数"-->
+<!--                        label="流动风险综合指数"-->
+<!--                        width="120"-->
+<!--                        sortable>-->
+<!--                      </el-table-column>-->
+<!--                    </el-table-column>-->
+
+<!--                    <el-table-column label="（二）市场风险">-->
+<!--                      <el-table-column-->
+<!--                        prop="在险价值"-->
+<!--                        label="在险价值"-->
+<!--                        sortable-->
+<!--                        width="120">-->
+<!--                      </el-table-column>-->
+<!--                    </el-table-column>-->
+
+<!--                      <el-table-column label="（三）经营风险">-->
+<!--                        <el-table-column-->
+<!--                          prop="资产收益率标准差"-->
+<!--                          label="资产收益率标准差"-->
+<!--                          sortable-->
+<!--                          width="120">-->
+<!--                        </el-table-column>-->
+<!--                    </el-table-column>-->
+
+<!--                    <el-table-column label="（四）信用风险">-->
+<!--                        <el-table-column-->
+<!--                          prop="资产负债率"-->
+<!--                          label="资产负债率"-->
+<!--                          sortable-->
+<!--                          width="100">-->
+<!--                        </el-table-column>-->
+
+<!--                        <el-table-column-->
+<!--                          prop="投资盈利率"-->
+<!--                          label="投资盈利率"-->
+<!--                          sortable-->
+<!--                          width="100">-->
+<!--                        </el-table-column>-->
+
+<!--                    </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                      prop="声誉风险综合指数"-->
+<!--                      label="声誉风险"-->
+<!--                      width="100">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                      prop="政策风险综合指数"-->
+<!--                      label="政策风险"-->
+<!--                      width="100">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                      prop="法律风险综合指数"-->
+<!--                      label="法律风险"-->
+<!--                      width="100">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                      prop="操作风险综合指数"-->
+<!--                      label="操作风险"-->
+<!--                      width="100">-->
+<!--                  </el-table-column>-->
+<!--                    <el-table-column-->
+<!--                    prop="综合风险等级"-->
+<!--                    label="综合风险等级"-->
+<!--                    width="100">-->
+<!--                  </el-table-column>-->
+<!--                </el-table>-->
+
+
+      </el-dialog>
+      <!-- #4弹窗-异常预警-查看异常统计 -->
+      <el-dialog  :visible.sync="detailsdialog_all_2" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style="margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">预警详情</span>
+          <el-table class='detail_table' :data="tableData_detail_all_risk_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="500"   >
+                <el-table-column v-for='(val,key) in tableLabel_detail_all_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+          </el-table>
+        </el-card>
+      </el-dialog>
+  </div>
+</div>
+</template>
+
+<script>
+import Histogram from "@/components/echarts/Histogram.vue";
+import http from "@/utils/request";
+import vueSeamlessScroll from 'vue-seamless-scroll'
+import {Loading} from "element-ui";
+export default {
+  components:{
+    Histogram,
+    vueSeamlessScroll,
+  },
+  data () {
+    return {
+      stockLow:1862,
+      stockMid:442,
+      stockHigh:87,
+      // 滚动窗数据
+      listData: [{
+        'title': '无缝滚动第一行无缝滚动第一行',
+        'date': '2017-12-16',
+        't':'ss'
+      }, {
+        'title': '无缝滚动第二行无缝滚动第二行',
+        'date': '2017-12-16',
+        't':'qq'
+      }, {
+        'title': '无缝滚动第三行无缝滚动第三行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第四行无缝滚动第四行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第五行无缝滚动第五行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第六行无缝滚动第六行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第七行无缝滚动第七行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第八行无缝滚动第八行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第九行无缝滚动第九行',
+        'date': '2017-12-16'
+      }],
+      defaultOption:{
+        step: 0.1, // 数值越大速度滚动越快
+        limitMoveNum: 10, // 开始无缝滚动的数据量 this.dataList.length
+        hoverStop: true, // 是否开启鼠标悬停stop
+        direction: 0, // 0向下 1向上 2向左 3向右
+        openWatch: true, // 开启数据实时监控刷新dom
+        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+      },
+      contentList:[],
+      // 整合收据进行接收
+      formInline1:{
+        market:'stock'
+      },
+      // 表格数据
+      tableData_main_1:[
+        {
+          序号:1,
+          主体名称:'股票1',
+          主体代码:'688001.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'流动风险',
+        },
+        {
+          序号:2,
+          主体名称:'股票3',
+          主体代码:'688002.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'市场风险',
+        },
+      ],
+      tableLabel_main_1: {
+        // 序号: '序号',
+        // 主体名称: '主体名称',
+        code: '主体代码',
+        // 主体类型: '主体类型',
+        industry:'行业',
+        early_warning_time:'预警时刻',
+        warning_type:'风险水平',
+        risk_type:'风险类型',
+
+      },
+        
+      tableData_main_2:[
+        {
+          序号:1,
+          主体名称:'股票1',
+          主体代码:'688001.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'流动风险',
+        },
+        {
+          序号:2,
+          主体名称:'股票2',
+          主体代码:'688002.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'市场风险',
+        },
+      ],
+      tableLabel_main_2: {
+        编码: '序号',
+        // 名称: '主体名称',
+        名称: '主体代码',
+        // 主体类型: '主体类型',
+        // 行业:'行业',
+        监测时间:'预警时刻',
+        异常水平:'异常水平',
+        异常关联类型:'风险类型',
+      },
+
+      //三个表
+      tableLabel1: {
+        编码: '编号',
+        异常关联类型: '异常关联类型',
+        名称: '涉及股票',
+        监测时间: '监测时间',
+        股票价格: '股票价格',
+        交易数量: '交易数量',
+        风险等级: '风险等级',
+      },
+      tableLabel2: {
+        编码: '编号',
+        异常关联类型: '异常关联类型',
+        名称: '涉及主体',
+        监测时间: '监测时间',
+        股票价格: '债券价格',
+        交易数量: '交易数量',
+        风险等级: '风险等级',
+      },
+      tableLabel3: {
+        编码: '编号',
+        异常关联类型: '异常关联类型',
+        涉及商品: '涉及商品',
+        合约名称: '合约名称',
+        监测时间: '监测时间',
+        股票价格: '股票价格',
+        交易数量: '交易数量',
+        风险等级: '风险等级',
+
+      },
+      // 弹窗-表格全部数据
+      tableData_detail_all_risk_1:[
+      {
+        序号: 1,
+        主体名称: '股票1',
+        主体代码: '680001.SH',
+        主体类型: '股票',
+        省份:'北京',
+        行业:'计算机',
+        当前预警时刻:'2023/6/29 10:00',
+        历史预警时刻:'2023/6/21 16:00',
+        预警值:80,
+        预警值同比:'+1',
+        预警类型:'严重',
+        风险类型:'流动风险',
+        风险等级:8,
+        影响力等级:'高',
+        健康等级:'危险',
+
+      },
+
+      ],
+      tableLabel_detail_all_1: 
+      {
+        // 序号: '序号',
+        name: '主体名称',
+        code: '主体代码',
+        // 主体类型: '主体类型',
+        province:'省份',
+        industry:'行业',
+        early_warning_time:'预警时刻',
+        last_time:'历史预警时刻',
+        warning_score:'预警值',
+        increase:'预警值同比',
+        // warning_type:'预警类型',
+        risk_type:'风险类型',
+        warning_type:'风险水平',
+        index:'影响力等级',
+        健康等级:'健康等级',
+
+      },
+      tableData_detail_all_risk_2: [
+      {
+      name:'秦农商行',
+      },
+      {  
+      name:'华夏商行',
+      },
+      ],
+
+      // 弹窗-滑动窗数据
+      tableData_detail_1_1:[
+      {
+        序号: 1,
+        主体名称: '股票1',
+        主体类型: '股票',
+        省份:'北京',
+        行业:'计算机',
+        历史预警时刻:'2023/6/21 16:00',
+        当前预警时刻:'2023/6/29 10:00',
+        预警值:80,
+        预警值同比:'+1',
+        预警类型:'严重',
+        风险类型:'流动风险',
+        风险等级:8,
+        影响力等级:'高',
+        健康等级:'危险',
+
+      },
+
+      ],
+      tableLabel_detail_1: 
+      {
+        序号: '序号',
+        主体名称: '主体名称',
+        主体类型: '主体类型',
+        省份:'省份',
+        行业:'行业',
+        历史预警时刻:'历史预警时刻',
+        当前预警时刻:'当前预警时刻',
+        预警值:'预警值',
+        预警值同比:'预警值同比',
+        预警类型:'预警类型',
+        风险类型:'风险类型',
+        风险等级:'风险等级',
+        影响力等级:'影响力等级',
+        健康等级:'健康等级',
+
+      },
+      tableData_detail_1_2: [
+      {
+      name:'秦农商行',
+      },
+      {  
+      name:'华夏商行',
+      },
+      ],
+      
+      tableData_detail_2_1:[
+      {
+        序号: 1,
+        主体名称: '股票1',
+        主体类型: '股票',
+        省份:'北京',
+        行业:'计算机',
+        历史预警时刻:'2023/6/21 16:00',
+        当前预警时刻:'2023/6/29 10:00',
+        预警值:80,
+        预警值同比:'+1',
+        预警类型:'严重',
+        风险类型:'流动风险',
+        风险等级:8,
+        影响力等级:'高',
+        健康等级:'危险',
+
+      },
+
+      ],
+      tableLabel_detail_2_1: 
+      {
+        序号: '序号',
+        主体名称: '主体名称',
+        主体类型: '主体类型',
+        省份:'省份',
+        行业:'行业',
+        历史预警时刻:'历史预警时刻',
+        当前预警时刻:'当前预警时刻',
+        预警值:'预警值',
+        预警值同比:'预警值同比',
+        预警类型:'预警类型',
+        风险类型:'风险类型',
+        风险等级:'风险等级',
+        影响力等级:'影响力等级',
+        健康等级:'健康等级',
+
+      },
+      tableLabel_detail_2_2: 
+      {
+        编号: '编号',
+        异常主体:'异常主体',
+        关联对象:'关联对象',
+        异常关联类型:'异常关联类型',
+        关联相似度:'关联相似度',
+        涉及事件详情:'涉及事件详情',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'风险等级',
+      },
+      tableData_detail_2_2:[
+      {
+        编号: '',
+        异常主体:'股票1',
+        关联对象:'股票2',
+        异常关联类型:'高频交易',
+        关联相似度:'关联相似度',
+        涉及事件详情:'事件分析',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'',
+      },
+
+      ],
+
+
+      // 判断是否弹窗打开
+      detailsdialog1:false,
+      detailsdialog2:false,
+      detailsdialog_all_1:false,
+      detailsdialog_all_2:false,
+
+      //预警类型
+      warning_type1:'风险预警',
+      warning_type2:'异常预警',
+
+
+    }
+ 
+  },
+  mounted(){
+    let that=this
+    http.get('/warning/get_warning_count/').then((res)=> {
+        this.stockLow=res.data["低风险"]
+      this.stockMid=res.data["中风险"]
+      this.stockHigh=res.data["高风险"]
+    })
+          this.contentList.length=0
+    http.get('/anomaly/item_anomaly/',{params:{
+        sc:this.formInline1.market,
+      }}).then((res)=>{
+
+      for (let i in res.data.data){
+        let tmp={}
+        if (that.formInline1.market!=='future')
+        {tmp['time']=res.data.data[i].监测时间
+        tmp['entity']=res.data.data[i].名称
+        tmp['type']=res.data.data[i].异常关联类型}
+        else {
+          tmp['time']=res.data.data[i].监测时间
+          tmp['entity']=res.data.data[i].涉及商品
+          tmp['type']=res.data.data[i].异常关联类型
+        }
+        this.contentList.push(tmp)
+      }
+      // console.log(this.contentList)
+      // console.log(this.listData)
+    })
+    this.onSubmit1()
+  },
+  methods:{
+// 调整表格列宽
+  calculateColumnWidth(prop,data) {
+      const text = String(data[0][prop]); // 使用第一行的数据作为示例
+      const calculatedWidth = text.length;
+      // console.log('console.log(calculatedWidth):',calculatedWidth)
+      if(calculatedWidth>10 && calculatedWidth<=50){
+        const baseWidth= 20 + calculatedWidth * 0.5
+        return `${baseWidth}px`;
+      }
+      if(calculatedWidth<=10){
+        const baseWidth= 15
+        return `${baseWidth}px`;
+      }
+      else{
+        const baseWidth= 20 + calculatedWidth * 0.5
+        return `${baseWidth}px`;
+      }
+ },
+
+
+    onSubmit1(){
+      http.get('/anomaly/item_anomaly/',{params:{
+          sc:this.formInline1.market,
+        }}).then((res)=>{
+        this.tableData_main_2=res.data.data
+      })
+      http.get('/warning/risk_warning/',{params:{
+          market: this.formInline1.market,
+        }}).then((res)=>{
+        this.tableData_main_1=res.data
+      })
+    },
+    // 1、风险/异常单条数据查看详情
+    detail1(warning_type){
+      if(warning_type==='价格波动异常'){
+          this.detailsdialog1 = true//打开弹窗
+      }
+      if (warning_type==='高频交易异常') {
+        this.detailsdialog2 = true//打开弹窗
+        
+      }
+         
+    },
+     // 2、风险预警-查看全部详情
+     detail2(){
+       this.$message({
+         showClose: true,
+         message: '请稍候',
+         type: 'info'
+       });
+       let options={
+         text:'请稍等'
+       }
+       let loadingInstance = Loading.service(options);
+       http.get('/warning/risk_warning_detail/',{params:{
+           market: this.formInline1.market,
+         }}).then((res)=>{
+           // unicode?
+         this.tableData_detail_all_risk_1=eval(unescape(res.data.replace(/\\u/g, '%u')))
+
+         // this.tableData_detail_all_risk_1=res.data
+         loadingInstance.close()
+         this.detailsdialog_all_1 = true//打开弹窗
+       }).finally(()=>loadingInstance.close())
+
+    },
+     // 4、异常预警-查看全部详情
+     detail3(){  
+      this.detailsdialog_all_2 = true//打开弹窗
+    },
+
+    // 1、风险预警-查看风险统计
+    statistics1(){
+      // 页面跳转
+    },
+    // 2、异常预警-查看异常统计
+    statistics3(){
+      // this.detailsdialog3 = true//打开弹窗
+    },
+   
+    // 打开弹窗图像
+    open(){
+              // this.$nextTick(() => {
+              // //  执行echarts方法
+              //   this.initEcharts()
+              // })
+            },
+    
+  },
+  watch:{
+    'formInline1.market': {
+      handler() {
+        this.contentList.length = 0
+          http.get('/anomaly/item_anomaly/', {
+            params: {
+              sc: this.formInline1.market,
+            }
+          }).then((res) => {
+            for (let i in res.data.data) {
+              let tmp = {}
+              tmp.time = res.data.data[i].监测时间
+              tmp.entity = res.data.data[i].名称
+              tmp.type = res.data.data[i].异常关联类型
+              this.contentList.push(tmp)
+      }
+    })
+    }
+  }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.wrap {
+  
+  // height: 270px;
+  width: 100%;
+  margin: 0 auto;
+  overflow: hidden;
+  ul {
+    list-style: none;
+    padding: 10px;
+    // padding: 0;
+    margin: 0 auto;
+    li,
+    //span {
+    //  display: block;
+    //  height: 30px;
+    //  line-height: 30px;
+    //  display: flex;
+    //  justify-content: space-between;
+    //  font-size: 15px;
+    //}
+    span {
+      display: inline-block;
+      height: 30px;
+      line-height: 30px;
+      display: flex;
+      // width: 550px;
+      white-space: normal;
+      word-break: break-all;
+      justify-content: space-between;
+      font-size: 15px;
+    }
+  }
+}
+.form{//产品搜索栏
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:5px; 
+    margin-bottom:0px; 
+    // height: 40px;
+    margin-left: 50px;
+    padding: 0px;
+    .el-form-item {
+    margin-bottom: 5px;
+    }
+  }
+
+.my-element {
+  background-image: url('~@/assets/card.png');
+  // width:100%;			//大小设置为100%
+  // height:100%;			//大小设置为100%
+  // position:fixed;
+  background-size:100% 100%;
+  margin-left: 20px;
+  margin-right: 20px;
+  margin-top: 20px;
+
+
+
+}
+.tirCard {
+  display:flex;
+  justify-content:space-between;
+}
+.tirCircle{
+  display:flex;
+  justify-content:space-between;
+  margin-left: 20px;
+  margin-right: 30px;
+  .circle_low {
+    background: #dffbee;
+    border: 0.7em solid #4dca8e;
+    border-radius: 50%;
+    // box-shadow: 0.375em 0.375em 0 0 rgba(15, 28, 63, 0.125);
+    height: 5em;
+    width: 5em;
+    // margin-left: 20px;
+  }
+  .circle_mid {
+    background: #fdf6e5;
+    border: 0.7em solid #f1c049; 
+    border-radius: 50%;
+    // box-shadow: 0.375em 0.375em 0 0 rgba(15, 28, 63, 0.125);
+    height: 5em;
+    width: 5em;
+
+  }
+  .circle_high {
+    background: #fce0ee;
+    border: 0.7em solid #c43434cc;
+    border-radius: 50%;
+    // box-shadow: 0.375em 0.375em 0 0 rgba(15, 28, 63, 0.125);
+    height: 5em;
+    width: 5em;
+    // margin-right: 20px;
+  }
+}
+.tirText{
+  display:flex;
+  justify-content:space-between;
+  margin-left: 45px;
+  margin-right: 60px;
+}
+
+
+.one_twins_card{
+    margin-top:0px;
+    margin-bottom:10px;
+    margin-left: 10px;
+    margin-right: 10px;
+    display:flex;
+    justify-content:space-between;//左右贴边
+    .el-card {
+      width:49.5%;
+    } 
+    .el-col-2 {
+     width: 2%;
+
+  }
+}
+.sublabel{ // 小标签标识
+    // font-size: 13px;
+    // padding:2px;
+    margin-top:10px;
+    background-color: rgba(2, 167, 240, 0.5);
+    width: 5px; 
+    height: 35px;
+
+    
+  }
+.title{
+    padding-left: 4px;
+    margin-top:15px;
+    font-weight: bold;//字体加粗
+    display:flex;
+    justify-content:flex-start
+}
+/deep/ .text{
+      color:rgba(2, 167, 240, 0.729411764705882);
+      margin-top:15px;
+      padding: 10px;
+      padding-bottom: 5px;
+      display:flex;
+    // justify-content:right;
+    }
+/deep/ .text_detail{
+      color:rgba(2, 167, 240, 0.729411764705882);
+      cursor: pointer;
+    // justify-content:right;
+    }
+
+  
+
+
+
+
+
+.table{
+  font-size: 12px;
+  margin: 2px 10px 2px 10px;//返回表格添加间隙 上 右
+  // padding-right:10px;
+}
+.detail_table{
+  margin-top: 15px;
+  margin-left: 10px;
+  margin-right: 0px;
+/deep/ .el-table {
+  width: 98.5% !important;
+}
+}
+  // 右侧空只能这样调整，左侧必须用margin
+  /deep/ .el-table {
+    width: 97.5% !important;
+    // margin-right: 10px;
+  }
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 1px 1px 1px; 
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0; 
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #333333;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+
+
+
+    .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+</style>
diff --git a/src_old/views/预警服务old.vue b/src_old/views/预警服务old.vue
new file mode 100644
index 0000000..c32bcde
--- /dev/null
+++ b/src_old/views/预警服务old.vue
@@ -0,0 +1,1090 @@
+<!-- 预警服务主页面 -->
+<template>
+  <div>
+    <div class="one">
+      <el-card style='height: 360px;' :body-style={padding:0}> 
+       <!-- height:400px -->
+       <!-- 1、上标 -->
+        <span class="superscript" style="width: 20px; height: 40px;">整体风险概括</span>
+        <!-- 2、卡片x3 -->
+        <div class="tirCard">
+          <!-- 股票市场 -->
+          <div class="my-element" style="width: 380px; height: 250px;">
+            <h4 style="padding-left: 50px;">股票市场</h4>
+            <div class="tirCircle">
+              <div class="circle_low">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">{{ stockLow }}</div>
+              </div>
+              <div class="circle_mid">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">{{ stockMid }}</div>
+              </div>
+              <div class="circle_high">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">{{ stockHigh }}</div>
+              </div>
+            </div>
+            <div class="tirText"> 
+              <span>低风险</span>
+              <span>中风险</span>
+              <span>高风险</span>
+            </div>
+
+            <div>
+              <h5 style="display: flex;justify-content:center">综合风险水平       95</h5>
+            </div>
+
+
+          </div>
+
+          <!-- 债券市场 -->
+          <div class="my-element" style="width: 380px; height: 250px;">
+            <h4 style="padding-left: 50px;">债券市场</h4>
+            <div class="tirCircle">
+              <div class="circle_low">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">1862</div>
+              </div>
+              <div class="circle_mid">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">441</div>          
+              </div>
+              <div class="circle_high">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">87</div>
+              </div>
+            </div>
+            <div class="tirText"> 
+              <span>低风险</span>
+              <span>中风险</span>
+              <span>高风险</span>
+            </div>
+            <div>
+              <h5 style="display: flex;justify-content:center">综合风险水平       95</h5>
+            </div>
+          </div>
+          <!-- 期货市场 -->
+          <div class="my-element" style="width: 380px; height: 250px;">
+            <h4 style="padding-left: 50px;">期货市场</h4>
+            <div class="tirCircle">
+              <div class="circle_low">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">1862</div>
+              </div>
+              <div class="circle_mid">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">441</div>          
+              </div>
+              <div class="circle_high">
+                <div style="display: flex;justify-content:center;margin-top: 25px;">87</div>
+              </div>
+            </div>
+            <div class="tirText"> 
+              <span>低风险</span>
+              <span>中风险</span>
+              <span>高风险</span>
+            </div>
+            <div>
+              <h5 style="display: flex;justify-content:center">综合风险水平       95</h5>
+            </div>
+          </div>
+
+        </div>
+        <!-- 3、总结语句 -->
+        <span style="margin: 10px;padding-left:20px;padding-right:20px;display: inline-block;">
+          &#8194 &#8194中国资本市场主要由股票市场、债券市场和期货市场组成，
+          其中股票市场份额占比为 50%，
+          债券市场份额占比为 30%、
+          期货市场份额占比为20%，
+          整体市场风险水平评估为 89，属于 低风险</span>
+
+          <!--  &#32; == 普通的英文半角空格
+                &#160; == &nbsp; == &#xA0; == no-break space （普通的英文半角空格但不换行）
+                &#12288; == 中文全角空格 （一个中文宽度）
+                &#8194; == &ensp; == en空格 （半个中文宽度）
+                &#8195; == &emsp; == em空格 （一个中文宽度）
+                &#8197; == 四分之一em空格 （四分之一中文宽度） -->
+      </el-card>
+    </div>
+
+  <div class="two">
+      <el-card style='height: 800px;margin-top:5px' :body-style={padding:0} > 
+       <!-- height:400px -->
+       <!-- 1、上标 -->
+        <span class="superscript" style="width: 20px; height: 40px;">预警服务</span>
+       <!-- 2、搜索栏 -->
+        <div class="form">
+          <el-form :inline="true"  class="demo-form-inline" :model="formInline1" ref="formInline">
+            <el-form-item label="预警市场">
+              <el-select  v-model="formInline1.market" size="mini">
+                <el-option label="股票" value="stock"></el-option>
+                <el-option label="债券" value="bond"></el-option>
+                <el-option label="期货" value="future"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button class="grayish_btn" @click="onSubmit1" size="mini">查询</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <!-- 3、内容 -->
+        <div class="one_twins_card">
+          <!-- 一左 -->
+          <el-card style=" height:600px;width: 68%;" :body-style={padding:0}>         <!--:body-style={padding:0}取消卡片边距，btn就能在左上角 -->
+            <!--(1)风险预警  -->
+            <div style="display:flex;justify-content:space-between;">
+              <div style="display:flex;padding-bottom: 10px;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title' >风险预警</span>
+              </div>
+              <div style="display:flex;">
+                <span class="text"  v-on:click="statistics1()">查看风险统计</span>
+                <span class="text"  v-on:click="detail2()">查看全部详情</span>
+              </div>
+            </div>
+            <el-table class='table' :data="tableData_main_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="215"
+                    >
+                <el-table-column v-for='(val,key) in tableLabel_main_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <!--(2)异常预警 -->
+            <div style="display:flex;justify-content:space-between;">
+              <div style="display:flex;padding-bottom: 10px;">
+                <el-divider direction="vertical" class="sublabel"></el-divider>
+                <span class='title' >异常预警</span>
+              </div>
+              <div style="display:flex;">
+                <span class="text"  v-on:click="statistics3()">查看异常统计</span>
+                <span class="text"  v-on:click="detail3()">查看全部详情</span>
+              </div>
+            </div>
+<!--            v-if动态选择表类型-->
+            <el-table class='table' :data="tableData_main_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                      v-if="formInline1.market==='stock'"
+                  height="215"   >
+                <el-table-column  v-for='(val,key) in tableLabel1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_2)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <el-table class='table' :data="tableData_main_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                      border
+
+                      :row-style="{height:'28px'}"
+                      :cell-style="{padding:'0px'}"
+                      header-row-class-name="active_header"
+                      header-cell-class-name="active_header"
+                      cell-class-name="content_center"
+                      v-if="formInline1.market==='bond'"
+                      height="215"   >
+              <el-table-column  v-for='(val,key) in tableLabel2' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_2)">
+
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <el-table class='table' :data="tableData_main_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                      border
+
+                      :row-style="{height:'28px'}"
+                      :cell-style="{padding:'0px'}"
+                      header-row-class-name="active_header"
+                      header-cell-class-name="active_header"
+                      cell-class-name="content_center"
+                      v-if="formInline1.market==='future'"
+                      height="215"   >
+              <el-table-column  v-for='(val,key) in tableLabel3' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_main_2)">
+
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+
+
+          </el-card>
+          
+          <!-- 一右 -->
+          <el-card style=" height:600px;width: 31%;" :body-style={padding:0} overflow:hidden >
+            <div style="display:flex;">
+              <el-divider direction="vertical" class="sublabel"></el-divider>
+              <span class='title'>预警提示</span>
+            </div>
+            
+
+
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/29 16:00股票1监测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/2916:00股票1检测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/29 16:00股票1检测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type1}}】2023/6/29 16:00股票1检测到风险流动风险<span class="text_detail"  v-on:click="detail1(warning_type1)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/29 16:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/2916:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/2916:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+<!--            <div style="padding: 5px;">【{{warning_type2}}】2023/6/29 16:00股票1检测到异常股价波动异常<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+
+            <vue-seamless-scroll :data="contentList" class="wrap"  >
+<!--            <div v-for="(val,key) in contentList" :key="key" style="padding: 5px;">【{{warning_type2}}】{{val.time}},{{val.entity}}检测到{{val.type}}<span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span></div>-->
+              <ul class="item">
+                <li v-for="(item, index) in contentList" :key="index">
+                  <span class="time" v-text="item.time"></span>
+                  <span class="entity" v-text="item.entity"></span>
+                  <span class="type" v-text="item.type"></span>
+<!--                  <span class="text_detail"  v-on:click="detail1(warning_type2)">[查看详情]</span>-->
+                </li>
+              </ul>
+            </vue-seamless-scroll>
+<!--            <vue-seamless-scroll :data="listData" class="warp">-->
+<!--              <ul class="item">-->
+<!--                <li v-for="(item, index) in listData" :key="index">-->
+<!--                  <span class="title" v-text="item.title"></span>-->
+<!--                  <span class="date" v-text="item.date">检测大</span>-->
+<!--                  <span class="t" v-text="item.t"></span>-->
+<!--                </li>-->
+<!--              </ul>-->
+<!--            </vue-seamless-scroll>-->
+          </el-card>
+        </div>
+      </el-card>
+
+      <!-- #1跳转-风险预警-查看风险统计 -->
+      <!-- 待完成 -->
+      <!-- #3跳转-异常预警-查看异常统计 -->
+      <!-- 待完成 -->
+
+      <!-- #1弹窗-风险预警-查看单条信息详情 -->
+      <el-dialog  :visible.sync="detailsdialog1" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:100% ;margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">预警详情-风险个体</span>
+          <el-table class='detail_table' :data="tableData_detail_1_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="215"   >
+                <el-table-column v-for='(val,key) in tableLabel_detail_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+            </el-table>
+            <div>
+                <el-table class='detail_table'
+                    :data="tableData_detail_1_2"
+                    style="width: 100%"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+
+
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center">
+
+                    <el-table-column
+                    prop="name"
+                    label="公司名称"
+                    width="100">
+                  </el-table-column>
+                  <el-table-column label="风险水平">
+                    <el-table-column
+                      prop="财务杠杆"
+                      label="财务杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="经营杠杆"
+                      label="经营杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="综合杠杆"
+                      label="综合杠杆"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                    <el-table-column
+                      prop="流动比率"
+                      label="流动比率"
+                      sortable
+                      width="70">
+                    </el-table-column>
+                  </el-table-column>
+                    <el-table-column label="（一）流动风险">
+                      <el-table-column
+                        prop="速动比率"
+                        label="速动比率"
+                        sortable
+                        width="70">
+                      </el-table-column>
+                      <el-table-column
+                        prop="应收账款周转天数(天)"
+                        label="应收账款周转天数（天）"
+                        width="100">
+                      </el-table-column>
+                      <el-table-column
+                        prop="流动风险综合指数"
+                        label="流动风险综合指数"
+                        width="120"
+                        sortable>
+                      </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（二）市场风险">
+                      <el-table-column
+                        prop="在险价值"
+                        label="在险价值"
+                        sortable
+                        width="120">
+                      </el-table-column>
+                    </el-table-column>
+
+                      <el-table-column label="（三）经营风险">
+                        <el-table-column
+                          prop="资产收益率标准差"
+                          label="资产收益率标准差"
+                          sortable
+                          width="120">
+                        </el-table-column>
+                    </el-table-column>
+
+                    <el-table-column label="（四）信用风险">
+                        <el-table-column
+                          prop="资产负债率"
+                          label="资产负债率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                        <el-table-column
+                          prop="投资盈利率"
+                          label="投资盈利率"
+                          sortable
+                          width="100">
+                        </el-table-column>
+
+                    </el-table-column>
+                  <el-table-column
+                      prop="声誉风险综合指数"
+                      label="声誉风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="政策风险综合指数"
+                      label="政策风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="法律风险综合指数"
+                      label="法律风险"
+                      width="100">
+                  </el-table-column>
+                  <el-table-column
+                      prop="操作风险综合指数"
+                      label="操作风险"
+                      width="100">
+                  </el-table-column>
+                    <el-table-column
+                    prop="综合风险等级"
+                    label="综合风险等级"
+                    width="100">
+                  </el-table-column>
+                </el-table>
+            </div>
+        </el-card>
+      </el-dialog>      
+      <!-- #2弹窗-异常预警-查看单条信息详情 -->
+      <el-dialog  :visible.sync="detailsdialog2" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:100%;margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">预警详情-风险个体</span>
+          <el-table class='detail_table' :data="tableData_detail_2_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                  border  
+                  
+                  :row-style="{height:'28px'}"
+                  :cell-style="{padding:'0px'}"
+                  header-row-class-name="active_header"
+                  header-cell-class-name="active_header"
+                  cell-class-name="content_center"
+                  height="215"   >
+                <el-table-column v-for='(val,key) in tableLabel_detail_2_1' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+              </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                                                                              <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+          </el-table>
+          <div style="display:flex;">
+              <el-divider direction="vertical" class="sublabel"></el-divider>
+              <span class='title'>异常关联分析</span>
+          </div>
+          <div style="height:300px;margin-left: 20px;">图谱</div>
+          <el-table class='detail_table'
+                    :data="tableData_detail_2_2"
+                    style="width: 100%"
+                    :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border
+
+
+                    :row-style="{height:'28px'}"
+                    :cell-style="{padding:'0px'}"
+                    header-row-class-name="active_header"
+                    header-cell-class-name="active_header"
+                    cell-class-name="content_center"
+                    height="215" >
+                    <el-table-column v-for='(val,key) in tableLabel_detail_2_2' :prop="key" :label="val"  show-overflow-tooltip :min-width="calculateColumnWidth(key,tableData_detail_1_1)">
+              
+                    </el-table-column><!--插槽里面没有东西就可以用单标签  -->
+                 
+                  
+                </el-table>
+                <Histogram/>
+              <span style="display:block;text-indent:2em;line-height: 25px;margin: 10px;">
+                股票1在2021-01-01至2021-02-01时间段内，在2021-1-8内达到股价峰值，为26元/每股，比该公司该段时间内平均股价（9元/每股），上涨15元，涨幅188.8%。在股价过高的情况下可能会导致风险增加、股票泡沫、不良收购等多种导致经济不稳定的风险因素的增加，在2021-01-09达到交易量峰值，为231支，比该公司该段时间内平均交易量（121股），上涨110股，涨幅为90.9%。在交易量过高的情况下可能会在一定程度上可能对市场稳定性、公平竞争和投资者信心造成负面影响。
+                
+              </span>
+
+
+
+        </el-card>
+      </el-dialog>
+      <!-- #3弹窗-风险预警-查看全部详情 -->
+      <el-dialog  :visible.sync="detailsdialog_all_1" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:300px;margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">风险预警详情</span>
+        </el-card>
+      </el-dialog>
+      <!-- #4弹窗-异常预警-查看异常统计 -->
+      <el-dialog  :visible.sync="detailsdialog_all_2" width="100%" @open="open()" >
+        <!-- 详细信息 -->
+        <el-card style=" height:300px;margin-bottom:10px ; " :body-style={padding:0} >    
+          <span class="superscript" style="width: 20px; height: 40px;">all-2</span>
+        </el-card>
+      </el-dialog>
+  </div>
+</div>
+</template>
+
+<script>
+import Histogram from "@/components/echarts/Histogram.vue";
+import http from "@/utils/request";
+import vueSeamlessScroll from 'vue-seamless-scroll'
+export default {
+  components:{
+    Histogram,
+    vueSeamlessScroll,
+  },
+  data () {
+    return {
+      stockLow:1862,
+      stockMid:442,
+      stockHigh:87,
+      listData: [{
+        'title': '无缝滚动第一行无缝滚动第一行',
+        'date': '2017-12-16',
+        't':'ss'
+      }, {
+        'title': '无缝滚动第二行无缝滚动第二行',
+        'date': '2017-12-16',
+        't':'qq'
+      }, {
+        'title': '无缝滚动第三行无缝滚动第三行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第四行无缝滚动第四行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第五行无缝滚动第五行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第六行无缝滚动第六行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第七行无缝滚动第七行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第八行无缝滚动第八行',
+        'date': '2017-12-16'
+      }, {
+        'title': '无缝滚动第九行无缝滚动第九行',
+        'date': '2017-12-16'
+      }],
+      defaultOption:{
+        step: 0.1, // 数值越大速度滚动越快
+        limitMoveNum: 10, // 开始无缝滚动的数据量 this.dataList.length
+        hoverStop: true, // 是否开启鼠标悬停stop
+        direction: 0, // 0向下 1向上 2向左 3向右
+        openWatch: true, // 开启数据实时监控刷新dom
+        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+      },
+      contentList:[],
+      // 整合收据进行接收
+      formInline1:{
+        market:'stock'
+      },
+      // 表格数据
+      tableData_main_1:[
+        {
+          序号:1,
+          主体名称:'股票1',
+          主体代码:'688001.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'流动风险',
+        },
+        {
+          序号:2,
+          主体名称:'股票2',
+          主体代码:'688002.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'市场风险',
+        },
+      ],
+      tableLabel_main_1: {
+        序号: '序号',
+        主体名称: '主体名称',
+        主体代码: '主体代码',
+        主体类型: '主体类型',
+        行业:'行业',
+        当前预警时刻:'当前预警时刻',
+        预警类型:'预警类型',
+        风险类型:'风险类型',
+
+      },
+        
+      tableData_main_2:[
+        {
+          序号:1,
+          主体名称:'股票1',
+          主体代码:'688001.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'流动风险',
+        },
+        {
+          序号:2,
+          主体名称:'股票2',
+          主体代码:'688002.SH',
+          主体类型:'股票',
+          行业:'计算机',
+          当前预警时刻:'2023/6/29 16:00',
+          预警类型:'严重',
+          风险类型:'市场风险',
+        },
+      ],
+      tableLabel_main_2: {
+        编码: '序号',
+        // 名称: '主体名称',
+        名称: '主体代码',
+        // 主体类型: '主体类型',
+        // 行业:'行业',
+        监测时间:'当前预警时刻',
+        异常水平:'异常水平',
+        异常关联类型:'风险类型',
+      },
+
+      //三个表
+      tableLabel1: {
+        编码: '编号',
+        异常关联类型: '异常关联类型',
+        名称: '涉及股票',
+        监测时间: '监测时间',
+        股票价格: '股票价格',
+        交易数量: '交易数量',
+        风险等级: '风险等级',
+      },
+      tableLabel2: {
+        编码: '编号',
+        异常关联类型: '异常关联类型',
+        名称: '涉及主体',
+        监测时间: '监测时间',
+        股票价格: '债券价格',
+        交易数量: '交易数量',
+        风险等级: '风险等级',
+      },
+      tableLabel3: {
+        编码: '编号',
+        异常关联类型: '异常关联类型',
+        涉及商品: '涉及商品',
+        合约名称: '合约名称',
+        监测时间: '监测时间',
+        股票价格: '股票价格',
+        交易数量: '交易数量',
+        风险等级: '风险等级',
+
+      },
+      tableData_detail_1_1:[
+      {
+        序号: 1,
+        主体名称: '股票1',
+        主体类型: '股票',
+        省份:'北京',
+        行业:'计算机',
+        历史预警时刻:'2023/6/21 16:00',
+        当前预警时刻:'2023/6/29 10:00',
+        预警值:80,
+        预警值同比:'+1',
+        预警类型:'严重',
+        风险类型:'流动风险',
+        风险等级:8,
+        影响力等级:'高',
+        健康等级:'危险',
+
+      },
+
+      ],
+      tableLabel_detail_1: 
+      {
+        序号: '序号',
+        主体名称: '主体名称',
+        主体类型: '主体类型',
+        省份:'省份',
+        行业:'行业',
+        历史预警时刻:'历史预警时刻',
+        当前预警时刻:'当前预警时刻',
+        预警值:'预警值',
+        预警值同比:'预警值同比',
+        预警类型:'预警类型',
+        风险类型:'风险类型',
+        风险等级:'风险等级',
+        影响力等级:'影响力等级',
+        健康等级:'健康等级',
+
+      },
+      tableData_detail_1_2: [
+      {
+      name:'秦农商行',
+      },
+      {  
+      name:'华夏商行',
+      },
+      ],
+      tableData_detail_2_1:[
+      {
+        序号: 1,
+        主体名称: '股票1',
+        主体类型: '股票',
+        省份:'北京',
+        行业:'计算机',
+        历史预警时刻:'2023/6/21 16:00',
+        当前预警时刻:'2023/6/29 10:00',
+        预警值:80,
+        预警值同比:'+1',
+        预警类型:'严重',
+        风险类型:'流动风险',
+        风险等级:8,
+        影响力等级:'高',
+        健康等级:'危险',
+
+      },
+
+      ],
+      tableLabel_detail_2_1: 
+      {
+        序号: '序号',
+        主体名称: '主体名称',
+        主体类型: '主体类型',
+        省份:'省份',
+        行业:'行业',
+        历史预警时刻:'历史预警时刻',
+        当前预警时刻:'当前预警时刻',
+        预警值:'预警值',
+        预警值同比:'预警值同比',
+        预警类型:'预警类型',
+        风险类型:'风险类型',
+        风险等级:'风险等级',
+        影响力等级:'影响力等级',
+        健康等级:'健康等级',
+
+      },
+      tableLabel_detail_2_2: 
+      {
+        编号: '编号',
+        异常主体:'异常主体',
+        关联对象:'关联对象',
+        异常关联类型:'异常关联类型',
+        关联相似度:'关联相似度',
+        涉及事件详情:'涉及事件详情',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'风险等级',
+      },
+      tableData_detail_2_2:[
+      {
+        编号: '',
+        异常主体:'股票1',
+        关联对象:'股票2',
+        异常关联类型:'高频交易',
+        关联相似度:'关联相似度',
+        涉及事件详情:'事件分析',
+        高影响力主体分析:'高影响力主体分析',
+        风险等级:'',
+      },
+
+      ],
+
+
+      // 判断是否弹窗打开
+      detailsdialog1:false,
+      detailsdialog2:false,
+      detailsdialog_all_1:false,
+      detailsdialog_all_2:false,
+
+      //预警类型
+      warning_type1:'风险预警',
+      warning_type2:'异常预警',
+
+
+    }
+ 
+  },
+  mounted(){
+    let that=this
+    http.get('/warning/get_warning_count/').then((res)=> {
+        this.stockLow=res.data["低风险"]
+      this.stockMid=res.data["中风险"]
+      this.stockHigh=res.data["高风险"]
+    })
+          this.contentList.length=0
+    http.get('/anomaly/item_anomaly/',{params:{
+        sc:this.formInline1.market,
+      }}).then((res)=>{
+
+      for (let i in res.data.data){
+        let tmp={}
+        if (that.formInline1.market!=='future')
+        {tmp['time']=res.data.data[i].监测时间
+        tmp['entity']=res.data.data[i].名称
+        tmp['type']=res.data.data[i].异常关联类型}
+        else {
+          tmp['time']=res.data.data[i].监测时间
+          tmp['entity']=res.data.data[i].涉及商品
+          tmp['type']=res.data.data[i].异常关联类型
+        }
+        this.contentList.push(tmp)
+      }
+      console.log(this.contentList)
+      console.log(this.listData)
+    })
+  },
+  methods:{
+// 调整表格列宽
+  calculateColumnWidth(prop,data) {
+      const text = String(data[0][prop]); // 使用第一行的数据作为示例
+      const calculatedWidth = text.length;
+      // console.log('console.log(calculatedWidth):',calculatedWidth)
+      if(calculatedWidth>10 && calculatedWidth<=50){
+        const baseWidth= 20 + calculatedWidth * 0.5
+        return `${baseWidth}px`;
+      }
+      if(calculatedWidth<=10){
+        const baseWidth= 15
+        return `${baseWidth}px`;
+      }
+      else{
+        const baseWidth= 20 + calculatedWidth * 0.5
+        return `${baseWidth}px`;
+      }
+ },
+
+
+    onSubmit1(){
+      http.get('/anomaly/item_anomaly/',{params:{
+          sc:this.formInline1.market,
+        }}).then((res)=>{
+        this.tableData_main_2=res.data.data
+      })
+      // http.get('/warning/warning_rank/',{params:{
+      //     market: this.formInline1.market,
+      //   }}).then((res)=>{
+      //   this.tableData_main_2=res.data.data
+      // })
+    },
+    // 1、风险/异常单条数据查看详情
+    detail1(warning_type){
+      if(warning_type==='风险预警'){
+          this.detailsdialog1 = true//打开弹窗
+      }
+      if (warning_type==='异常预警') {
+        this.detailsdialog2 = true//打开弹窗
+        
+      }
+         
+    },
+     // 2、风险预警-查看全部详情
+     detail2(){
+      this.detailsdialog_all_1 = true//打开弹窗
+    },
+     // 4、异常预警-查看全部详情
+     detail3(){  
+      this.detailsdialog_all_2 = true//打开弹窗
+    },
+
+    // 1、风险预警-查看风险统计
+    statistics1(){
+      // this.detailsdialog1 = true//打开弹窗
+      // 修改成页面跳转
+    },
+    // 2、异常预警-查看异常统计
+    statistics3(){
+      // this.detailsdialog3 = true//打开弹窗
+    },
+   
+    // 打开弹窗图像
+    open(){
+              // this.$nextTick(() => {
+              // //  执行echarts方法
+              //   this.initEcharts()
+              // })
+            },
+    
+  },
+  watch:{
+    'formInline1.market': {
+      handler() {
+        this.contentList.length = 0
+          http.get('/anomaly/item_anomaly/', {
+            params: {
+              sc: this.formInline1.market,
+            }
+          }).then((res) => {
+            for (let i in res.data.data) {
+              let tmp = {}
+              tmp.time = res.data.data[i].监测时间
+              tmp.entity = res.data.data[i].名称
+              tmp.type = res.data.data[i].异常关联类型
+              this.contentList.push(tmp)
+      }
+    })
+    }
+  }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.wrap {
+  height: 270px;
+  width: 550px;
+  margin: 0 auto;
+  overflow: hidden;
+  ul {
+    list-style: none;
+    padding: 0;
+    margin: 0 auto;
+    li,
+    //span {
+    //  display: block;
+    //  height: 30px;
+    //  line-height: 30px;
+    //  display: flex;
+    //  justify-content: space-between;
+    //  font-size: 15px;
+    //}
+    span {
+      display: inline-block;
+      height: 30px;
+      line-height: 30px;
+      display: flex;
+      width: 550px;
+      white-space: normal;
+      word-break: break-all;
+      justify-content: space-between;
+      font-size: 15px;
+    }
+  }
+}
+.form{//产品搜索栏
+    display:flex;
+    justify-content:space-between;//左右贴边
+    margin-top:5px; 
+    margin-bottom:0px; 
+    // height: 40px;
+    margin-left: 50px;
+    padding: 0px;
+    .el-form-item {
+    margin-bottom: 5px;
+    }
+  }
+
+.my-element {
+  background-image: url('~@/assets/card.png');
+  // width:100%;			//大小设置为100%
+  // height:100%;			//大小设置为100%
+  // position:fixed;
+  background-size:100% 100%;
+  margin-left: 20px;
+  margin-right: 20px;
+  margin-top: 20px;
+
+
+
+}
+.tirCard {
+  display:flex;
+  justify-content:space-between;
+}
+.tirCircle{
+  display:flex;
+  justify-content:space-between;
+  margin-left: 20px;
+  margin-right: 30px;
+  .circle_low {
+    background: #dffbee;
+    border: 0.7em solid #4dca8e;
+    border-radius: 50%;
+    // box-shadow: 0.375em 0.375em 0 0 rgba(15, 28, 63, 0.125);
+    height: 5em;
+    width: 5em;
+    // margin-left: 20px;
+  }
+  .circle_mid {
+    background: #fdf6e5;
+    border: 0.7em solid #f1c049; 
+    border-radius: 50%;
+    // box-shadow: 0.375em 0.375em 0 0 rgba(15, 28, 63, 0.125);
+    height: 5em;
+    width: 5em;
+
+  }
+  .circle_high {
+    background: #fce0ee;
+    border: 0.7em solid #c43434cc;
+    border-radius: 50%;
+    // box-shadow: 0.375em 0.375em 0 0 rgba(15, 28, 63, 0.125);
+    height: 5em;
+    width: 5em;
+    // margin-right: 20px;
+  }
+}
+.tirText{
+  display:flex;
+  justify-content:space-between;
+  margin-left: 45px;
+  margin-right: 60px;
+}
+
+
+.one_twins_card{
+    margin-top:0px;
+    margin-bottom:10px;
+    margin-left: 10px;
+    margin-right: 10px;
+    display:flex;
+    justify-content:space-between;//左右贴边
+    .el-card {
+      width:49.5%;
+    } 
+    .el-col-2 {
+     width: 2%;
+
+  }
+}
+.sublabel{ // 小标签标识
+    // font-size: 13px;
+    // padding:2px;
+    margin-top:10px;
+    background-color: rgba(2, 167, 240, 0.5);
+    width: 5px; 
+    height: 35px;
+
+    
+  }
+.title{
+    padding-left: 4px;
+    margin-top:15px;
+    font-weight: bold;//字体加粗
+    display:flex;
+    justify-content:flex-start
+}
+/deep/ .text{
+      color:rgba(2, 167, 240, 0.729411764705882);
+      margin-top:15px;
+      padding: 10px;
+      padding-bottom: 5px;
+      display:flex;
+    // justify-content:right;
+    }
+/deep/ .text_detail{
+      color:rgba(2, 167, 240, 0.729411764705882);
+    // justify-content:right;
+    }
+
+  
+
+
+
+
+
+.table{
+  font-size: 12px;
+  margin: 2px 10px 2px 10px;//返回表格添加间隙 上 右
+  // padding-right:10px;
+}
+.detail_table{
+  margin-top: 15px;
+  margin-left: 10px;
+  margin-right: 0px;
+/deep/ .el-table {
+  width: 98.5% !important;
+}
+}
+  // 右侧空只能这样调整，左侧必须用margin
+  /deep/ .el-table {
+    width: 97.5% !important;
+    // margin-right: 10px;
+  }
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 1px 1px 1px; 
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0; 
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #333333;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+
+
+
+    .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+</style>
diff --git a/src_old/views/风险传导.vue b/src_old/views/风险传导.vue
new file mode 100644
index 0000000..5306cf3
--- /dev/null
+++ b/src_old/views/风险传导.vue
@@ -0,0 +1,1259 @@
+<!-- 风险传导 -->
+<template>
+   <div>
+
+
+<!--     加载容器-->
+<!--     <div class="honeycomb" v-if="waitLoad"></div>-->
+        <el-button @click="drawer = true" type="primary" plain style="margin-left: 20px;">更多功能</el-button>
+        风险源：{{source}}
+        <el-drawer
+        title="风险传导条件查询"
+        :visible.sync="drawer"
+        :modal="false"
+        :show-close="true" 
+        :with-header="false">
+
+        <p  style="padding: 0; margin-top:5px; margin-left:12px;margin-bottom: 15px;font-size: 22px;">风险传导条件查询</p>
+        
+        
+        <el-form :inline="true">
+            <!-- 0主要查询 -->
+            <el-form-item label="风险类型:" style="padding: 0; margin: 1px;margin-left:12px ;font-weight: bold;">
+                <el-select v-model="riskSelect" placeholder="流动风险"  size="mini">
+                    <el-option label="流动风险" value="流动风险"></el-option>
+                    <el-option label="市场风险" value="市场风险"></el-option>
+                    <el-option label="经营风险" value="经营风险"></el-option>
+                    <el-option label="信用风险" value="信用风险"></el-option>
+                    <el-option label="资产负债风险" value="资产负债风险"></el-option>
+                    <el-option label="获现风险" value="获现风险"></el-option>
+                </el-select>
+            </el-form-item>
+            
+            <el-form-item label="传导范围:" style="padding: 0; margin: 1px;margin-left:12px ;font-weight: bold;">
+    
+                <el-checkbox :indeterminate="isIndeterminate" v-model="checkAllRange" @change="handleCheckAllChange" style="display: flex-start;">全选</el-checkbox>
+                <el-checkbox-group v-model="checkedRanges" @change="handleCheckedRangesChange" style="display: flex-start;padding: 0;margin: 0 0px 0 1px">
+                    <el-checkbox v-for="range in Ranges" :label="range" :key="range" >{{range}}</el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+
+            <el-form-item label="选择时间:" prop="选择时间" style="padding: 0;margin: 0 0 0 12px;font-weight: bold;">
+                <el-date-picker v-model="date" type="date" placeholder="年/月/日" size="mini"> </el-date-picker>
+            </el-form-item>
+
+            <el-form-item style="padding: 0;margin: 0 0 0 12px;">
+                <el-button  type="primary" plain size="mini" @click="onSubmit1" style="margin-left: 20px;">查询</el-button>
+            </el-form-item>
+
+            
+
+
+
+
+
+
+            
+            <el-dialog :visible.sync="dialogVisible2" width="100%" >弹窗2
+            </el-dialog>
+
+
+            <el-divider content-position="left"></el-divider>
+
+        </el-form>
+
+        </el-drawer>
+     <!--渲染容器-->
+     <div class="graph" ref="graph" id="graph" ></div>
+
+<!--     表格-->
+     <el-dialog :visible.sync="dialogVisible1"  :modal="false" width="100%" >
+       <el-table style="width: 100%" border :data="currentData.slice((currentPage-1)*pageSize,currentPage*pageSize)" empty-text="暂无数据" >
+         <el-table-column
+             type="index"
+             width="40">
+         </el-table-column>
+         <el-table-column
+             prop="name"
+             label="名称"
+             width="200">
+         </el-table-column>
+         <el-table-column
+             prop="val"
+             label="风险值"
+             width="200">
+         </el-table-column>
+       </el-table>
+
+       <!--     分页-->
+       <div class="block" style="margin-top:15px;"  >
+         <el-pagination align='center' @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                        :current-page="currentPage"
+
+                        :page-size="pageSize"
+                        layout="total, sizes, prev, pager, next, jumper"
+                        :total="currentData.length">
+         </el-pagination>
+       </div>
+     </el-dialog>
+
+
+     <!--     步骤条-->
+     <el-steps :active="active" finish-status="success" v-if="showStep">
+       <el-step v-for="(s,index) in steps"  :key="index"  :title="s.title"></el-step>
+<!--       <el-step title="步骤 2"></el-step>-->
+<!--       <el-step title="步骤 3"></el-step>-->
+     </el-steps>
+<!--     <el-button style="margin-top: 12px;" @click="next"  icon="el-cion-right">下一步</el-button>-->
+
+
+<!--     <el-form :inline="true">-->
+     <div class="button-container">
+     <button class="flashButton"  @click="next">下一步</button>
+     <div class="toggle-cont">
+       <input class="toggle-input"
+              id="toggle"
+              name="toggle"
+              type="checkbox"
+              v-model="dispalyInfect" />
+       <label class="toggle-label" for="toggle">
+         <div class="cont-label-play">
+           <span class="label-play"></span>
+         </div>
+       </label>
+     </div>
+<!--       <el-form-item style="padding: 0; margin: 10px 0 0 12px;">-->
+         <el-button type="primary" round @click="dialogVisible1 = true" class="button button-right" >当前步的风险节点</el-button>
+         <!--                <el-button type="text" @click="dialogVisible2 = true" style="margin-left:20px">风险源</el-button>-->
+<!--       </el-form-item>-->
+
+     </div>
+    </div>
+
+</template>
+
+<script>
+import {Loading} from "element-ui";
+import http from "@/utils/request";
+import cytoscape from 'cytoscape'
+import expandCollapse from "cytoscape-expand-collapse";
+import euler from "cytoscape-euler";
+const rangeOptions = ['股东', '流通股东', '股权质押', '担保', '格兰杰因果关系'];
+export default {
+  components: {},
+  data() {
+    return {
+
+      currentPage: 1, // 当前页码
+      total: 20, // 总条数
+      pageSize: 10, // 每页的数据条数
+      activityData:[],
+      source:'',
+      currentData:'',
+      clock:undefined,
+      dispalyInfect:false,
+      table_datas:[],
+      showStep:false,
+      active:0,
+      waitLoad:false,
+      elements_data: { 'nodes': [], 'edges': [] },
+      step: 0,
+      intervalId: null,
+      warningString:'',
+
+      // 控制抽屉是否展开
+      drawer: false,
+      riskSelect: '',
+      conductionRange: '',
+      // 多选框-传导范围
+      checkAllRange: false,
+      checkedRanges: [],
+      Ranges: rangeOptions,
+      isIndeterminate: true,//用以表示 checkbox 的不确定状态，一般用于实现全选的效果
+      // 时间
+      date: '',
+
+      // 弹窗
+      dialogVisible1: false,
+      dialogVisible2: false,
+
+    }
+  },
+
+  watch:{
+    dispalyInfect(newValue){
+
+      if (newValue===true){
+
+        this.$message.info('开始播放')
+        //开始播放
+        this.clock=setInterval(this.next,3000)
+      }
+      if(newValue===false){
+        this.$message.info('暂停播放')
+        clearInterval(this.clock)
+      }
+    },
+
+    $route: {
+      handler: function(old) {
+        if (Object.keys(old.params).length>0){
+          this.sent(old.params.name,old.params.type,'股东,流通股东,股权质押,担保,格兰杰因果关系',old.params.date)
+          this.source=old.params.name
+
+        }
+
+      },
+      immediate: true
+    },
+   //  step(newValue){
+   //    this.currentData=this.table_datas[this.step]
+   //
+   // }
+
+  },
+beforeDestroy() {
+  clearInterval(this.clock)
+    //需要清除
+    },
+  computed: {
+
+    // step改变才会触发steps的计算属性？
+    steps() {
+      const result = [];
+      for (let i = 1; i <= this.step; i++) {
+        result.push({
+          title: '第' + i  + '阶段'
+        });
+      }
+      return result;
+    }
+  },
+  mounted() {
+    this.initGraph()
+  },
+
+  methods: {
+
+
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.currentPage = 1;
+      this.pageSize = val;
+    },
+    //当前页改变时触发 跳转其他页
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.currentPage = val;
+    },
+
+    next() {
+
+      if (this.active=== this.step) {
+
+        this.active = 0;   //回零  ++优先级高与>
+        //初始状态
+        //点击每一个阶段
+        //代表不同的感染程度？ //只有最后一个阶段才会出现，前面都是感染节点
+
+        this.$cy.nodes().removeClass('cr_node');
+        this.$cy.nodes().removeClass('cr_node25');
+        this.$cy.nodes().removeClass('cr_node50');
+        this.$cy.nodes().removeClass('cr_node75');
+        this.$cy.nodes().removeClass('cr_node100');
+
+      }
+
+
+        // var index = $(this).index('.step-icon-txt');
+        this.currentData = this.table_datas[this.active];  //这一阶段的传染节点  和table_datas的下标相对应
+      // console.log(cr_data)
+      // console.log(this.active)
+        //对最后一阶段的节点权重进行排序
+        // let last_index = $('.step-icon-txt').length - 1;
+      let last_data = this.table_datas[this.step-1];
+        last_data.sort(function (a, b) {
+          return (a['val'] - b['val'])
+        });
+        let l = last_data.length;
+      let s25 = last_data.slice(0, parseInt(l * 0.25)),
+            s50 = last_data.slice(parseInt(l * 0.25), parseInt(l * 0.5)),
+            s75 = last_data.slice(parseInt(l * 0.5), parseInt(l * 0.75)),
+            s100 = last_data.slice(parseInt(l * 0.75), l);
+
+        if (this.active < this.step-1) {
+          for (let i = 0; i < this.currentData.length; i++) {
+            let name = this.currentData[i]['name'];
+            this.$cy.nodes().filter(function (element, i) {
+              return element.data('name') === name
+            }).addClass('cr_node')
+
+          }
+        } else
+        {
+
+          //最后阶段
+          for (let i = 0; i < s25.length; i++) {
+            let name = s25[i]['name'];
+            this.$cy.nodes().filter(function (element, i) {
+              return element.data('name') === name
+            }).addClass('cr_node25')
+          }
+          for (let i = 0; i < s50.length; i++) {
+            let name = s50[i]['name'];
+            this.$cy.nodes().filter(function (element, i) {
+              return element.data('name') === name
+            }).addClass('cr_node50')
+          }
+          for (let i = 0; i < s75.length; i++) {
+            let name = s75[i]['name'];
+            this.$cy.nodes().filter(function (element, i) {
+              return element.data('name') === name
+            }).addClass('cr_node75')
+          }
+          for (let i = 0; i < s100.length; i++) {
+            let name = s100[i]['name'];
+            this.$cy.nodes().filter(function (element, i) {
+              return element.data('name') === name
+            }).addClass('cr_node100')
+          }
+        }
+
+      this.active++
+//这里源代码是根据的点击阶段改变了表格展现的数据
+        // //表格
+        // var tableData = [];
+        // // for(var h=0;h<=index;h++)
+        // // {
+        // var con = '';
+        // var dd = table_datas[index];
+        // dd.sort(function (a, b) {
+        //   return (b['val'] - a['val'])
+        // })
+        // for (var i = 0; i < dd.length; i++) {
+        //   con += (dd[i]['name'] + '：' + dd[i]['val'] + '\n');
+        // }
+        //
+        // var d1 = {
+        //   jd: index + 1,
+        //   cons: con
+        // }
+        // tableData.push(d1)
+        // }
+        // $("#info_table").bootstrapTable('destroy');
+        // $('#info_table').bootstrapTable({
+        //   data: tableData,
+        //   toolbar: '#toolbar1',                //工具按钮用哪个容器
+        //   striped: true,                      //是否显示行间隔色
+        //   cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        //   pagination: true,                   //是否显示分页（*）
+        //   sortable: false,                     //是否启用排序
+        //   sortOrder: "asc",                   //排序方式
+        //   locale: "zh-CN", //表格汉化
+        //   // queryParams: oTableInit.queryParams,//传递参数（*）
+        //   sidePagination: "client",           //分页方式：client客户端分页，server服务端分页（*）
+        //   pageNumber: 1,                       //初始化加载第一页，默认第一页
+        //   pageSize: 10,                       //每页的记录行数（*）
+        //   pageList: [10, 25, 50, 100],        //可供选择的每页的行数（*）
+        //   clickToSelect: true,
+        //   showExport: true,                     //是否显示导出
+        //   // exportDataType: $(this).val(),
+        //   exportDataType: "all",              //basic', 'all', 'selected'.
+        //   columns: [
+        //     {
+        //       field: 'jd',
+        //       title: '阶段'
+        //     }, {
+        //       field: 'cons',
+        //       title: '详细信息（公司名称：风险值）'
+        //     }]
+        // });
+        // $('#info_table').bootstrapTable('hideLoading');
+
+
+
+
+
+    },
+
+    initGraph(){
+      if (!cytoscape().expandCollapse) {
+        cytoscape.use(expandCollapse)
+      }
+      if (!cytoscape().euler) {
+        cytoscape.use(euler)
+      }
+      this.$cy = cytoscape({
+            container: document.getElementById('graph'),
+            // ready: function () {
+            // var api = this.expandCollapse({
+            //   layoutBy: {
+            //     name: 'euler',
+            //     randomize: true,
+            //     animate: false
+            //   },
+            //   fisheye: true,
+            //   animate: false,
+            //   ready: function () { },
+            //   undoable: false,
+            //   randomize: false,
+            //
+            //   cueEnabled: true, // Whether cues are enabled
+            //   expandCollapseCueSize: 12, // size of expand-collapse cue
+            //   expandCollapseCueLineSize: 8, // size of lines used for drawing plus-minus icons
+            //   expandCueImage: undefined, // image of expand icon if undefined draw regular expand cue
+            //   collapseCueImage: undefined, // image of collapse icon if undefined draw regular collapse cue
+            //   expandCollapseCueSensitivity: 1, // sensitivity of expand-collapse cues
+            //   allowNestedEdgeCollapse: false
+            // });
+            //api.collapseAll();
+
+          // },
+          style: cytoscape.stylesheet()
+
+          .selector('node[label = "公司"]')   //定义节点的样式
+          .css({ 'background-color': '#d71345' })
+          .selector('node[label = "上市公司"]')
+          .css({ 'background-color': '#ef4136' }) //'shape':'triangle'
+          .selector('node[label = "上市公司-实体企业"]')
+          .css({ 'background-color': '#FF1493' })
+          .selector('node[label = "上市公司-金融机构"]')
+          .css({ 'background-color': '#C71585' })
+          .selector('node[label = "上市公司-金融机构-银行"]')
+          .css({ 'background-color': '#f8aba6' })
+          .selector('node[label = "上市公司-金融机构-证券"]')
+          .css({ 'background-color': '#f05b72' })
+          .selector('node[label = "上市公司-金融机构-保险"]')
+          .css({ 'background-color': '#d93a49' })
+          .selector('node[label = "上市公司-金融机构-信托"]')
+          .css({ 'background-color': '#FF69B4' })
+          .selector('node[label = "上市公司-金融机构-基金"]')
+          .css({ 'background-color': '#DB7093' })
+          .selector('node[label = "上市公司-金融机构-基金-公募基金"]')
+          .css({ 'background-color': '#FFB6C1' })
+          .selector('node[label = "上市公司-金融机构-基金-私募基金"]')
+          .css({ 'background-color': '#FFC0CB' })
+          .selector('node[label = "上市公司-金融机构-其他金融机构"]')
+          .css({ 'background-color': '#D8BFD8' })
+          .selector('node[label = "非上市公司"]')
+          .css({ 'background-color': '#102b6a' })
+          .selector('node[label = "非上市公司-实体企业"]')
+          .css({ 'background-color': '#224b8f' })
+          .selector('node[label = "非上市公司-金融机构"]')
+          .css({ 'background-color': '#2a5caa' })
+          .selector('node[label = "非上市公司-金融机构-银行"]')
+          .css({ 'background-color': '#2b4490' })
+          .selector('node[label = "非上市公司-金融机构-证券"]')
+          .css({ 'background-color': '#426ab3' })
+          .selector('node[label = "非上市公司-金融机构-保险"]')
+          .css({ 'background-color': '#0072E3' })
+          .selector('node[label = "非上市公司-金融机构-信托"]')
+          .css({ 'background-color': '#0080FF' })
+          .selector('node[label = "非上市公司-金融机构-基金"]')
+          .css({ 'background-color': '#46A3FF' })
+          .selector('node[label = "非上市公司-金融机构-基金-公募基金"]')
+          .css({ 'background-color': '#66B3FF' })
+
+          .selector('node[label = "非上市公司-金融机构-基金-私募基金"]')
+          .css({ 'background-color': '#84C1FF' })
+          .selector('node[label = "非上市公司-金融机构-其他金融机构"]')
+          .css({ 'background-color': '#97CBFF' })
+
+          .selector('node[label = "人物"]')
+          .css({ 'background-color': '#e0861a' })
+          .selector('node[label = "人物-普通人物"]')
+          .css({ 'background-color': '#fcaf17' })
+          .selector('node[label = "人物-基金经理"]')
+          .css({ 'background-color': '#faa755' })
+          .selector('node[label = "人物-投资经理"]')
+          .css({ 'background-color': '#f58220' })
+
+          .selector('node[label = "机构-国务院国有资产监督管理委员会"]')
+          .css({ 'background-color': '#2e3a1f' })
+
+          .selector('node[label = "监管机构"]')
+          .css({ 'background-color': '#1d953f' })
+          .selector('node[label = "监管机构-银保监会（局）"]')
+          .css({ 'background-color': '#78a355' })
+          .selector('node[label = "监管机构-证监会（局）"]')
+          .css({ 'background-color': '#7fb80e' })
+          .selector('node[label = "监管机构-人民银行（分行）"]')
+          .css({ 'background-color': '#78a355' })
+          .selector('node[label = "监管机构-食药监局"]')
+          .css({ 'background-color': '#abc88b' })
+          .selector('node[label = "监管机构-网信"]')
+          .css({ 'background-color': '#45b97c' })
+          .selector('node[label = "监管机构-工信"]')
+          .css({ 'background-color': '#007d65' })
+          .selector('node[label = "监管机构-行业协会"]')
+          .css({ 'background-color': '#40835e' })
+
+          .selector('node[label = "交易所"]')
+          .css({ 'background-color': '#3e4145' })
+
+          .selector('node[label = "板块"]')
+          .css({ 'background-color': '#563624' })
+
+          .selector('node[label = "地点"]')
+          .css({ 'background-color': '#2468a2' })
+          .selector('node[label = "地点-国家"]')
+          .css({ 'background-color': '#228fbd' })
+          .selector('node[label = "地点-省"]')
+          .css({ 'background-color': '#33a3dc' })
+          .selector('node[label = "地点-县/区"]')
+          .css({ 'background-color': '#7bbfea' })
+          .selector('node[label = "地点-市"]')
+          .css({ 'background-color': '#90d7ec' })
+
+          .selector('node[label = "行业"]')
+          .css({ 'background-color': '#2e3a1f' })
+          .selector('node[label = "行业-门类"]')
+          .css({ 'background-color': '#454926' })
+          .selector('node[label = "行业-大类"]')
+          .css({ 'background-color': '#726930' })
+          .selector('node[label = "行业-中类"]')
+          .css({ 'background-color': '#4d4f36' })
+
+          .selector('node[label = "产品"]')
+          .css({ 'background-color': '#494e8f' })
+          .selector('node[label = "产品-一般产品"]')
+          .css({ 'background-color': '#585eaa' })
+          .selector('node[label = "产品-服务产品"]')
+          .css({ 'background-color': '#6a6da9' })
+          .selector('node[label = "产品-金融产品"]')
+          .css({ 'background-color': '#6950a1' })
+          .selector('node[label = "产品-金融产品-股票"]')
+          .css({ 'background-color': '#6f60aa' })
+          .selector('node[label = "产品-金融产品-债券"]')
+          .css({ 'background-color': '#6f599c' })
+          .selector('node[label = "产品-金融产品-基金"]')
+          .css({ 'background-color': '#9b95c9' })
+          .selector('node[label = "产品-金融产品-基金--公募"]')
+          .css({ 'background-color': '#afb4db' })
+          .selector('node[label = "产品-金融产品-基金--私募"]')
+          .css({ 'background-color': '#C7C7E2' })
+          .selector('node[label = "产品-金融产品-基金--REITS"]')
+          .css({ 'background-color': '#867892' })
+          .selector('node[label = "产品-金融产品-信托"]')
+          .css({ 'background-color': '#918597' })
+          .selector('node[label = "产品-金融产品-其他"]')
+          .css({ 'background-color': '#6f6d85' })
+
+          .selector('node[label = "学校"]')
+          .css({ 'background-color': '#ffd400' })
+
+          .selector('node[label = "非上市公司其他公司"]')
+          .css({ 'background-color': '#cbc547' })
+
+          .selector('node[label = "未知"]')
+          .css({ 'background-color': '#d9d6c3' })
+
+          // .selector('node.cy-expand-collapse-collapsed-node')
+          //   .style({
+          //       "background-color": "darkblue",
+          //       "shape": "rectangle"
+          //   })
+          .selector(':parent')
+          .style({
+            'background-opacity': 0.1,
+            'border-width': .001
+          })
+          .selector('node')
+          .style({
+            'color': '#999999', //定义节点标签颜色
+            'background-opacity': 1,
+            'font-size': '5px',
+            'width': '17px',
+            'height': '17px',
+
+          })
+          .selector('edge')   //定义边的样式
+          .style({
+            //'label': 'data(relationship)',
+            'target-arrow-shape': 'triangle-backcurve', /*箭头样式*/
+            'target-arrow-size': '0.1px', /*箭头大小*/
+            'target-arrow-color': '#8B8989', /*箭头颜色*/
+            'curve-style': 'bezier', /*线条样式曲线*/
+            'line-color': '#8B8989', /*线条颜色*/
+            'width': '2px', /*线条宽度*/
+            'font-size': '6px', /*标签字体大小*/
+            'color': '#999999', /*标签字体大小*/
+            'text-outline-color': 'white', /*文本轮廓颜色*/
+            'text-outline-width': '1px', /*文本轮廓宽度*/
+            'text-rotation': 'autorotate', /*标签方向*/
+          })
+          .selector('edge.cy-expand-collapse-collapsed-edge')
+          .style(
+              {
+                "text-outline-color": "#ffffff",
+                "text-outline-width": "1px",
+                'label': (e) => {
+                  return '(' + e.data('collapsedEdges').length + ')';
+                },
+                'width': function (edge) {
+                  const n = edge.data('collapsedEdges').length;
+                  return (1 + Math.log2(n)) + 'px';
+                },
+                //'line-opacity':1,
+                'line-style': 'dashed',
+                'line-color': this.setColor4CompoundEdge,
+                'target-arrow-color': this.setColor4CompoundEdge,
+                'target-arrow-shape': this.setTargetArrowShape,
+                'source-arrow-shape':this.setSourceArrowShape,
+                'source-arrow-color': this.setColor4CompoundEdge,
+              })
+          .selector('node:selected')
+          .style({ 'border-color': '#c84e40', 'border-width': "1px", })
+          .selector('.search_node')
+          .style({ 'border-color': '#c84e40', 'border-width': "2px", })
+          .selector('.key_node')
+          .style({
+            'background-color': 'red',
+            'width': 30,
+            'height': 30,
+            shape: 'polygon',
+            'shape-polygon-points': '0 1, 0.8660254037844386 0.5, 0.8660254037844386 -0.5, 0 -1, -0.8660254037844386 -0.5, -0.8660254037844386 0.5',
+
+            animation: true,
+            duration: 1000
+          })
+          .selector('.cr_node')
+          .css({
+            'background-color': '#f05b72', //定义节点标签颜色
+          })
+          .selector('.cr_edge')
+          .style({
+            'target-arrow-color': '#f05b72', /*箭头颜色*/
+            'line-color': '#f05b72' /*线条颜色*/
+          })
+
+          .selector('.cr_node25')
+          .css({
+            'background-color': '#45b97c', //定义节点标签颜色
+          })
+          .selector('.cr_node50')
+          .css({
+            'background-color': '#ffc20e',
+          })
+          .selector('.cr_node75')
+          .css({
+            'background-color': '#f58220',
+          })
+          .selector('.cr_node100')
+          .css({
+            'background-color': '#b22c46', //最严重
+          })
+
+          .selector('edge:selected')
+          .style({
+            'color': '#3165fc', /*标签字体大小*/
+            'target-arrow-color': '#61bffc', /*箭头颜色*/
+            'line-color': '#61bffc', /*线条颜色*/
+            // 'width':'2px',
+          })
+          .selector('.xianshi_label_edge')
+          .style({
+            'label': 'data(relationship)',
+          })
+          .selector('.xianshi_name_node')
+          .style({
+            'content': 'data(name)',
+          })
+          .selector('.mouse_xianshi_name_node')  //鼠标 显示
+          .style({
+            'content': 'data(name)',
+            'font-size': '15px',
+            'color': '#d71345',
+          })
+          .selector('.mouse_xianshi_label_edge')  //显示边
+          .style({
+            'label': 'data(relationship)',
+            'font-size': '15px',
+            'color': '#d71345',
+          })
+          .selector('.light-off')   //高亮样式
+          .style({ 'opacity': '0.1', })    //opacity: 透明度
+          .selector('.highlighted')
+          .style({
+            'background-color': '#65c294',
+            'line-color': '#d71345',
+            'target-arrow-color': '#d71345',
+            'transition-property': 'background-color, line-color, target-arrow-color',
+            'transition-duration': '0.5s',
+            // 'width': '2px'
+          })
+          .selector('.hbnode')
+          .style({
+            'label': '合并节点',
+            'background-color': '#000080', //定义节点标签颜色
+            'background-opacity': 0.8,
+            'font-size': '20px',
+            'width': '30px',
+            'height': '30px',
+          })
+          // .selector('.keynodes')
+          //     .style({'border-color': '#1d953f', 'border-width': "1px",})
+          .selector('.hbnodes_edge')
+          .style({
+            'target-arrow-color': '#ffd400', /*箭头颜色*/
+            'line-color': '#ffd400', /*线条颜色*/
+            'width': '2px',
+          }),
+
+          elements: this.elements_data,
+          layout: {
+        name: 'breadthfirst',
+            directed: true,
+            padding: 30,
+      },   //可选：'breadthfirst', 'circle', 'concentric', 'cose', 'grid','null', 'preset', 'random'
+      zoom: 1,
+          pan: { x: 0, y: 0 },
+      minZoom: 1e-10,
+          maxZoom: 1e10,
+          zoomingEnabled: true, // 是否通过用户事件和编程方式启用缩放图形.
+          userZoomingEnabled: true, // 是否允许用户事件(例如鼠标滚轮,捏合缩放)缩放图形.对此缩放的编程更改不受此选项的影响.
+          panningEnabled: true, // 是否通过用户事件和编程方式启用平移图形.
+          userPanningEnabled: true, // 是否允许用户事件(例如拖动图形背景)平移图形.平移的程序化更改不受此选项的影响.
+          boxSelectionEnabled: true,
+          wheelSensitivity: 0.3, //缩放时更改滚轮灵敏度.这是一个乘法修饰符.因此,0到1之间的值会降低灵敏度(变焦较慢),而大于1的值会增加灵敏度(变焦更快).
+          multiselectionEnabled: true,
+          //selectionType:"additive",
+          touchTapThreshold: 8,
+          desktopTapThreshold: 4,
+          hideEdgesOnViewport: true,
+      // textureOnViewport: true
+    });
+
+
+},
+
+    getRandomColor() {
+      var r = Math.floor(Math.random() * 256);
+      var g = Math.floor(Math.random() * 256);
+      var b = Math.floor(Math.random() * 256);
+      if (r === 255 && g === 255 && b === 255)
+        this.getRandomColor();
+      else
+        return "rgb(" + r + ',' + g + ',' + b + ")";
+    },
+
+   doElemsMultiTypes(elems) {
+  const classDict = {};
+  for (let i = 0; i < elems.length; i++) {
+    classDict[elems[i].data('edgeType')] = true;
+  }
+  return Object.keys(classDict).length > 1;
+},
+ setColor4CompoundEdge(e) {
+  const collapsedEdges = e.data('collapsedEdges');
+  if (this.doElemsMultiTypes(collapsedEdges)) {
+    return '#b3b3b3';
+  }
+  return collapsedEdges[0].style('line-color')
+},
+ setTargetArrowShape(e) {
+  const collapsedEdges = e.data('collapsedEdges');
+  const shapes = {};
+  for (let i = 0; i < collapsedEdges.length; i++) {
+    shapes[collapsedEdges[0].style('target-arrow-shape')] = true;
+  }
+  delete shapes['none'];
+  if (Object.keys(shapes).length < 1) {
+    if (collapsedEdges.sources().length > 1) {
+      return collapsedEdges[0].style('source-arrow-shape');
+    }
+    return 'none';
+  }
+  return Object.keys(shapes)[0];
+},
+ setSourceArrowShape(e) {
+  const collapsedEdges = e.data('collapsedEdges');
+  const shapes = {};
+  for (let i = 0; i < collapsedEdges.length; i++) {
+    shapes[collapsedEdges[0].style('source-arrow-shape')] = true;
+  }
+  delete shapes['none'];
+  if (Object.keys(shapes).length < 1) {
+    if (collapsedEdges.sources().length > 1) {
+      return collapsedEdges[0].style('target-arrow-shape');
+    }
+    return 'none';
+  }
+  return Object.keys(shapes)[0];
+},
+
+
+
+    sent(code, fxlxValue, cdfw_str, time_input) {
+      this.currentData=''
+      this.table_datas=''
+      let that=this
+      console.log(cdfw_str)
+      let options={
+        text:'请稍等'
+      }
+      let loadingInstance = Loading.service(options);
+      http.get('/risk_model/risk_diff/'
+      ,{params:{
+        type:fxlxValue,
+              range:cdfw_str,
+              date:time_input,
+              code:code,
+
+            }}
+      ).then((res)=>{
+        this.source=res.data.source
+        this.initGraph()
+            this.$cy.elements().remove();
+            let get_data=res
+            // $("#info_table").bootstrapTable('destroy');
+
+            // $('.glyphicon-exclamation-sign').css('display','block').html('(' + get_data['data']['method'] + ')' + '当前风险源：' + get_data['data']['source']);
+            // $('.glyphicon-exclamation-sign').css('display', 'block').html(fxlxValue + '-' + '风险源(由' + get_data['data']['method'].slice(0, 2) + '数据筛选)：' + get_data['data']['source']);
+            this.warningString=fxlxValue + '-' + '风险源(由' + get_data['data']['method'].slice(0, 2) + '数据筛选)：' + get_data['data']['source']
+        this.waitLoad=false
+
+            if (get_data['data']['method'] === '财务报表') {
+              // document.getElementById('a1').innerText = '(财务报表) 当前风险源：' + get_data['data']['source'];
+              // document.getElementById('a1').innerText = fxlxValue + '-' + '风险源(由财务数据筛选)：' + get_data['data']['source'];
+              this.$message({
+                showClose: true,
+                message: this.warningString,
+                type: 'success',
+                duration:5000,
+              });
+
+            }
+
+        let net_datas = get_data['data']['net'];
+        this.table_datas = get_data['data']['table'];
+        // let stepTitles = [];
+
+            this.step=net_datas.length
+            this.showStep=true
+            for (let i = 0; i < net_datas.length; i++) {
+              let info = {"nodes": net_datas[i]['nodes'], "edges": net_datas[i]['edges']}
+              this.$cy.add(info);
+
+              // stepTitles.push('第' + (i + 1) + '阶段');
+              // time_div_cons += '<span data-time='+ i +'>  </span>';
+            }
+
+            // $('.box').html("")
+            // $('.box').step({
+            //   stepDirection: 'x',
+            //   showStepButton: true,
+            //   stepCount: stepTitles.length,
+            //   stepTitles: stepTitles,
+            // });
+
+      //       var tableData = [];
+      //
+      //       var con = '';
+      //       var dd = table_datas[0];
+      //       //dd是源信息 格式如下[
+      // //   {
+      // //     "name": "深圳市天健(集团)股份有限公司",
+      // //       "val": 996055135.6
+      // //   }
+      // // ],
+      //       dd.sort(function (a, b) {
+      //         return (b['val'] - a['val'])
+      //       })
+      //       for (let i = 0; i < dd.length; i++) {
+      //         con += (dd[i]['name'] + '：' + dd[i]['val'] + '\n');
+      //       }
+      //
+      //       var d1 = {
+      //         jd: 1,
+      //         cons: con
+      //       }
+      //       tableData.push(d1)
+
+            // }
+            // $("#info_table").bootstrapTable('destroy');
+            // $('#info_table').bootstrapTable({
+            //   data: tableData,
+            //   toolbar: '#toolbar1',                //工具按钮用哪个容器
+            //   striped: true,                      //是否显示行间隔色
+            //   cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+            //   pagination: true,                   //是否显示分页（*）
+            //   sortable: false,                     //是否启用排序
+            //   sortOrder: "asc",                   //排序方式
+            //   locale: "zh-CN", //表格汉化
+            //   // queryParams: oTableInit.queryParams,//传递参数（*）
+            //   sidePagination: "client",           //分页方式：client客户端分页，server服务端分页（*）
+            //   pageNumber: 1,                       //初始化加载第一页，默认第一页
+            //   pageSize: 10,                       //每页的记录行数（*）
+            //   pageList: [10, 25, 50, 100],        //可供选择的每页的行数（*）
+            //   clickToSelect: true,
+            //   showExport: true,                     //是否显示导出
+            //   // exportDataType: $(this).val(),
+            //   exportDataType: "all",              //basic', 'all', 'selected'.
+            //   columns: [
+            //     {
+            //       field: 'jd',
+            //       title: '阶段'
+            //     }, {
+            //       field: 'cons',
+            //       title: '详细信息（公司名称：风险值）'
+            //     }]
+            // });
+            // $('#info_table').bootstrapTable('hideLoading');
+
+            const layout = this.$cy.layout({
+              name: 'euler',
+              randomize: true,
+              animate: false,
+            });
+            layout.run();
+
+        this.$cy.nodes().filter(function (element, i) {
+              return element.data('name') === that.table_datas[0][0]['name']
+            }).addClass('cr_node')  //传染节点
+
+            // document.getElementById('fade').style.display = 'none';
+            // document.getElementById('light').style.display = 'none';
+            // $("#light_a").attr("disabled", false).css("pointer-events", "auto");
+
+
+
+        loadingInstance.close()
+      }).finally(()=>
+          loadingInstance.close()
+      )
+
+    },
+
+
+    // 多选框-传导范围
+    handleCheckAllChange(val) {
+      this.checkedRanges = val ? rangeOptions : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedRangesChange(value) {
+      let checkedCount = value.length;
+      this.checkAllRange = checkedCount === this.Ranges.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.Ranges.length;
+    },
+    // 查询
+    onSubmit1() {
+
+
+      // var fxlx = document.querySelector("#fxlx");
+      // var fxlxIndex = fxlx.selectedIndex;
+      // var fxlxValue = fxlx.options[fxlxIndex].value;  //风险类型
+
+      // var cdfw = $(".cdfw_label");
+      var cdfw_str = '';
+      for (var i = 0; i < this.checkedRanges.length; i++) {
+        // if (this.checkedRanges[i].checked) {
+          cdfw_str += this.checkedRanges[i] + ","
+        // }
+      }  //传导范围 cdfw_str
+      // cdfw_str += cdfw[cdfw.length-1].value
+      cdfw_str = cdfw_str.substr(cdfw_str.length - 1, 1) === ',' ? cdfw_str.substr(0, cdfw_str.length - 1) : cdfw_str;
+      console.log(cdfw_str)
+      // var time_input = $("#time_input").val();  //选择的时间
+
+      if (this.date === '' || this.riskSelect === "" ||this.checkedRanges===[] ) {
+        alert("请检查时间、传导范围和风险类型！")
+
+      }
+      else {
+        // let options = {
+        //   text: '请稍等'
+        // }
+        // let loadingInstance = Loading.service(options);
+        this.waitLoad=true
+        http.get('/risk_model/risk_gg/',{params: {
+              date:this.date ,
+              wh: this.riskSelect,
+          }
+          }).then((res) => {
+          // console.log(get_data.code,'llllllllllllll')
+          let get_data=res.data
+          // let str = '';
+          // for(let key in get_data.data) {
+          //     str += `<a>${key} ${get_data.data[key].join(', ')}</a><br>`;
+          // }
+          let ks = Object.keys(get_data.data)
+          // if (ks.length == 0)
+          // console.log(typeof (get_data.data))
+          if (typeof get_data.data === "string") {
+            // 无个股事件
+            // document.getElementById('light').style.display = 'none';
+            // document.getElementById('fade').innerText = "正在加载数据";
+            // document.getElementById('a1').innerText = '(财务报表)当前风险源：' + get_data.data;
+
+            //
+            // document.getElementById('a1').innerText = fxlxValue + '-' + '风险源(由财务数据筛选)：' + get_data.data;
+            // document.getElementById('a2').innerText = '';
+            // document.getElementById('a3').innerText = '';
+          } else {
+            // document.getElementById('a1').innerText = ks[0] + get_data.data[ks[0]];
+            // document.getElementById('a2').innerText = ks[1] + get_data.data[ks[1]];
+            // document.getElementById('a3').innerText = ks[2] + get_data.data[ks[2]];
+          }
+          // $("#light_a").attr("disabled", true).css("pointer-events", "none");
+
+          // document.getElementById('light').innerText = str;
+          // setTimeout(function () {
+          //     document.getElementById('fade').style.display = 'none';
+          //     document.getElementById('light').style.display = 'none';
+          // }, 1500)
+          console.log(get_data.code, this.riskSelect, cdfw_str, this.date)
+          this.sent(get_data.code, this.riskSelect, cdfw_str, this.date);
+          // loadingInstance.close()
+// sent(fxlxValue, cdfw_str, time_input);
+
+        }).catch((e)=>{
+          this.waitLoad=false
+          alert(e)}
+        )
+
+      }
+
+
+
+    },
+  }
+}
+</script>
+
+<style lang='less' scoped>
+
+.graph {
+  /*//margin-left: -800px;*/
+  /*  transform: translate(0,0);*/
+  height: 700px;
+  /*width: */
+}
+
+
+.toggle-cont {
+  width: 100px;
+  height: 50px;
+  border-radius: 9999px;
+}
+
+.toggle-cont .toggle-input {
+  display: none;
+}
+
+.toggle-cont .toggle-label {
+  cursor: pointer;
+  position: relative;
+  display: inline-block;
+  padding: 6px;
+  width: 100%;
+  height: 100%;
+  background: #d0f3cb;
+  border-radius: 9999px;
+  box-sizing: content-box;
+  box-shadow: 0px 0px 16px -8px #fefefe;
+}
+
+.toggle-cont .toggle-label .cont-label-play {
+  position: relative;
+  width: 50px;
+  aspect-ratio: 1 / 1;
+  background: rgb(75, 229, 70);
+  border-radius: 9999px;
+  transition: all 0.5s cubic-bezier(1, 0, 0, 1);
+}
+
+.toggle-cont .toggle-input:checked + .toggle-label .cont-label-play {
+  background: #f43f5e;
+  transform: translateX(50px);
+}
+
+.toggle-cont .toggle-label .label-play {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  display: inline-block;
+  width: 24px;
+  aspect-ratio: 1 / 1;
+  background: #fefefe;
+  border-radius: 4px;
+  clip-path: polygon(25% 0, 75% 50%, 25% 100%, 25% 51%);
+  transition: all 0.5s cubic-bezier(1, 0, 0, 1);
+}
+
+.toggle-cont .toggle-input:checked + .toggle-label .label-play {
+  width: 20px;
+  clip-path: polygon(0 0, 100% 0, 100% 100%, 0 100%);
+}
+//input:checked ~ .slider {
+//  background-color: #f6cfb5;
+//}
+
+
+.button-container {
+  display: flex;
+  align-items: center; /* 垂直居中 */
+}
+.button-right {
+  margin-right: 0;
+  margin-left: auto;
+}
+
+.flashButton {
+  margin-right: 10px;
+  padding: 13px 20px;
+  border-radius: 30px;
+  cursor: pointer;
+  border: 0;
+  background-color: white;
+  box-shadow: rgb(0 0 0 / 5%) 0 0 8px;
+  letter-spacing: 1.5px;
+  text-transform: uppercase;
+  font-size: 15px;
+  transition: all 0.5s ease;
+}
+
+.flashButton:hover {
+  letter-spacing: 3px;
+  background-color: hsl(150deg 80% 48%);
+  color: hsl(0, 0%, 100%);
+  box-shadow: rgb(150 220 170) 0px 7px 29px 0px;
+}
+
+.flashButton:active {
+  letter-spacing: 3px;
+  background-color: hsl(150deg 80% 48%);
+  color: hsl(0, 0%, 100%);
+  box-shadow: rgb(150 220 170) 0px 0px 0px 0px;
+  transform: translateY(4px);
+  transition: 100ms;
+}
+
+
+
+    .grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+
+    @-webkit-keyframes honeycomb {
+      0%,
+      20%,
+      80%,
+      100% {
+        opacity: 0;
+        -webkit-transform: scale(0);
+        transform: scale(0);
+      }
+
+      30%,
+      70% {
+        opacity: 1;
+        -webkit-transform: scale(1);
+        transform: scale(1);
+      }
+    }
+
+    @keyframes honeycomb {
+      0%,
+      20%,
+      80%,
+      100% {
+        opacity: 0;
+        -webkit-transform: scale(0);
+        transform: scale(0);
+      }
+
+      30%,
+      70% {
+        opacity: 1;
+        -webkit-transform: scale(1);
+        transform: scale(1);
+      }
+    }
+
+    .honeycomb {
+      height: 24px;
+      position: relative;
+      width: 24px;
+    }
+
+    .honeycomb div {
+      -webkit-animation: honeycomb 2.1s infinite backwards;
+      animation: honeycomb 2.1s infinite backwards;
+      background: #f3f3f3;
+      height: 12px;
+      margin-top: 6px;
+      position: absolute;
+      width: 24px;
+    }
+
+    .honeycomb div:after, .honeycomb div:before {
+      content: '';
+      border-left: 12px solid transparent;
+      border-right: 12px solid transparent;
+      position: absolute;
+      left: 0;
+      right: 0;
+    }
+
+    .honeycomb div:after {
+      top: -6px;
+      border-bottom: 6px solid #f3f3f3;
+    }
+
+    .honeycomb div:before {
+      bottom: -6px;
+      border-top: 6px solid #f3f3f3;
+    }
+
+    .honeycomb div:nth-child(1) {
+      -webkit-animation-delay: 0s;
+      animation-delay: 0s;
+      left: -28px;
+      top: 0;
+    }
+
+    .honeycomb div:nth-child(2) {
+      -webkit-animation-delay: 0.1s;
+      animation-delay: 0.1s;
+      left: -14px;
+      top: 22px;
+    }
+
+    .honeycomb div:nth-child(3) {
+      -webkit-animation-delay: 0.2s;
+      animation-delay: 0.2s;
+      left: 14px;
+      top: 22px;
+    }
+
+    .honeycomb div:nth-child(4) {
+      -webkit-animation-delay: 0.3s;
+      animation-delay: 0.3s;
+      left: 28px;
+      top: 0;
+    }
+
+    .honeycomb div:nth-child(5) {
+      -webkit-animation-delay: 0.4s;
+      animation-delay: 0.4s;
+      left: 14px;
+      top: -22px;
+    }
+
+    .honeycomb div:nth-child(6) {
+      -webkit-animation-delay: 0.5s;
+      animation-delay: 0.5s;
+      left: -14px;
+      top: -22px;
+    }
+
+    .honeycomb div:nth-child(7) {
+      -webkit-animation-delay: 0.6s;
+      animation-delay: 0.6s;
+      left: 0;
+      top: 0;
+    }
+</style>
diff --git a/src_old/views/风险预警.vue b/src_old/views/风险预警.vue
new file mode 100644
index 0000000..a965527
--- /dev/null
+++ b/src_old/views/风险预警.vue
@@ -0,0 +1,890 @@
+<template>
+  <div>
+    <!-- 1、上标 -->
+    <span class="superscript" style="width: 20px; height: 40px;">风险预警</span>
+    <!-- 2、产品搜索栏 -->
+    <div class="form">
+                                                    <!-- inline="true"表单域在一行 -->
+      <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+
+<!--        <el-form-item label="预警市场">-->
+<!--          <el-select   v-model="formInline1.market" placeholder="预警市场：" size="mini">-->
+<!--            <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+        <el-form-item label="开始时间">
+          <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="结束时间">
+          <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <!-- 3、内容 -->
+    <el-row :gutter="20">
+      <el-col :span="15">
+        <el-card style=" height:800px;">
+          <!-- 标题&按钮 -->
+          <div style="display: flex;justify-content: space-between;"> 
+            <span style="font-size: 18px;font-weight: bold;">各省份风险情况（默认近半年数据）</span>
+<!--            <div>-->
+<!--              <el-button class="grayish_btn" style="margin-right: 10px;" size="mini">高风险地区</el-button>-->
+<!--              <el-button class="grayish_btn" size="mini">风险率攀升</el-button>-->
+<!--            </div>-->
+          </div>
+          <!-- 地图 -->
+          <!-- <el-card style=" height:500px;"> -->
+            <region :new-map-data="mapData"/>
+          <!-- </el-card> -->
+          <!-- 表 -->
+          <el-table class='table' :data="tableData1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+            border  
+            height="300" 
+            :row-style="{height:'28px'}"
+            :cell-style="{padding:'0px'}"
+            header-row-class-name="active_header"
+            header-cell-class-name="active_header"
+            cell-class-name="content_center">
+
+              <el-table-column v-for='(val,key) in tableLabel1' :prop="key" :label="val" show-overflow-tooltip /><!--插槽里面没有东西就可以用单标签  -->
+                                                                            <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+              
+              <el-table-column
+                  prop="scale"
+                  label="操作">
+                  <template slot-scope="scope">
+                    <span class="text" v-on:click="detail1(scope.row)">查看详情</span>
+                  </template>
+              </el-table-column>
+         </el-table>
+        </el-card>
+
+        <el-card style=" height:400px;">
+          <span style="font-size: 18px;font-weight: bold;">行业预警排行</span>
+             <!-- 2、产品搜索栏 -->
+         <div class="form_small">
+                                                    <!-- inline="true"表单域在一行 -->
+            <el-form :inline="true"  :model="formInline2" class="demo-form-inline">
+
+              <el-form-item label="交易所">
+                <el-select   v-model="formInline2.industry" placeholder="选择交易所" size="mini">
+                  <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+            <el-form-item>
+                <el-button class="grayish_btn" @click="indusRisk" icon="el-icon-search" size="mini">查询</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+        <!-- <el-card style=" height:200px;"> -->
+          <div ref="echarts_2" style="height:320px;width:1000px">
+          </div>
+        <!-- </el-card> -->
+        </el-card>
+
+      </el-col>
+
+      <el-col :span="9">
+        <el-card style=" height:1200px;">
+          <span style="font-size: 18px;font-weight: bold;">个体风险预警</span>
+          <div class="form_small">
+                                                    <!-- inline="true"表单域在一行 -->
+            <el-form :inline="true"  :model="formInline3" class="demo-form-inline">
+
+              <el-form-item label="交易所">
+                <el-select   v-model="formInline3.industry" placeholder="选择交易所" size="mini">
+                  <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+            <el-form-item>
+                <el-button class="grayish_btn" @click="individualRisk" icon="el-icon-search" size="mini">查询</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+
+<!--          <div >-->
+<!--            <span>日</span>-->
+<!--            <span>周</span>-->
+<!--            <span>月</span>-->
+<!--          </div>-->
+          <div>
+            预警次数
+          </div>
+          <el-row :gutter="12">
+            <el-col :span="8">
+              <el-card style="background-color: #c43434cc;">
+<!--                <div  class="button" @click="alert('here')"> 严重</div>-->
+                <el-button type="text" class="button" @click="choseType('严重')">严重</el-button>
+                {{ critical }}
+              </el-card>
+            </el-col>
+            <el-col :span="8" >
+              <el-card style="background-color: #f1c049;">
+<!--                <div> 中等</div>-->
+                <el-button type="text" class="button" @click="choseType('中等')">中等</el-button>
+                {{ mid }}
+              </el-card>
+            </el-col>
+            <el-col :span="8" >
+              <el-card style="background-color: #4dca8e;">
+<!--                <div>轻微</div>-->
+                <el-button type="text" class="button"  @click="choseType('轻微')">轻微</el-button>
+                {{ good }}
+              </el-card>
+            </el-col>
+          </el-row>
+
+          <el-card style=" height:400px;">
+            <!-- 去掉图像外围的框，鼠标悬停标题变大，尽量不被外框遮挡 -->
+            <div ref="echarts_1" style="height:300px;width:390px; "></div>
+
+
+          </el-card>
+          <!-- 表 -->
+          <el-table class='table' :data="tableData2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+            border  
+            
+            :row-style="{height:'28px'}"
+            :cell-style="{padding:'0px'}"
+            header-row-class-name="active_header"
+            header-cell-class-name="active_header"
+                    height="400"
+            cell-class-name="content_center">
+            <!-- header-row-class-name 表头行 加classname -->
+            <!-- cell-class-name 单元格加名字 -->
+          <!-- border有边框 -->
+              <!-- stripe
+              height="90%"
+              :data="tableData"
+              style="width: 80%;  margin-top:10px; margin-bottom:10px;" -->
+              <el-table-column v-for='(val,key) in tableLabel2' :prop="key" :label="val" show-overflow-tooltip /><!--插槽里面没有东西就可以用单标签  -->
+                                                                            <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+              
+              <el-table-column
+                  prop="scale"
+                  label="操作">
+                  <template slot-scope="scope">
+                    <span class="text" v-on:click="detail2(scope.row)">查看详情</span>
+                  </template>
+              </el-table-column>
+         </el-table>
+        </el-card>
+      </el-col>
+  </el-row>
+
+  <!-- 详情页1 -->
+  <el-dialog 
+         :visible.sync="detailsdialog_1" 
+         width="80%">
+         <el-table class='table' :data="tableData_detail_1" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+            border  
+            
+            :row-style="{height:'28px'}"
+            :cell-style="{padding:'0px'}"
+            header-row-class-name="active_header"
+            header-cell-class-name="active_header"
+            cell-class-name="content_center">
+            <!-- header-row-class-name 表头行 加classname -->
+            <!-- cell-class-name 单元格加名字 -->
+          <!-- border有边框 -->
+              <!-- stripe
+              height="90%"
+              :data="tableData"
+              style="width: 80%;  margin-top:10px; margin-bottom:10px;" -->
+              <el-table-column v-for='(val,key) in tableLabel_detail_1' :prop="key" :label="val" show-overflow-tooltip /><!--插槽里面没有东西就可以用单标签  -->
+                                                                            <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+
+         </el-table>
+  </el-dialog>
+
+  <!-- 详情页2 -->
+  <el-dialog 
+         :visible.sync="detailsdialog_2" 
+         width="80%">
+         <el-table class='table' :data="tableData_detail_2" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+            border  
+            fit="true"
+            :row-style="{height:'28px'}"
+            :cell-style="{padding:'0px'}" style="width: 100%"
+            header-row-class-name="active_header"
+            header-cell-class-name="active_header"
+            cell-class-name="content_center">
+            <!-- header-row-class-name 表头行 加classname -->
+            <!-- cell-class-name 单元格加名字 -->
+          <!-- border有边框 -->
+              <!-- stripe
+              height="90%"
+              :data="tableData"
+              style="width: 80%;  margin-top:10px; margin-bottom:10px;" -->
+              <el-table-column v-for='(val,key) in tableLabel_detail_2' :prop="key" :label="val" show-overflow-tooltip /><!--插槽里面没有东西就可以用单标签  -->
+                                                                            <!-- show-overflow-tooltip可以省略展示较多的文字内容 -->
+
+           <el-table-column
+               prop="scale"
+               label="点击查看新闻源">
+             <template slot-scope="scope">
+<!--               <span class="text" v-on:click="detail2(scope.row)">查看详情</span>-->
+               <el-button  icon="el-icon-s-promotion" @click="copy(scope.row.url)"></el-button>
+             </template>
+           </el-table-column>
+         </el-table>
+  </el-dialog>
+  </div>
+</template>
+
+<script>
+import * as echarts from "echarts"
+import region from "../components/region.vue";
+import http from '../utils/request'
+export default {
+  //引入组件
+components: {
+  region
+},
+  data() {
+    return {
+      type:'',
+      change:true,
+      mapData:'',
+      pieData:[],
+      critical:'',
+      mid:'',
+      good:'',
+// 【整合接收数据】（3个）
+// 1-"风险预警"
+
+      formInline1: {
+        market: '',
+        start_date:'',
+        end_date:'',
+      },
+// 小1-"行业预警排行"
+      formInline2: {
+        industry:'',
+      },
+// 小2-"个体风险预警"
+      formInline3: {
+        industry:'',
+      },
+
+// 【搜索栏】
+  // 第1栏"风险预警"(预警市场)
+       
+    options_market: [{
+      value: '股票',
+      label: '股票'
+    }, {
+      value: '债券',
+      label: '债券'
+    }, {
+      value: '期货',
+      label: '期货'
+    }, {
+      value: '全部',
+      label: '全部'
+    }
+  ],
+  options_industry:[{
+      value: '',
+      label: '全部'
+    }, {
+      value: '深圳证券交易所',
+      label: '深圳证券交易所'
+    }, {
+      value: '上海证券交易所',
+      label: '上海证券交易所'
+    },
+    // {
+    //   value: '北交所',
+    //   label: '北京证券交易所'
+    // },
+  ],
+
+  options_exchange:[{
+      value: '',
+      label: '全部'
+    }, {
+      value: '深圳证券交易所',
+      label: '深圳证券交易所'
+    }, {
+      value: '上海证券交易所',
+      label: '上海证券交易所'
+    }, {
+      value: '北京证券交易所',
+      label: '北京证券交易所'
+    }],
+
+// 【表格,不包括详情页】
+tableLabel1: {
+// num: '事件序号',
+province: '省份',
+counts: '严重风险总量',
+  early_warning_time: '最新预警时刻',
+  warning_score:'预警平均值',
+  increase:'风险同比增加',
+},
+      origiData:[],//用于筛选时保存数据
+tableLabel2:{
+// order: '排名',
+code: '股票代码',
+name: '企业名称',
+warning_type: '风险水平',
+
+},
+
+tableData1: [{
+num: '1',
+province: '北京',
+total_risks: 21,
+warning_time: '2023/6/29 16:00',
+warning_average:80,
+YOY:'+10',
+},
+{
+num: '2',
+province: '河北',
+total_risks: 21,
+warning_time: '2023/6/29 16:00',
+warning_average:80,
+YOY:'+10',
+},
+{
+num: '3',
+province: '山西',
+total_risks: 21,
+warning_time: '2023/6/29 16:00',
+warning_average:80,
+YOY:'+10',
+},
+{
+num: '4',
+province: '山东',
+total_risks: 21,
+warning_time: '2023/6/29 16:00',
+warning_average:80,
+YOY:'+10',
+},
+{
+num: '5',
+province: '黑龙江',
+total_risks: 21,
+warning_time: '2023/6/29 16:00',
+warning_average:80,
+YOY:'+10',
+},
+],
+
+tableData2: [
+//     {
+// order: '1',
+// code: '688001.SH',
+// name: '华兴源创',
+// warning: 80,
+//
+// },
+// {
+// order: '2',
+// code: '688001.SH',
+// name: '华兴源创',
+// warning: 75,
+//
+// },
+// {
+// order: '3',
+// code: '688001.SH',
+// name: '华兴源创',
+// warning: 75,
+//
+// },
+// {
+// order: '4',
+// code: '688001.SH',
+// name: '华兴源创',
+// warning: 75,
+//
+// },
+],
+// 【详情页】
+  // 详情页是否打开的判断标签
+  detailsdialog_1: false,
+  detailsdialog_2: false,
+
+  tableData_detail_1:[{}],
+  tableData_detail_2:[{}],
+
+  // 区域
+  tableLabel_detail_1:{
+    code:'主体代码',
+    name:'名称',
+    province:'省份',
+    // 行业:'行业',
+    early_warning_time:'当前预警时刻',
+    // exchange:'交易所',
+    risk_type:'风险类型',
+    warning_type:'风险等级',
+    warning_score:'风险值',
+    last_time:'上次预警时刻',
+    increase:'同比',
+
+  },
+  // 个体
+  tableLabel_detail_2:{
+        code:'主体代码',
+        name:'名称',
+        province:'省份',
+        // 行业:'行业',
+        early_warning_time:'当前预警时刻',
+        exchange:'交易所',
+        risk_type:'风险类型',
+        warning_type:'风险水平',
+        warning_score:'风险概率',
+        url:'相关链接'
+  },
+
+    }
+  },
+  mounted(){
+    this.initMapData()
+    this.individualRisk()
+    this.indusRisk()
+//     const echarts2 = echarts.init(this.$refs.echarts_2)
+//
+//
+//     const option_2 = {
+//     // 右上角存图
+//     toolbox: {
+//       feature: {
+//         saveAsImage: {}
+//       }
+//     },
+//
+//     grid: {
+//       left: '20%',//离左边远一点
+//       right: '4%',
+//       // bottom: '10%',
+//       top:'8%',//如果不填，会默认一个特别大的值，导致图的上面留白特别大
+//       // containLabel: true
+//     },
+//     xAxis: {
+//       type: 'value',
+//       // boundaryGap: [0, 0.01]
+//     },
+//     yAxis: {
+//       type: 'category',
+//       data: ['房地产业', '信息传输、软件和信息技术服务业', '水利、环境和公共设施管理业', '制造业', '建筑业','综合','批发和零售业','电力、热力、燃气及水生产和供应业','租赁和商务服务业','交通运输、仓储和邮政业','卫生和社会工作','文化、体育和娱乐业','采矿业','住宿和餐饮业','科学研究和技术服务业','教育','农、林、牧、渔业','居民服务、修理和其他服务业']
+//
+// //   },
+//     },
+//     series: [
+//       {
+//         // color:'#6d7d87',
+//         type: 'bar',
+//         data: [18203, 23489, 29034, 104970, 131744, 630230,18203, 23489, 29034, 104970, 131744, 630230,19325, 23438, 31000, 121594, 134141, 681807,]
+//       },
+//       // {
+//       //   name: '2012',
+//       //   type: 'bar',
+//       //   data: [19325, 23438, 31000, 121594,19325, 23438, 31000, 121594, 134141, 681807, 134141, 681807,18203, 23489, 29034, 104970, 131744, 630230,]
+//       // }
+//     ]
+//   }
+//
+//
+//
+//
+//     echarts2.setOption(option_2)
+  },
+  methods: {
+    copy(url){
+
+      let oInput = document.createElement('input');
+      oInput.value = url;
+      document.body.appendChild(oInput);
+      oInput.select(); // 选择对象;
+      console.log(oInput.value)
+      document.execCommand("Copy"); // 执行浏览器复制命令
+      this.$message({
+        message: '复制成功',
+        type: 'success'
+      });
+      oInput.remove()
+      window.open(url, "_blank");
+    },
+    choseType(type){
+      if( this.change ||this.type!==type)//初始状态 或选择了新的类型
+      {
+        this.tableData2=this.origiData
+        this.tableData2=this.tableData2.filter(item=>item.warning_type===type)
+        this.type=type
+        this.change=!this.change
+      }
+      else if(!this.change)
+      {
+        this.tableData2=this.origiData
+        this.change=!this.change
+      }
+      // for(let i in this.tableData2){
+      //   if (i.warning_type!==type)
+      //     this.tableData2.
+    },
+    initMapData(){
+      http.get('/warning/region_all_risk/',{params:{
+        //  不传时间默认最近半年
+        }}).then((res)=>{
+        this.mapData=res.data
+      })
+    },
+
+
+    onSubmit1() {
+      http.get('/warning/warning_rank/',{params:{
+          // exchange:this.exchange
+          market:this.formInline1.market,
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+        }}).then((res)=>{
+        this.tableData2=res.data
+        this.origiData=res.data
+
+      })
+      http.get('/warning/region_rank/',{params:{
+          // exchange:this.exchange
+          market:this.formInline1.market,
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+        }}).then((res)=>{
+        this.tableData1 = eval(unescape(res.data.replace(/\\u/g, '%u')))
+        // this.tableData1=res.data
+      })
+      http.get('/warning/region_all_risk/',{params:{
+          //  不传时间默认最近半年
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+        }}).then((res)=>{
+        this.mapData=res.data
+      })
+    },
+    individualRisk() {
+      const echarts1 = echarts.init(this.$refs.echarts_1)
+      http.get('/warning/individual_rank/', {
+        params: {
+          // exchange:this.exchange
+          exchange: this.formInline3.industry,
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+
+        }
+      }).then((res) => {
+        this.pieData.length=0
+        this.critical = res.data['指数']['严重']
+        this.mid = res.data['指数']['中等']
+        this.good = res.data['指数']['轻微']
+        let tmp=res.data['环形图']
+        for(let key in tmp)
+        {
+          let arr={}
+          arr['name']=key
+          arr['value']=tmp[key]
+          this.pieData.push(arr)
+        }
+
+        echarts1.clear()
+        const option_1={
+          // 右上角存图
+          toolbox: {
+            feature: {
+              saveAsImage: {}
+            }
+          },
+          tooltip: {
+            trigger: 'item'
+          },
+          legend: {
+            top: '5%',
+            left: 'center'
+          },
+          series: [
+            {
+              name: 'Access From',
+              type: 'pie',
+              radius: ['30%', '65%'],//调整饼图内圆和外圆大小
+              center:['50%','65%'],//调整饼在画布上的距离，此时偏下
+              avoidLabelOverlap: false,
+              itemStyle: {
+                borderRadius: 5,
+                borderColor: '#fff',
+                borderWidth: 2
+              },
+              label: {
+                show: true
+              },
+              emphasis: {
+                label: {
+                  show: true,
+                  fontSize: 40,
+                  fontWeight: 'bold'
+                }
+              },
+              labelLine: {
+                show: true
+              },
+              data: this.pieData
+              //     [
+              //   { value: 40, name: '重大声誉风险' },
+              //   { value: 38, name: '流动风险' },
+              //   { value: 32, name: '获现风险' },
+              //   { value: 30, name: '市场风险' },
+              //   { value: 28, name: '经营风险' },
+              //   { value: 26, name: '信用风险' },
+              //   { value: 22, name: '资产负债风险' }
+              // ]
+            }
+          ]
+        }
+        echarts1.setOption(option_1,true)
+      })
+      http.get('/warning/warning_rank/',{params:{
+          // exchange:this.exchange
+          exchange: this.formInline3.industry,
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+        }}).then((res)=>{
+        this.tableData2=res.data
+        this.origiData=res.data
+      })
+
+    },
+    indusRisk() {
+      const echarts2 = echarts.init(this.$refs.echarts_2)
+      http.get('/warning/indus_rank/', {
+        params: {
+          // exchange:this.exchange
+          exchange: this.formInline2.industry,
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+        }
+      }).then((res) => {
+
+        let xData=[],yData=[]
+        let tmp=res.data
+        for(let key in tmp)
+        {
+          xData.push(tmp[key])
+          yData.push(key)
+        }
+
+
+        const option_2 = {
+          // 右上角存图
+          toolbox: {
+            feature: {
+              saveAsImage: {}
+            }
+          },
+
+          grid: {
+            left: '20%',//离左边远一点
+            right: '4%',
+            // bottom: '10%',
+            top:'8%',//如果不填，会默认一个特别大的值，导致图的上面留白特别大
+            // containLabel: true
+          },
+          xAxis: {
+            type: 'value',
+            // boundaryGap: [0, 0.01]
+          },
+          yAxis: {
+            type: 'category',
+            data: yData
+
+//   },
+          },
+          series: [
+            {
+              // color:'#6d7d87',
+              type: 'bar',
+              data: xData
+            },
+            // {
+            //   name: '2012',
+            //   type: 'bar',
+            //   data: [19325, 23438, 31000, 121594,19325, 23438, 31000, 121594, 134141, 681807, 134141, 681807,18203, 23489, 29034, 104970, 131744, 630230,]
+            // }
+          ]
+        }
+
+
+        echarts2.setOption(option_2)
+      })
+    },
+    regionRisk() {
+      http.get('/warning/region_rank/', {
+        params: {
+          // exchange:this.exchange
+          exchange: this.formInline3.industry,
+          start:this.formInline1.start_date,
+          end:this.formInline1.end_date,
+        }
+      }).then((res) => {
+        this.pieData.length = 0
+        let data = eval(unescape(res.data.replace(/\\u/g, '%u')))
+        this.critical = data['指数']['严重']
+        this.mid = data['指数']['中等']
+        this.good = data['指数']['轻微']
+
+      })
+    },
+    // 详情页1
+    detail1(row){
+    // console.log("查看详情-各省份风险情况")
+      http.get('/warning/region_rank_detail/', {
+        params: {
+          // exchange:this.exchange
+          region: row.province,
+          // start:this.formInline1.start_date,
+          // end:this.formInline1.end_date,
+        }
+      }).then((res) => {
+        // this.tableData_detail_1 = eval(unescape(res.data.replace(/\\u/g, '%u')))
+        this.tableData_detail_1=res.data
+      })
+    console.log(row)//返回这一行所有的内容
+    this.detailsdialog_1 = true//打开弹窗
+
+
+    // http.get(
+    //           "/",
+    //           {params:{
+    //             id: row.order,//新闻id 是吗？
+
+    //   }}).then(response => {
+    //       this.detailData_table1 = response.data//待修改
+    //       this.detail_content=response.data.content
+
+    //       console.log(response.data)
+          
+
+    //     })
+
+
+    },
+    // 详情页2
+    detail2(row){
+    console.log("查看详情-个体风险预警")
+    console.log(row)//返回这一行所有的内容
+      // console.log(this.tableData2)
+      this.tableData_detail_2=Array(row)
+    // for(let i in this.tableData2)
+    // {
+    //
+    //   if (this.tableData2[i]['name']===row['name'] && this.tableData2[i]['early_warning_time']===row['early_warning_time'])
+    //       this.tableData_detail_2=this.tableData2[i]
+    // }
+      this.detailsdialog_2 = true//打开弹窗
+    // http.get(
+    //           "/",
+    //           {params:{
+    //             id: row.order,//新闻id 是吗？
+
+    //   }}).then(response => {
+    //       this.detailData_table1 = response.data//待修改
+    //       this.detail_content=response.data.content
+
+    //       console.log(response.data)
+          
+
+    //     })
+    },
+
+  }
+};
+</script>
+
+<style lang="less" scoped>
+
+//div按钮
+.button{
+  .hover {
+    background-color: #0056b3;
+  }
+
+  .active {
+    background-color: #003e80;
+  }
+  display: block;
+  //background-color: #007bff;
+  color: #000000;
+  //padding: 10px 20px;
+  border: none;
+}
+// 地图布局，与下方表格的距离
+/deep/ .echartsGroup[data-v-02ef51f8] {
+  // width: 500px;
+  height: 460px;
+  // position: relative;
+}
+.el-form-item {
+  margin-bottom: 0px;
+}
+.form{//产品搜索栏
+  // display:flex;
+  // justify-content:space-between;//左右贴边
+  margin-top:5px; 
+  // // height: 40px;
+  padding-left: 10px;
+  margin-bottom: 10px;
+  // padding: 0px;
+
+}
+.form_small{
+  margin-top:5px; 
+  // // height: 40px;
+  padding-left: 10px;
+}
+.table{
+  // 和选项框隔开
+  margin-top:10px;
+  font-size: 12px;
+
+
+  // 调整表头间隔、设置表头下方边框颜色
+  /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+  // border-bottom: 1px solid #333333 !important;
+  padding: 1px 0; 
+  min-width: 0;
+  }
+  // 去除表格cell间隔
+  .el-table .el-table__cell {
+    padding: 0px 0; 
+    min-width: 0;
+    // border-color:#333333;
+
+  }
+  /deep/ .active_header{//表头
+    color: #333333;
+    font-size: 13px;
+    text-align: center !important;
+    // border-color:#333333;
+
+    // height: 1px;
+  }
+  /deep/ .content_center{//表的内容
+    text-align: center !important;
+    font-size: 13px;
+    // border-color:#333333;
+  }
+}
+.text{
+  color:rgba(2, 167, 240, 0.729411764705882);
+}
+.grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+  }
+
+</style>
diff --git a/src_old/views/高影响力主体分析.vue b/src_old/views/高影响力主体分析.vue
new file mode 100644
index 0000000..fd4b2ff
--- /dev/null
+++ b/src_old/views/高影响力主体分析.vue
@@ -0,0 +1,1505 @@
+<template>
+
+    <el-row> 
+      <el-tabs type="border-card"> 
+        <!-- 1、横向对比 -->
+        <el-tab-pane label="横向对比">
+           <!-- 搜索栏 -->
+          <div class="form">
+                                                          <!-- inline="true"表单域在一行 -->
+            <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+              <el-form-item label="市场">
+                <el-select   v-model="formInline1.market" placeholder="选择市场" size="mini">
+                  <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="主体类型">
+                <el-select   v-model="formInline1.industry" placeholder="选择行业" size="mini">
+                  <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="时间粒度">
+                <el-select   v-model="formInline1.timeType" placeholder="选择时间粒度" size="mini">
+                  <el-option v-for="item in optionsTime" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="时间">
+  <!--              <span class="demonstration">月</span>-->
+                <el-date-picker
+                    v-if="formInline1.timeType==='month'"
+                    v-model="formInline1.pre_date"
+                    type="month"
+                    size="mini"
+                    placeholder="选择月">
+                </el-date-picker>
+                <quter-component  v-if="formInline1.timeType==='quarter'" v-model="formInline1.quarter_date"></quter-component>
+                <half-year v-if="formInline1.timeType==='half_year'" v-model="formInline1.pre_date"/>
+              </el-form-item>
+  <!--            <el-form-item label="时间">-->
+  <!--              <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+  <!--            </el-form-item>-->
+
+  <!--            <el-form-item label="结束时间">-->
+  <!--              <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+  <!--            </el-form-item>-->
+              <el-form-item>
+                <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+              </el-form-item>
+
+            </el-form>
+          </div>
+
+
+
+<!--          <div class="one_twins_card">-->
+<!--              &lt;!&ndash; 一左 &ndash;&gt;-->
+<!--              <el-card style=" height:300px;width: 30%;" :body-style={padding:0}>         &lt;!&ndash;:body-style={padding:0}取消卡片边距，btn就能在左上角 &ndash;&gt;-->
+<!--                <span class="superscript" style="width: 20px; height: 40px;">总体分析</span>-->
+<!--                <div class="num_card" :body-style="{display: 'flex'}">-->
+<!--                  &lt;!&ndash; <el-row > &ndash;&gt;-->
+<!--                        &lt;!&ndash; <el-col :span="11"> &ndash;&gt;-->
+<!--                          <div>-->
+<!--                            <p class="desc">高影响力风险主体总量:</p>-->
+<!--                            <p class="desc_value">{{ totalRisk }}个</p>-->
+<!--                          </div>-->
+
+
+<!--                          <el-divider style="width:60%"></el-divider>-->
+
+
+<!--                        &lt;!&ndash; </el-col>-->
+<!--                        <el-col :span="2">-->
+<!--                          <el-divider direction="vertical"  content-position="center"></el-divider>-->
+
+<!--                        </el-col> &ndash;&gt;-->
+<!--                        -->
+<!--                        &lt;!&ndash; <el-col :span="11"> &ndash;&gt;-->
+<!--                          <div>-->
+<!--                            <p class="desc">高影响力主体风险类型:</p>-->
+<!--                            <p class="desc_value">{{totalType}}种</p>-->
+<!--                          </div>-->
+<!--                        &lt;!&ndash; </el-col> &ndash;&gt;-->
+<!--                  &lt;!&ndash; </el-row> &ndash;&gt;-->
+
+<!--              </div>-->
+<!--              </el-card>-->
+<!--              -->
+<!--              &lt;!&ndash; 一右 &ndash;&gt;-->
+<!--              <el-card style=" height:300px;width: 68%;" :body-style={padding:0}>-->
+<!--                <div>-->
+<!--                  <span class="superscript" style="width: 20px; height: 40px;">风险分布</span>-->
+<!--                  &lt;!&ndash; 两个饼状图 &ndash;&gt;-->
+<!--                  <div class="twins_pie">-->
+
+<!--                    <div ref="echarts_1" style="height:280px;width:400px"></div>-->
+<!--                    <div ref="echarts_2" style="height:280px;width:400px"></div>-->
+
+<!--                    &lt;!&ndash; <div ref="echarts1" style="height: 100px"></div> &ndash;&gt;-->
+<!--                    &lt;!&ndash; <div ref="echarts2" style="height: 100px"></div> &ndash;&gt;-->
+<!--                  </div>-->
+
+
+<!--              </div>-->
+<!--              </el-card>-->
+<!--          </div>-->
+
+          <!-- 第二层表格与图像 -->
+          <div class="two">
+            <el-card :body-style={padding:0} style='width: 100%;'>
+              <!-- 1、上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">影响力排名</span>
+
+      <!--        模型暂时不支持-->
+      <!--         <el-form :inline="true"  class="demo-form-inline" :model="formInline4" ref="formInline">-->
+      <!--            <el-form-item label="个体类型" style="margin: 0px;padding-left: 80px;padding-top: 5px">-->
+      <!--              <el-select  v-model="formInline4.type"  size="mini">-->
+      <!--                <el-option label="私募" value="私募"></el-option>-->
+      <!--                <el-option label="公募" value="公募"></el-option>-->
+      <!--              </el-select>-->
+      <!--            </el-form-item>-->
+      <!--        </el-form>-->
+              
+              <!-- 2、内容 -->
+              <div class="content">
+
+                <div class="table" style="width: 100%; float: left; overflow: hidden">
+                  <el-table :data="tableData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                        border  
+                        height="250" 
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center"
+                        style="width: 98%">          <!-- style="width: 40%"               height="215"  -->
+                      <el-table-column v-for='(val,key) in tableLabel' :prop="key" :label="val"  :key="key"/><!--插槽里面没有东西就可以用单标签  -->
+                      <el-table-column
+                              prop="scale"
+                              label="操作">
+                              <template slot-scope="scope">
+                                <span class="text"  v-on:click="detail(scope.row)">查看详情</span>
+                              </template>
+                          </el-table-column>
+                  </el-table>
+                </div>
+
+              <div>
+                <!-- 详细信息弹窗，默认关闭 -->
+                <el-dialog  :visible.sync="detailsdialog" width="100%" @open="open()" >
+                  <!-- title="收货地址" -->
+                  <el-card >
+                  <!-- 详细信息 -->
+                  <el-card style=" height:600px;margin-bottom:10px ; " :body-style={padding:0} >    
+                    <span class="superscript" style="width: 20px; height: 40px;">详细信息</span>
+                    <el-table :data="detailData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border  
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center"
+                        style="margin:15px;">     
+                        <el-table-column
+                        prop="comp_name"
+                        label="主体名称"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column label="市场结构">
+                        <el-table-column
+                          prop="DC"
+                          label="度中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="BC"
+                          label="介数中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="CC"
+                          label="接近中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="weighted-PR"
+                          label="加权PageRank"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                            prop="SLC"
+                            label="局部中心性"
+                            width="120">
+                        </el-table-column>
+                      </el-table-column>
+                        <el-table-column label="个体规模">
+                          <el-table-column
+                            prop="region"
+                            label="所在区域"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                            prop="held_num"
+                            label="持股数量(股)"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                              prop="asset"
+                              label="当前资金规模(万)"
+                              width="120">
+                          </el-table-column>
+                        </el-table-column>
+      <!--                  <el-table-column-->
+      <!--                  prop="主体风险"-->
+      <!--                  label="主体风险"-->
+      <!--                  width="120">-->
+      <!--                </el-table-column>-->
+                      <el-table-column
+                        prop="Total_score"
+                        label="影响力综合分数"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column
+                        prop="grade"
+                        label="影响等级"
+                        width="120">
+                      </el-table-column>
+      <!--                <el-table-column-->
+      <!--                        prop="scale"-->
+      <!--                        label="操作">-->
+      <!--                        <template slot-scope="scope">-->
+      <!--                          <span class="text"  v-on:click="detail(scope.row)">查看风险指标详情</span>-->
+      <!--                        </template>-->
+      <!--                    </el-table-column>-->
+                    </el-table>
+                    <div style="display:flex;">
+                      <el-divider direction="vertical" class="sublabel"></el-divider>
+                      <span class='title'>个体规模分析</span>
+                    </div>
+      <!--              模型暂时不支持-->
+      <!--              <el-form :inline="true"  class="demo-form-inline" :model="formInline4" ref="formInline">-->
+      <!--                <el-form-item label="指标" style="margin: 0px;padding-left: 80px;padding-top: 5px">-->
+      <!--                  <el-select  v-model="formInline4.type"  size="mini">-->
+      <!--                    <el-option label="基金规模" value="基金规模"></el-option>-->
+      <!--                    <el-option label="持股数量" value="持股数量"></el-option>-->
+      <!--                  </el-select>-->
+      <!--                </el-form-item>-->
+      <!--              </el-form>-->
+                    <DifferentialChart :asset="asset" :datelis="datelis" :held_num="held_num"/>
+              
+
+
+                  </el-card>
+                          
+                  <!-- 关联主体 -->
+                  <el-card style=" height:300px;margin-bottom:10px " :body-style={padding:0} >
+                    <span class="superscript" style="width: 20px; height: 40px;">关联主体</span>
+                      
+                    <!-- 表单 -->
+                    <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                        <el-form :inline="true"  :model="formInline2" class="demo-form-inline" style="margin: 10px;">
+                          <template>
+                            <el-radio v-model="typeRela" label="key_node">关键节点</el-radio>
+                            <el-radio v-model="typeRela" label="other">相似节点</el-radio>
+                          </template>
+                          <el-form-item>
+                            <el-button class="grayish_btn" @click="onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
+                          </el-form-item>
+                        </el-form>
+                    </div>
+                    <!-- 关联主体点 -->
+                    <div style="display:flex;padding-left:130px" v-if="showRelated">
+                      <el-button  v-for='(val,key) in relatedRes'  :key="key"  round style=" height:100px; width:300px ;margin-right:50px">{{val}}</el-button>
+                    </div>
+                  </el-card>
+
+                  <!-- 影响范围 -->
+      <!--            <el-card style=" height:400px; " :body-style={padding:0} >    -->
+      <!--              <span class="superscript" style="width: 20px; height: 40px;margin-bottom: 10px;">风险影响</span>-->
+      <!--              <div class="form">-->
+      <!--                                                        &lt;!&ndash; inline="true"表单域在一行 &ndash;&gt;-->
+      <!--                  <el-form :inline="true"  :model="formInline3" class="demo-form-inline">-->
+      <!--                    <template>-->
+      <!--                      <el-radio v-model="typeSpread" label="industry">行业</el-radio>-->
+      <!--                      <el-radio v-model="typeSpread" label="regions">地域</el-radio>-->
+      <!--                    </template>-->
+      <!--&lt;!&ndash;                    <el-form-item >&ndash;&gt;-->
+      <!--&lt;!&ndash;                      <el-checkbox v-model="formInline3.ndustry_selection">行业</el-checkbox>&ndash;&gt;-->
+      <!--&lt;!&ndash;                    </el-form-item>&ndash;&gt;-->
+
+      <!--&lt;!&ndash;                    <el-form-item >&ndash;&gt;-->
+      <!--&lt;!&ndash;                      <el-checkbox v-model="formInline3.regional_selection">地域</el-checkbox>&ndash;&gt;-->
+      <!--&lt;!&ndash;                    </el-form-item>&ndash;&gt;-->
+
+      <!--                    <el-form-item>-->
+      <!--                      <el-button class="grayish_btn" @click="onSubmit3" icon="el-icon-search" size="mini">查询</el-button>-->
+      <!--                    </el-form-item>-->
+      <!--                  </el-form>-->
+      <!--              </div>-->
+      <!--              <div class="flex-charts">-->
+      <!--                <div ref="echarts_4" style="height:300px;width:50%"></div>-->
+      <!--                <div ref="echarts_5" style="height:300px;width:50%"></div>-->
+      <!--            </div>-->
+      <!--            </el-card>-->
+                </el-card>
+                </el-dialog>
+              </div>
+
+                <div class='bar' style="width: 100%; float: left; overflow: hidden">
+                  <div ref="echarts_3" style="height:300px;width:100%"></div>
+                </div>
+
+            </div>
+
+
+            </el-card>
+
+
+          </div>
+   
+        </el-tab-pane>
+
+
+        <!-- 2、纵向对比 -->
+        <el-tab-pane label="纵向对比">
+          <!-- 搜索栏 -->
+          <div class="form">
+                                                          <!-- inline="true"表单域在一行 -->
+            <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+              <el-form-item label="市场">
+                <el-select   v-model="formInline1.market" placeholder="选择市场" size="mini">
+                  <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="主体类型">
+                <el-select   v-model="formInline1.industry" placeholder="选择行业" size="mini">
+                  <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="时间粒度">
+                <el-select   v-model="formInline1.timeType" placeholder="选择时间粒度" size="mini">
+                  <el-option v-for="item in optionsTime" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+
+              <el-form-item label="开始时间">
+
+                <el-date-picker
+                    v-if="formInline1.timeType==='month'"
+                    v-model="formInline1.start_pre"
+                    type="month"
+                    size="mini"
+                    placeholder="选择月">
+                </el-date-picker>
+                <quter-component  v-if="formInline1.timeType==='quarter'" v-model="formInline1.start_quarter"></quter-component>
+                <half-year v-if="formInline1.timeType==='half_year'" v-model="formInline1.start_pre"/>
+<!--                原始时间组件-->
+<!--                <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+              </el-form-item>
+              <el-form-item label="结束时间">
+
+                <el-date-picker
+                    v-if="formInline1.timeType==='month'"
+                    v-model="formInline1.end_pre"
+                    type="month"
+                    size="mini"
+                    placeholder="选择月">
+                </el-date-picker>
+                <quter-component  v-if="formInline1.timeType==='quarter'" v-model="formInline1.end_quarter"></quter-component>
+                <half-year v-if="formInline1.timeType==='half_year'" v-model="formInline1.end_pre"/>
+
+<!--                <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+              </el-form-item>
+              <el-form-item>
+                <el-button class="grayish_btn" @click="onSubmit4" icon="el-icon-search" size="mini">查询</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="table" style=" overflow: hidden">
+                  <el-table :data="historyData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                        border  
+                        height="400" 
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center">          <!-- style="width: 40%"               height="215"  -->
+                    <el-table-column v-for='(val,key) in timeLis' :prop="key" :label="val"  :key="key">
+<!--                      <el-table-column v-for='(val,key) in historyDataLabel' :prop="key" :label="val"  :key="key"/>&lt;!&ndash;插槽里面没有东西就可以用单标签  &ndash;&gt;-->
+                      <!--                      <el-table-column-->
+                      <!--                              prop="scale"-->
+                      <!--                              label="操作">-->
+                      <!--                              <template slot-scope="scope">-->
+                      <!--                                <span class="text"  v-on:click="detail(scope.row)">查看详情</span>-->
+                      <!--                              </template>-->
+                      <!--                          </el-table-column>-->
+
+                    </el-table-column>
+
+                  </el-table>
+          </div>
+
+              <div>
+                <!-- 详细信息弹窗，默认关闭 -->
+                <el-dialog  :visible.sync="detailsdialog" width="100%" @open="open()"  :modal="false" >
+                  <!-- title="收货地址" -->
+                  <el-card >
+                  <!-- 详细信息 -->
+                  <el-card style=" height:600px;margin-bottom:10px ; " :body-style={padding:0} >    
+                    <span class="superscript" style="width: 20px; height: 40px;">详细信息</span>
+                    <el-table :data="detailData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border  
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center"
+                        style="margin:15px;">     
+                        <el-table-column
+                        prop="comp_name"
+                        label="主体名称"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column label="市场结构">
+                        <el-table-column
+                          prop="DC"
+                          label="度中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="BC"
+                          label="介数中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="CC"
+                          label="接近中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="weighted-PR"
+                          label="加权PageRank"
+                          width="120">
+                        </el-table-column>
+                      </el-table-column>
+                        <el-table-column label="个体规模">
+                          <el-table-column
+                            prop="region"
+                            label="所在区域"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                            prop="held_num"
+                            label="持股数量"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                              prop="asset"
+                              label="当前资金规模(万)"
+                              width="120">
+                          </el-table-column>
+                        </el-table-column>
+      <!--                  <el-table-column-->
+      <!--                  prop="主体风险"-->
+      <!--                  label="主体风险"-->
+      <!--                  width="120">-->
+      <!--                </el-table-column>-->
+                      <el-table-column
+                        prop="Total_score"
+                        label="影响力综合分数"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column
+                        prop="grade"
+                        label="影响等级"
+                        width="120">
+                      </el-table-column>
+      <!--                <el-table-column-->
+      <!--                        prop="scale"-->
+      <!--                        label="操作">-->
+      <!--                        <template slot-scope="scope">-->
+      <!--                          <span class="text"  v-on:click="detail(scope.row)">查看风险指标详情</span>-->
+      <!--                        </template>-->
+      <!--                    </el-table-column>-->
+                    </el-table>
+                    <div style="display:flex;">
+                      <el-divider direction="vertical" class="sublabel"></el-divider>
+                      <span class='title'>个体规模分析</span>
+                    </div>
+      <!--              模型暂时不支持-->
+      <!--              <el-form :inline="true"  class="demo-form-inline" :model="formInline4" ref="formInline">-->
+      <!--                <el-form-item label="指标" style="margin: 0px;padding-left: 80px;padding-top: 5px">-->
+      <!--                  <el-select  v-model="formInline4.type"  size="mini">-->
+      <!--                    <el-option label="基金规模" value="基金规模"></el-option>-->
+      <!--                    <el-option label="持股数量" value="持股数量"></el-option>-->
+      <!--                  </el-select>-->
+      <!--                </el-form-item>-->
+      <!--              </el-form>-->
+                    <DifferentialChart :asset="asset" :datelis="datelis" :held_num="held_num"/>
+              
+
+
+                  </el-card>
+                          
+                  <!-- 关联主体 -->
+                  <el-card style=" height:300px;margin-bottom:10px " :body-style={padding:0} >
+                    <span class="superscript" style="width: 20px; height: 40px;">关联主体</span>
+                      
+                    <!-- 表单 -->
+                    <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                        <el-form :inline="true"  :model="formInline2" class="demo-form-inline" style="margin: 10px;">
+                          <template>
+                            <el-radio v-model="typeRela" label="key_node">关键节点</el-radio>
+                            <el-radio v-model="typeRela" label="other">相似节点</el-radio>
+                          </template>
+                          <el-form-item>
+                            <el-button class="grayish_btn" @click="onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
+                          </el-form-item>
+                        </el-form>
+                    </div>
+                    <!-- 关联主体点 -->
+                    <div style="display:flex;padding-left:130px" v-if="showRelated">
+                      <el-button  v-for='(val,key) in relatedRes'  :key="key"  round style=" height:100px; width:300px ;margin-right:50px">{{val}}</el-button>
+                    </div>
+                  </el-card>
+
+                </el-card>
+                </el-dialog>
+              </div>
+                     
+        </el-tab-pane>
+</el-tabs>
+  </el-row>
+</template>
+  
+<script>
+import * as echarts from "echarts"
+import http from '../utils/request'
+import DifferentialChart from "@/components/echarts/DifferentialChart.vue";
+import halfYear from "@/components/halfYear";
+import quterComponent from "@/components/quterComponent";
+import qs from "qs";
+import {Loading} from "element-ui";
+  export default {
+    components:{
+      DifferentialChart,
+      halfYear,
+      quterComponent,
+},
+    data() {
+      return {
+        datelis:[],
+        asset:[],
+        held_num:[],
+        width:null,
+        result:{},
+        showRelated:false,
+        relatedRes:[],
+        seleced:'',
+        typeRela:null,
+        typeSpread:null,
+        totalRisk:Number,
+        totalType:Number,
+// 【详情页】
+        // 详情页是否打开的判断标签
+        detailsdialog: false,
+
+        detailData: [
+         {
+          主体名称:'主体1'
+         }
+        ],
+        
+// 【搜索栏】
+        // 选择框——1市场选项
+        options_market: [{
+          value: 'stock',
+          label: '股票'
+        }, {
+          value: '期货',
+          label: '期货'
+        }, {
+          value: '债券',
+          label: '债券'
+        }],
+        optionsTime:[
+          {label: '半年',value:'half_year'},
+          {label: '季度',value:'quarter'},
+          {label: '月',value:'month'},
+        ],
+        // 选择框——2行业选项
+        options_industry: [
+          {label:'机构投资者',value:'institutional_investors'},
+          {label:'私募',value:'PrivFund'},
+          {label:'上市企业',value:'listedComp'},
+          {label:'海外机构',value:'ForeignComp'},
+          {label:'量化机构',value:'QuantFund'},
+        ],
+        // 整合收据进行接收（3个）
+        formInline1: {
+            timeType:'',
+            quarter_date:'',
+            pre_date:'',
+            market: '',
+            industry: '',
+            start_pre:'',
+            start_quarter:'',
+            end_pre:'',
+          end_quarter:'',
+          },
+        // 详情页
+        formInline2: {
+          key_nodes: false,
+          transmissibility_max: false,
+        },
+        formInline3: {
+          regional_selection: false,//地域选择
+          ndustry_selection: false,//行业选择
+        },
+        formInline4: {
+          type:'',
+        },
+
+
+        // 图表数据
+        pieDataIndus:[],
+        pieDataType:[],
+        tableData: [
+          { name: '主体1',
+            main_risk: '市场风险',
+            zhfs: 85,
+            leve: "中",},
+
+        ],
+        tableLabel: {
+          comp_name: '主体名称',
+          Total_score: '影响力综合分数',
+          grade: '影响等级',
+          spread_ability:'传播能力'
+        },
+        historyData:[],
+        timeLis:[],
+        historyDataLabel: {
+
+          // duration:'时间',
+          comp_name: '主体名称',
+          Total_score: '影响力综合分数',
+          // grade: '影响等级',
+          // spread_ability:'传播能力'
+        },
+                // 柱状图
+        barData: [
+          {
+            date: '周一',
+            new: 5,
+            active: 200
+          },
+          {
+            date: '周二',
+            new: 10,
+            active: 500
+          },
+          {
+            date: '周三',
+            new: 12,
+            active: 550
+          },
+          {
+            date: '周四',
+            new: 60,
+            active: 800
+          },
+          {
+            date: '周五',
+            new: 65,
+            active: 550
+          },
+          {
+            date: '周六',
+            new: 53,
+            active: 770
+          },
+          {
+            date: '周日',
+            new: 33,
+            active: 170
+          }
+        ],
+
+        
+        
+
+
+      }},
+    
+    mounted(){
+               // 饼状图
+              const echarts1 = echarts.init(this.$refs.echarts_1)
+              const echarts2 = echarts.init(this.$refs.echarts_2)
+              http.get('/risk_model/get_data/').then(response=>{
+                for (let key in response.data['行业分布']){
+                  this.pieDataIndus.push({name:key,value:response.data['行业分布'][key]})
+                }
+                for (let key in response.data['风险分布']){
+                  this.pieDataType.push({name:key,value:response.data['风险分布'][key]})
+                }
+                this.totalType=response.data['风险类型']
+                this.totalRisk=response.data['个体总数']
+                const option_1 = {
+                  // 右上角存图
+                  toolbox: {
+                    feature: {
+                      saveAsImage: {}
+                    }
+                  },
+                  tooltip: {
+                    trigger: "item",
+                  },
+                  title: {
+                    text: '风险行业分布',
+
+                    x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    y:'bottom',
+
+                    textStyle: {//主标题文本样式
+                      fontSize: 13,
+                      color:'#696969',
+                    },
+                    padding:[ 35,0,5,0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+                  },
+
+                  series: [
+                    {
+                      data: this.pieDataIndus,
+                      type: 'pie',
+                      avoidLabelOverlap: true,   //是否启用防止标签重叠策略
+                      minAngle: 5,               //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互
+
+                    }
+                  ],
+
+                }
+
+                const option_2 = {
+                  // 右上角存图
+                  toolbox: {
+                    feature: {
+                      saveAsImage: {}
+                    }
+                  },
+                  tooltip: {
+                    trigger: "item",
+                  },
+                  title: {
+                    text: '风险类型分布',
+                    x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    textStyle: {//主标题文本样式
+                      fontSize: 13,
+                      color:'#696969',
+                    },
+                    padding:[ 5,0,20,0],//[5,10] | [ 5,6, 7, 8] ,标题内边距
+                  },
+
+                  series: [
+                    {
+                      data: this.pieDataType,
+                      type: 'pie',
+                    }
+                  ],
+                }
+                this.$nextTick(()=>{
+                  echarts1.setOption(option_1)
+                  echarts2.setOption(option_2)
+                })
+              })
+
+  },
+    methods:{
+      // width(){
+      //   return '60px'
+      // },
+    // 影响力排名
+      onSubmit1(){
+        console.log("影响力排名")
+        console.log(this.formInline1.start_date)
+        // console.log(this.formInline1)
+        //时间格式不一样，所以要分参数quarter_date
+        let options={
+          text:'请稍等'
+        }
+        let loadingInstance = Loading.service(options);
+        if (this.formInline1.timeType!=='quarter') {
+          http.get(
+              "/rank/network/",
+              {
+                params: {
+                  market: this.formInline1.market,
+                  com_type: this.formInline1.industry,
+                  time: this.formInline1.pre_date,
+                  time_type: this.formInline1.timeType
+                },
+                //   防止带中括号
+                paramsSerializer: params => {
+                  return qs.stringify(params, {indices: false})
+                }
+              }).then(response => {
+                loadingInstance.close()
+            if (response.data.length === 0)
+              alert('没有结果')
+            else {
+              let dat = response.data
+              this.tableData = dat
+              this.barData = dat
+
+              console.log(this.tableData)
+              this.result = response.data
+              // 柱状图
+              const echarts3 = echarts.init(this.$refs.echarts_3)
+              const option_3 = {
+                // 右上角存图
+                toolbox: {
+                  feature: {
+                    saveAsImage: {}
+                  }
+                },
+                legend: {
+                  // 图例文字颜色
+                  textStyle: {
+                    color: "#333",
+                  },
+                },
+                grid: {
+                  left: "20%",
+                },
+                // 提示框
+                tooltip: {
+                  trigger: "axis",
+                  axisPointer: {
+                    type: 'shadow'
+                  }
+                },
+                xAxis: {
+                  type: "category", // 类目轴
+                  // xData太多显示不出来
+                  data: []
+                },
+                yAxis: [
+                  {
+                    type: "value",
+                  }
+                ],
+                title: {
+                  text: '中心性分析',
+                  x: 'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                  y: "bottom",
+                  textStyle: {//主标题文本样式
+                    fontSize: 13,
+                  },
+                  padding: [5, 0, 10, 0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+                },
+                series: [
+                  {
+                    name: '介接近中心性',
+                    data: this.barData.map(item => item.CC),
+                    type: 'bar'
+                  },
+                  {
+                    name: '介数中心性',
+                    data: this.barData.map(item => item.BC),
+                    type: 'bar'
+                  },
+                  {
+                    name: '加权PageRank',
+                    data: this.barData.map(item => item['weighted-PR']),
+                    type: 'bar'
+                  },
+                  {
+                    name: '度中心性',
+                    data: this.barData.map(item => item.DC),
+                    type: 'bar'
+                  },
+
+                ],
+              }
+              echarts3.setOption(option_3)
+            }
+          }).finally(
+              ( )=>loadingInstance.close()
+          )
+        }
+        else {
+          {
+            http.get(
+                "/rank/network/",
+                {
+                  params: {
+                    market: this.formInline1.market,
+                    com_type: this.formInline1.industry,
+                    time: this.formInline1.quarter_date,
+                    time_type: this.formInline1.timeType
+                  },
+                  //   防止带中括号
+                  paramsSerializer: params => {
+                    return qs.stringify(params, {indices: false})
+                  }
+                }).then(response => {
+                  loadingInstance.close()
+              if (response.data.length === 0)
+                alert('没有结果')
+              else {
+                let dat = response.data
+                this.tableData = dat
+                this.barData = dat
+
+                console.log(this.tableData)
+                this.result = response.data
+                // 柱状图
+                const echarts3 = echarts.init(this.$refs.echarts_3)
+                const option_3 = {
+                  // 右上角存图
+                  toolbox: {
+                    feature: {
+                      saveAsImage: {}
+                    }
+                  },
+                  legend: {
+                    // 图例文字颜色
+                    textStyle: {
+                      color: "#333",
+                    },
+                  },
+                  grid: {
+                    left: "20%",
+                  },
+                  // 提示框
+                  tooltip: {
+                    trigger: "axis",
+                    axisPointer: {
+                      type: 'shadow'
+                    }
+                  },
+                  xAxis: {
+                    type: "category", // 类目轴
+                    // xData太多显示不出来
+                    data: []
+                  },
+                  yAxis: [
+                    {
+                      type: "value",
+                    }
+                  ],
+                  title: {
+                    text: '中心性分析',
+                    x: 'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    y: "bottom",
+                    textStyle: {//主标题文本样式
+                      fontSize: 13,
+                    },
+                    padding: [5, 0, 10, 0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+                  },
+                  series: [
+                    {
+                      name: '介接近中心性',
+                      data: this.barData.map(item => item.CC),
+                      type: 'bar'
+                    },
+                    {
+                      name: '介数中心性',
+                      data: this.barData.map(item => item.BC),
+                      type: 'bar'
+                    },
+                    {
+                      name: '加权PageRank',
+                      data: this.barData.map(item => item['weighted-PR']),
+                      type: 'bar'
+                    },
+                    {
+                      name: '度中心性',
+                      data: this.barData.map(item => item.DC),
+                      type: 'bar'
+                    },
+
+                  ],
+                }
+                echarts3.setOption(option_3)
+              }
+            }).finally(
+               ( )=>loadingInstance.close()
+            )
+          }
+        }
+
+      },
+
+    // 关联主体、影响范围
+    onSubmit2(){
+      this.relatedRes.length=0
+      http.get('/rank/relate/',
+      {params:{
+            name:this.seleced,
+            type: this.typeRela,
+            market:this.formInline1.market,
+            industry: this.formInline1.industry,
+            start_date:this.formInline1.start_date,
+            end_date:this.formInline1.end_date,
+      }}).then(res=>{
+        // console.log(res.data)
+        if (res.data!=='null'){
+          this.relatedRes.length=0
+          for (let i in res.data)
+          {this.relatedRes.push(res.data[i])
+          }
+          console.log(this.relatedRes)
+          this.showRelated=true
+        }
+        else
+          this.$message({
+            showClose: true,
+            message: '未查询到结果',
+            type: 'info'
+          });
+
+      })
+    },
+    // 按行业、地域
+      onSubmit3(){
+      // this.relatedRes.length=0
+        http.get('/rank/spread/',
+            {params:{
+                name:this.seleced,
+                type: this.typeSpread,
+                market:this.formInline1.market,
+                industry: this.formInline1.industry,
+                start_date:this.formInline1.start_date,
+                end_date:this.formInline1.end_date,
+              }}).then(res=>{
+          console.log(res.data.data)
+
+        })
+      },
+      // 纵向对比表单提交
+      onSubmit4() {
+        if (this.formInline1.timeType !== 'quarter') {
+          http.get('/rank/history/',
+              {
+                params: {
+                  market: this.formInline1.market,
+                  com_type: this.formInline1.industry,
+                  time_type: this.formInline1.timeType,
+                  start: this.formInline1.start_pre,
+                  end: this.formInline1.end_pre,
+                },
+                paramsSerializer: params => {
+                  return qs.stringify(params, {indices: false})
+                }
+              }).then(res => {
+            if (res.data.length === 0)
+              alert('没有结果')
+            else {
+              // let tmp = res.data
+              // this.getSpanArr(tmp)
+              this.historyData=res.data.data
+              this.timeLis=res.data.time
+            }
+
+
+          })
+        } else {
+          http.get('/rank/history/',
+              {
+                params: {
+                  market: this.formInline1.market,
+                  com_type: this.formInline1.industry,
+                  time_type: this.formInline1.timeType,
+                  start: this.formInline1.start_quarter,
+                  end: this.formInline1.end_quarter,
+                },
+                paramsSerializer: params => {
+                  return qs.stringify(params, {indices: false})
+                }
+              }).then(res => {
+            if (res.data.length === 0)
+              alert('没有结果')
+            else {
+              // let tmp = res.data.data
+              // this.getSpanArr(tmp)
+              this.historyData=res.data.data
+              this.timeLis=res.data.time
+
+            }
+          })
+        }
+      },
+      getSpanArr(list) {
+        // 先给所有的数据都加一个v.rowspan = 1
+        list.forEach(item => {
+          item.rowspan = 1;
+          // item.rowspan1 = 1;
+          // 有几列想合并就设置几个
+
+        });
+        // 双层循环
+        for (let i = 0; i < list.length; i++) {
+          for (let j = i + 1; j < list.length; j++) {
+            //此处可根据相同字段进行合并
+            if (list[i].duration=== list[j].duration) {
+              list[i].rowspan++;
+              list[j].rowspan--;
+            }
+            // if (list[i].duration=== list[j].duration  && list[i].Total_score === list[j].Total_score ) {
+            //   list[i].rowspan1++;
+            //   // list[j].rowspan1--;
+            // }
+          }
+          console.log(list[i].rowspan)
+          // 这里跳过已经重复的数据
+          i = i + list[i].rowspan - 1;
+          // i = i + list[i].rowspan1 - 1;
+        }
+        this.historyData.length=0
+        this.historyData = list;
+        console.log(this.historyData)
+      },
+
+      // 复杂表格合并相同列
+      ObjectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        // 第一列
+        if (columnIndex === 0) {
+          return {
+            rowspan: row.rowspan,
+            colspan: 1,
+          };
+        }
+        // 第二列
+        // if (columnIndex === 1) {
+        //   return {
+        //     rowspan: row.rowspan1,
+        //     colspan: 1,
+        //   };
+        // }
+        // row.XXX的值跟上述函数对应
+
+      },
+
+    detail(row){
+      this.seleced=row.comp_name
+      this.datelis.length=0
+      this.asset.length=0
+      this.held_num.length=0
+      http.get('/rank/asset/',
+          {params:{
+              comp_name:this.seleced,
+            }}).then(res=>{
+            for (let i in res.data)
+            {
+              this.datelis.push(res.data[i]['duration'].slice(0,11))
+              this.asset.push(res.data[i]['asset'])
+              this.held_num.push(res.data[i]['held_num'])
+            }
+
+      })
+      this.detailData.length=0
+      for (let i in this.tableData)
+      {
+        if (this.tableData[i]['comp_name']===this.seleced)
+          this.detailData=Array(this.tableData[i])
+      }
+      // let tmp
+      // for (let i in this.result.index)
+      // {
+      //   console.log(this.result.index[i].n)
+      //   if (this.result.index[i].n===this.seleced)
+      //     tmp=this.result.index[i]
+      //  }
+      // console.log(this.result.rank)
+      // for (let i in this.result.rank)
+      //   if (this.result.rank[i].name===this.seleced)
+      //     tmp=Object.assign(this.result.rank[i],tmp)
+      //     // tmp=[...this.result.rank[i],tmp]
+      // this.detailData=Array(tmp)
+        console.log(this.detailData)
+      // console.log(row.name)//返回这一行所有的内容
+
+      this.detailsdialog = true//打开弹窗
+    },
+    initEcharts() {
+       // 详情页的线形图
+        // 详情图的柱状图、饼图
+        // 1、柱状图
+        var echarts4 = echarts.init(this.$refs.echarts_4);
+        var option_4={
+              title: {
+                text: "影响范围统计-行业",
+                left:"center",
+                textStyle:{
+                fontSize:17,
+                lineHeight:60
+                }
+              },
+              tooltip: {},
+              xAxis: {
+                data: ["银行", "保险", "运输"],
+                name:"行业",
+                nameTextStyle:{
+                  padding:[0,0,-40,-260],
+                  verticalAlign:'bottom'
+                }
+              },
+              yAxis: {
+                name:'影响行业的数量',
+                axisTick:{
+                  show:true,
+                },
+                axisLine:{
+                  show:true,
+                },
+                nameTextStyle:{
+                  position: 'left',
+                  nameLocation: 'middle', 
+                  nameGap: 60, 
+                  nameRotate: 90 
+                } 
+              },
+              series: [
+                {
+                name: "数量",
+                type: "bar",
+                data: [45, 20, 30],
+                barWidth:60,
+                itemStyle:{
+                  normal: {
+                    color: function (params) {
+                      let colorList = [
+                      'blue',
+                      'green',
+                      'red',
+                      ];
+                      let colorItem = colorList[params.dataIndex];
+                      return colorItem;
+                    },
+                    label:{          
+                      show:true,
+                      position:'top',          
+                    }
+                  }
+                }
+                },
+              ],
+                }
+        echarts4.setOption(option_4)
+          // 2、饼图
+
+        const  echarts5 = echarts.init(this.$refs.echarts_5);
+        const option_5 = {
+        title: {
+          text: "影响行业占比份额",
+          left: "center",
+          textStyle:{
+          fontSize:17,
+          lineHeight:85
+          }
+        },
+        tooltip: {
+          trigger: "item",
+        },
+        legend: {
+          orient: "vertical",
+          left: "30",
+          top:"40"
+        },
+        series: [
+          {
+          name: "占比份额",
+          type: "pie",
+          radius: "55%",
+          LabelOverlap: true,
+          data: [
+            { value: 45, name: "银行" },
+            { value: 20, name: "保险" },
+            { value: 30, name: "运输" },
+          ],
+          itemStyle:{
+            emphasis: {
+              shadowBlur: 10,
+              shadowOffsetX: 0,
+              shadowColor: "rgba(0, 0, 0, 0.5)",
+            },
+            borderWidth:2,
+            borderColor:'#fff'
+          }
+          },
+        ],
+
+
+            }
+
+        echarts5.setOption(option_5)
+    } ,
+
+
+      open(){
+              this.$nextTick(() => {
+              //  执行echarts方法
+                this.initEcharts()
+              })
+            },
+
+  }
+
+
+  };
+  </script>
+  
+  <style lang="less" scoped>
+/deep/ .el-checkbox__label {//弹窗单选框的表单样式
+    padding-right: 40px;
+    padding-left: 40px;
+}
+.grayish_btn{//浅灰色按钮
+  color: #fff;//文字颜色
+  background-color: #aaaaaa;//背景颜色
+}
+/deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+      border-bottom: 1px solid rgba(242, 242, 242, 0.654901960784314) !important;
+      padding: 0px 0 !important;
+      min-width: 0 !important;
+    }
+    .el-table .el-table__cell {
+      padding: 12px 0; 
+      min-width: 0;
+    }
+    /deep/ .active_header{//表头
+      color: #333333;
+      // font-size: 9px;
+      text-align: center !important;
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      // font-size: 10px;
+    }
+.text{
+      color:rgba(2, 167, 240, 0.729411764705882);
+    }
+.form{//2、产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    // margin-top:5px; 
+    // height: 40px;
+    padding-left: 10px;
+    margin-bottom: 0px;
+    padding-bottom: 0px;
+
+  }
+  
+  // 第一层
+  .one_twins_card{
+    margin-top:0px;
+    margin-bottom:3px;
+    display:flex;
+    justify-content:space-between;//左右贴边
+    .el-card {
+      width:49.5%;
+    } 
+    .el-col-2 {
+     width: 2%;
+
+}
+    // 数据
+    .num_card{
+    margin-top: 40px;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-bottom: 20px;
+
+
+    .desc{
+      text-align: center;//居中
+      font-weight: bold;//字体加粗
+      font-size: 17px;
+      color:'#696969';
+
+    }
+    .desc_value{
+      text-align: center;//居中
+      font-size: 18px;
+      color:#02A7F0;;
+    }
+
+
+
+
+    .el-divider--horizontal {
+    display: flex;
+    justify-content:center;
+    height: 1px;
+    width: 80%;
+    margin: 24px 70px 24px 30px;//上 右 下 左
+  }
+    .el-statistic {
+        font-size: 13px;
+        color:#02A7F0;;//没改成，之后再改
+      }
+  }
+    .twins_pie{
+        display:flex;
+        justify-content:space-between;
+        // padding:10px;
+        // margin-top: 30px;
+        // margin-left: 20px;
+        // margin-right: 20px;
+        // margin-bottom: 20px;
+
+    }
+  }
+
+  
+  //第二层
+.two{
+
+  // 表格中操作
+  .content{
+    // display:flex;
+    // justify-content:space-between;
+    .table{
+    padding: 20px 10px 2px 10px;//返回表格添加间隙 上 右
+
+
+    // 调整表头间隔、设置表头下方边框颜色
+    /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+      border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
+      padding: 0px 0; 
+      min-width: 0;
+    }
+    .el-table .el-table__cell {
+      padding: 12px 0; 
+      min-width: 0;
+    }
+    /deep/ .active_header{//表头
+      color: #333333;
+      font-size: 13px;
+      text-align: center !important;
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      font-size: 13px;
+    }
+  
+
+    }
+    .bar{
+      padding: 20px 40px 2px 2px;//返回表格添加间隙 上 右
+    }
+
+  }
+  
+  .flex-charts{//并列图
+    // margin-top:20px; 
+    display:flex;
+    justify-content:space-between;
+    // padding:20px;
+}
+}
+
+.grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+    margin-bottom: 20px;
+  }
+  
+  
+
+ .sublabel{ // 小标签标识
+    // font-size: 13px;
+    // padding:2px;
+    margin-top:10px;
+    background-color: rgba(2, 167, 240, 0.5);
+    width: 5px; 
+    height: 35px;
+    
+  } 
+  .title{
+    padding-left: 4px;
+    margin-top:15px;
+    font-weight: bold;//字体加粗
+    display:flex;
+    justify-content:flex-start
+}
+  
+   
+   
+  
+  
+  
+  </style>
+  
+  
+  
\ No newline at end of file
diff --git a/src_old/views/高影响力主体分析old.vue b/src_old/views/高影响力主体分析old.vue
new file mode 100644
index 0000000..d0cd87f
--- /dev/null
+++ b/src_old/views/高影响力主体分析old.vue
@@ -0,0 +1,1477 @@
+<template>
+
+    <el-row> 
+      <el-tabs type="border-card"> 
+        <!-- 1、横向对比 -->
+        <el-tab-pane label="横向对比">
+           <!-- 搜索栏 -->
+          <div class="form">
+                                                          <!-- inline="true"表单域在一行 -->
+            <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+              <el-form-item label="市场">
+                <el-select   v-model="formInline1.market" placeholder="选择市场" size="mini">
+                  <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="主体类型">
+                <el-select   v-model="formInline1.industry" placeholder="选择行业" size="mini">
+                  <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="时间粒度">
+                <el-select   v-model="formInline1.timeType" placeholder="选择时间粒度" size="mini">
+                  <el-option v-for="item in optionsTime" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="时间">
+  <!--              <span class="demonstration">月</span>-->
+                <el-date-picker
+                    v-if="formInline1.timeType==='month'"
+                    v-model="formInline1.pre_date"
+                    type="month"
+                    size="mini"
+                    placeholder="选择月">
+                </el-date-picker>
+                <quter-component  v-if="formInline1.timeType==='quarter'" v-model="formInline1.quarter_date"></quter-component>
+                <half-year v-if="formInline1.timeType==='half_year'" v-model="formInline1.pre_date"/>
+              </el-form-item>
+  <!--            <el-form-item label="时间">-->
+  <!--              <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+  <!--            </el-form-item>-->
+
+  <!--            <el-form-item label="结束时间">-->
+  <!--              <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+  <!--            </el-form-item>-->
+              <el-form-item>
+                <el-button class="grayish_btn" @click="onSubmit1" icon="el-icon-search" size="mini">查询</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+
+
+
+<!--          <div class="one_twins_card">-->
+<!--              &lt;!&ndash; 一左 &ndash;&gt;-->
+<!--              <el-card style=" height:300px;width: 30%;" :body-style={padding:0}>         &lt;!&ndash;:body-style={padding:0}取消卡片边距，btn就能在左上角 &ndash;&gt;-->
+<!--                <span class="superscript" style="width: 20px; height: 40px;">总体分析</span>-->
+<!--                <div class="num_card" :body-style="{display: 'flex'}">-->
+<!--                  &lt;!&ndash; <el-row > &ndash;&gt;-->
+<!--                        &lt;!&ndash; <el-col :span="11"> &ndash;&gt;-->
+<!--                          <div>-->
+<!--                            <p class="desc">高影响力风险主体总量:</p>-->
+<!--                            <p class="desc_value">{{ totalRisk }}个</p>-->
+<!--                          </div>-->
+
+
+<!--                          <el-divider style="width:60%"></el-divider>-->
+
+
+<!--                        &lt;!&ndash; </el-col>-->
+<!--                        <el-col :span="2">-->
+<!--                          <el-divider direction="vertical"  content-position="center"></el-divider>-->
+
+<!--                        </el-col> &ndash;&gt;-->
+<!--                        -->
+<!--                        &lt;!&ndash; <el-col :span="11"> &ndash;&gt;-->
+<!--                          <div>-->
+<!--                            <p class="desc">高影响力主体风险类型:</p>-->
+<!--                            <p class="desc_value">{{totalType}}种</p>-->
+<!--                          </div>-->
+<!--                        &lt;!&ndash; </el-col> &ndash;&gt;-->
+<!--                  &lt;!&ndash; </el-row> &ndash;&gt;-->
+
+<!--              </div>-->
+<!--              </el-card>-->
+<!--              -->
+<!--              &lt;!&ndash; 一右 &ndash;&gt;-->
+<!--              <el-card style=" height:300px;width: 68%;" :body-style={padding:0}>-->
+<!--                <div>-->
+<!--                  <span class="superscript" style="width: 20px; height: 40px;">风险分布</span>-->
+<!--                  &lt;!&ndash; 两个饼状图 &ndash;&gt;-->
+<!--                  <div class="twins_pie">-->
+
+<!--                    <div ref="echarts_1" style="height:280px;width:400px"></div>-->
+<!--                    <div ref="echarts_2" style="height:280px;width:400px"></div>-->
+
+<!--                    &lt;!&ndash; <div ref="echarts1" style="height: 100px"></div> &ndash;&gt;-->
+<!--                    &lt;!&ndash; <div ref="echarts2" style="height: 100px"></div> &ndash;&gt;-->
+<!--                  </div>-->
+
+
+<!--              </div>-->
+<!--              </el-card>-->
+<!--          </div>-->
+
+          <!-- 第二层表格与图像 -->
+          <div class="two">
+            <el-card :body-style={padding:0} style='height: 400px;width: 100%;'>
+              <!-- 1、上标 -->
+              <span class="superscript" style="width: 20px; height: 40px;">影响力排名</span>
+
+      <!--        模型暂时不支持-->
+      <!--         <el-form :inline="true"  class="demo-form-inline" :model="formInline4" ref="formInline">-->
+      <!--            <el-form-item label="个体类型" style="margin: 0px;padding-left: 80px;padding-top: 5px">-->
+      <!--              <el-select  v-model="formInline4.type"  size="mini">-->
+      <!--                <el-option label="私募" value="私募"></el-option>-->
+      <!--                <el-option label="公募" value="公募"></el-option>-->
+      <!--              </el-select>-->
+      <!--            </el-form-item>-->
+      <!--        </el-form>-->
+              
+              <!-- 2、内容 -->
+              <div class="content">
+
+                <div class="table" style="width: 50%; float: left; overflow: hidden">
+                  <el-table :data="tableData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}" 
+                        border  
+                        height="250" 
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center"
+                        style="width: 90%">          <!-- style="width: 40%"               height="215"  -->
+                      <el-table-column v-for='(val,key) in tableLabel' :prop="key" :label="val"  :key="key"/><!--插槽里面没有东西就可以用单标签  -->
+                      <el-table-column
+                              prop="scale"
+                              label="操作">
+                              <template slot-scope="scope">
+                                <span class="text"  v-on:click="detail(scope.row)">查看详情</span>
+                              </template>
+                          </el-table-column>
+                  </el-table>
+                </div>
+
+              <div>
+                <!-- 详细信息弹窗，默认关闭 -->
+                <el-dialog  :visible.sync="detailsdialog" width="100%" @open="open()" >
+                  <!-- title="收货地址" -->
+                  <el-card >
+                  <!-- 详细信息 -->
+                  <el-card style=" height:600px;margin-bottom:10px ; " :body-style={padding:0} >    
+                    <span class="superscript" style="width: 20px; height: 40px;">详细信息</span>
+                    <el-table :data="detailData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border  
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center"
+                        style="margin:15px;">     
+                        <el-table-column
+                        prop="comp_name"
+                        label="主体名称"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column label="市场结构">
+                        <el-table-column
+                          prop="DC"
+                          label="度中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="BC"
+                          label="介数中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="CC"
+                          label="接近中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="weighted-PR"
+                          label="加权PageRank"
+                          width="120">
+                        </el-table-column>
+                      </el-table-column>
+                        <el-table-column label="个体规模">
+                          <el-table-column
+                            prop="region"
+                            label="所在区域"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                            prop="held_num"
+                            label="持股数量"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                              prop="asset"
+                              label="当前资金规模"
+                              width="120">
+                          </el-table-column>
+                        </el-table-column>
+      <!--                  <el-table-column-->
+      <!--                  prop="主体风险"-->
+      <!--                  label="主体风险"-->
+      <!--                  width="120">-->
+      <!--                </el-table-column>-->
+                      <el-table-column
+                        prop="Total_score"
+                        label="影响力综合分数"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column
+                        prop="grade"
+                        label="影响等级"
+                        width="120">
+                      </el-table-column>
+      <!--                <el-table-column-->
+      <!--                        prop="scale"-->
+      <!--                        label="操作">-->
+      <!--                        <template slot-scope="scope">-->
+      <!--                          <span class="text"  v-on:click="detail(scope.row)">查看风险指标详情</span>-->
+      <!--                        </template>-->
+      <!--                    </el-table-column>-->
+                    </el-table>
+                    <div style="display:flex;">
+                      <el-divider direction="vertical" class="sublabel"></el-divider>
+                      <span class='title'>个体规模分析</span>
+                    </div>
+      <!--              模型暂时不支持-->
+      <!--              <el-form :inline="true"  class="demo-form-inline" :model="formInline4" ref="formInline">-->
+      <!--                <el-form-item label="指标" style="margin: 0px;padding-left: 80px;padding-top: 5px">-->
+      <!--                  <el-select  v-model="formInline4.type"  size="mini">-->
+      <!--                    <el-option label="基金规模" value="基金规模"></el-option>-->
+      <!--                    <el-option label="持股数量" value="持股数量"></el-option>-->
+      <!--                  </el-select>-->
+      <!--                </el-form-item>-->
+      <!--              </el-form>-->
+                    <DifferentialChart :asset="asset" :datelis="datelis" :held_num="held_num"/>
+              
+
+
+                  </el-card>
+                          
+                  <!-- 关联主体 -->
+                  <el-card style=" height:300px;margin-bottom:10px " :body-style={padding:0} >
+                    <span class="superscript" style="width: 20px; height: 40px;">关联主体</span>
+                      
+                    <!-- 表单 -->
+                    <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                        <el-form :inline="true"  :model="formInline2" class="demo-form-inline" style="margin: 10px;">
+                          <template>
+                            <el-radio v-model="typeRela" label="key_node">关键节点</el-radio>
+                            <el-radio v-model="typeRela" label="other">相似节点</el-radio>
+                          </template>
+                          <el-form-item>
+                            <el-button class="grayish_btn" @click="onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
+                          </el-form-item>
+                        </el-form>
+                    </div>
+                    <!-- 关联主体点 -->
+                    <div style="display:flex;padding-left:130px" v-if="showRelated">
+                      <el-button  v-for='(val,key) in relatedRes'  :key="key"  round style=" height:100px; width:300px ;margin-right:50px">{{val}}</el-button>
+                    </div>
+                  </el-card>
+
+                  <!-- 影响范围 -->
+      <!--            <el-card style=" height:400px; " :body-style={padding:0} >    -->
+      <!--              <span class="superscript" style="width: 20px; height: 40px;margin-bottom: 10px;">风险影响</span>-->
+      <!--              <div class="form">-->
+      <!--                                                        &lt;!&ndash; inline="true"表单域在一行 &ndash;&gt;-->
+      <!--                  <el-form :inline="true"  :model="formInline3" class="demo-form-inline">-->
+      <!--                    <template>-->
+      <!--                      <el-radio v-model="typeSpread" label="industry">行业</el-radio>-->
+      <!--                      <el-radio v-model="typeSpread" label="regions">地域</el-radio>-->
+      <!--                    </template>-->
+      <!--&lt;!&ndash;                    <el-form-item >&ndash;&gt;-->
+      <!--&lt;!&ndash;                      <el-checkbox v-model="formInline3.ndustry_selection">行业</el-checkbox>&ndash;&gt;-->
+      <!--&lt;!&ndash;                    </el-form-item>&ndash;&gt;-->
+
+      <!--&lt;!&ndash;                    <el-form-item >&ndash;&gt;-->
+      <!--&lt;!&ndash;                      <el-checkbox v-model="formInline3.regional_selection">地域</el-checkbox>&ndash;&gt;-->
+      <!--&lt;!&ndash;                    </el-form-item>&ndash;&gt;-->
+
+      <!--                    <el-form-item>-->
+      <!--                      <el-button class="grayish_btn" @click="onSubmit3" icon="el-icon-search" size="mini">查询</el-button>-->
+      <!--                    </el-form-item>-->
+      <!--                  </el-form>-->
+      <!--              </div>-->
+      <!--              <div class="flex-charts">-->
+      <!--                <div ref="echarts_4" style="height:300px;width:50%"></div>-->
+      <!--                <div ref="echarts_5" style="height:300px;width:50%"></div>-->
+      <!--            </div>-->
+      <!--            </el-card>-->
+                </el-card>
+                </el-dialog>
+              </div>
+
+                <div class='bar' style="width: 50%; float: left; overflow: hidden">
+                  <div ref="echarts_3" style="height:300px;width:100%"></div>
+                </div>
+
+            </div>
+
+
+            </el-card>
+
+
+          </div>
+   
+        </el-tab-pane>
+
+
+        <!-- 2、纵向对比 -->
+        <el-tab-pane label="纵向对比">
+          <!-- 搜索栏 -->
+          <div class="form">
+                                                          <!-- inline="true"表单域在一行 -->
+            <el-form :inline="true"  :model="formInline1" class="demo-form-inline">
+              <el-form-item label="市场">
+                <el-select   v-model="formInline1.market" placeholder="选择市场" size="mini">
+                  <el-option v-for="item in options_market" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="主体类型">
+                <el-select   v-model="formInline1.industry" placeholder="选择行业" size="mini">
+                  <el-option v-for="item in options_industry" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="时间粒度">
+                <el-select   v-model="formInline1.timeType" placeholder="选择时间粒度" size="mini">
+                  <el-option v-for="item in optionsTime" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+
+
+              <el-form-item label="开始时间">
+
+                <el-date-picker
+                    v-if="formInline1.timeType==='month'"
+                    v-model="formInline1.start_pre"
+                    type="month"
+                    size="mini"
+                    placeholder="选择月">
+                </el-date-picker>
+                <quter-component  v-if="formInline1.timeType==='quarter'" v-model="formInline1.start_quarter"></quter-component>
+                <half-year v-if="formInline1.timeType==='half_year'" v-model="formInline1.start_pre"/>
+<!--                原始时间组件-->
+<!--                <el-date-picker  v-model="formInline1.start_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+              </el-form-item>
+              <el-form-item label="结束时间">
+
+                <el-date-picker
+                    v-if="formInline1.timeType==='month'"
+                    v-model="formInline1.end_pre"
+                    type="month"
+                    size="mini"
+                    placeholder="选择月">
+                </el-date-picker>
+                <quter-component  v-if="formInline1.timeType==='quarter'" v-model="formInline1.end_quarter"></quter-component>
+                <half-year v-if="formInline1.timeType==='half_year'" v-model="formInline1.end_pre"/>
+
+<!--                <el-date-picker v-model="formInline1.end_date" type="date" placeholder="年-月-日" size="mini"></el-date-picker>-->
+              </el-form-item>
+              <el-form-item>
+                <el-button class="grayish_btn" @click="onSubmit4" icon="el-icon-search" size="mini">查询</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="table" style=" overflow: hidden">
+                  <el-table :data="historyData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                        border  
+                        height="400" 
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center">          <!-- style="width: 40%"               height="215"  -->
+                    <el-table-column v-for='(val,key) in timeLis' :prop="key" :label="val"  :key="key">
+<!--                      <el-table-column v-for='(val,key) in historyDataLabel' :prop="key" :label="val"  :key="key"/>&lt;!&ndash;插槽里面没有东西就可以用单标签  &ndash;&gt;-->
+                      <!--                      <el-table-column-->
+                      <!--                              prop="scale"-->
+                      <!--                              label="操作">-->
+                      <!--                              <template slot-scope="scope">-->
+                      <!--                                <span class="text"  v-on:click="detail(scope.row)">查看详情</span>-->
+                      <!--                              </template>-->
+                      <!--                          </el-table-column>-->
+
+                    </el-table-column>
+
+                  </el-table>
+          </div>
+
+              <div>
+                <!-- 详细信息弹窗，默认关闭 -->
+                <el-dialog  :visible.sync="detailsdialog" width="100%" @open="open()" >
+                  <!-- title="收货地址" -->
+                  <el-card >
+                  <!-- 详细信息 -->
+                  <el-card style=" height:600px;margin-bottom:10px ; " :body-style={padding:0} >    
+                    <span class="superscript" style="width: 20px; height: 40px;">详细信息</span>
+                    <el-table :data="detailData" :header-cell-style="{background: 'rgba(242, 242, 242, 0.654901960784314)'}"
+                    border  
+                        :row-style="{height:'28px'}"
+                        :cell-style="{padding:'0px'}"
+                        header-row-class-name="active_header"
+                        header-cell-class-name="active_header"
+                        cell-class-name="content_center"
+                        style="margin:15px;">     
+                        <el-table-column
+                        prop="comp_name"
+                        label="主体名称"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column label="市场结构">
+                        <el-table-column
+                          prop="DC"
+                          label="度中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="BC"
+                          label="介数中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="CC"
+                          label="接近中心性"
+                          width="120">
+                        </el-table-column>
+                        <el-table-column
+                          prop="weighted-PR"
+                          label="加权PageRank"
+                          width="120">
+                        </el-table-column>
+                      </el-table-column>
+                        <el-table-column label="个体规模">
+                          <el-table-column
+                            prop="region"
+                            label="所在区域"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                            prop="held_num"
+                            label="持股数量"
+                            width="120">
+                          </el-table-column>
+                          <el-table-column
+                              prop="asset"
+                              label="当前资金规模"
+                              width="120">
+                          </el-table-column>
+                        </el-table-column>
+      <!--                  <el-table-column-->
+      <!--                  prop="主体风险"-->
+      <!--                  label="主体风险"-->
+      <!--                  width="120">-->
+      <!--                </el-table-column>-->
+                      <el-table-column
+                        prop="Total_score"
+                        label="影响力综合分数"
+                        width="120">
+                      </el-table-column>
+                      <el-table-column
+                        prop="grade"
+                        label="影响等级"
+                        width="120">
+                      </el-table-column>
+      <!--                <el-table-column-->
+      <!--                        prop="scale"-->
+      <!--                        label="操作">-->
+      <!--                        <template slot-scope="scope">-->
+      <!--                          <span class="text"  v-on:click="detail(scope.row)">查看风险指标详情</span>-->
+      <!--                        </template>-->
+      <!--                    </el-table-column>-->
+                    </el-table>
+                    <div style="display:flex;">
+                      <el-divider direction="vertical" class="sublabel"></el-divider>
+                      <span class='title'>个体规模分析</span>
+                    </div>
+      <!--              模型暂时不支持-->
+      <!--              <el-form :inline="true"  class="demo-form-inline" :model="formInline4" ref="formInline">-->
+      <!--                <el-form-item label="指标" style="margin: 0px;padding-left: 80px;padding-top: 5px">-->
+      <!--                  <el-select  v-model="formInline4.type"  size="mini">-->
+      <!--                    <el-option label="基金规模" value="基金规模"></el-option>-->
+      <!--                    <el-option label="持股数量" value="持股数量"></el-option>-->
+      <!--                  </el-select>-->
+      <!--                </el-form-item>-->
+      <!--              </el-form>-->
+                    <DifferentialChart :asset="asset" :datelis="datelis" :held_num="held_num"/>
+              
+
+
+                  </el-card>
+                          
+                  <!-- 关联主体 -->
+                  <el-card style=" height:300px;margin-bottom:10px " :body-style={padding:0} >
+                    <span class="superscript" style="width: 20px; height: 40px;">关联主体</span>
+                      
+                    <!-- 表单 -->
+                    <div class="form">
+                                                              <!-- inline="true"表单域在一行 -->
+                        <el-form :inline="true"  :model="formInline2" class="demo-form-inline" style="margin: 10px;">
+                          <template>
+                            <el-radio v-model="typeRela" label="key_node">关键节点</el-radio>
+                            <el-radio v-model="typeRela" label="other">相似节点</el-radio>
+                          </template>
+                          <el-form-item>
+                            <el-button class="grayish_btn" @click="onSubmit2" icon="el-icon-search" size="mini">查询</el-button>
+                          </el-form-item>
+                        </el-form>
+                    </div>
+                    <!-- 关联主体点 -->
+                    <div style="display:flex;padding-left:130px" v-if="showRelated">
+                      <el-button  v-for='(val,key) in relatedRes'  :key="key"  round style=" height:100px; width:300px ;margin-right:50px">{{val}}</el-button>
+                    </div>
+                  </el-card>
+
+                </el-card>
+                </el-dialog>
+              </div>
+                     
+        </el-tab-pane>
+</el-tabs>
+  </el-row>
+</template>
+  
+<script>
+import * as echarts from "echarts"
+import http from '../utils/request'
+import DifferentialChart from "@/components/echarts/DifferentialChart.vue";
+import halfYear from "@/components/halfYear";
+import quterComponent from "@/components/quterComponent";
+import qs from "qs";
+  export default {
+    components:{
+      DifferentialChart,
+      halfYear,
+      quterComponent,
+},
+    data() {
+      return {
+        datelis:[],
+        asset:[],
+        held_num:[],
+        width:null,
+        result:{},
+        showRelated:false,
+        relatedRes:[],
+        seleced:'',
+        typeRela:null,
+        typeSpread:null,
+        totalRisk:Number,
+        totalType:Number,
+// 【详情页】
+        // 详情页是否打开的判断标签
+        detailsdialog: false,
+
+        detailData: [
+         {
+          主体名称:'主体1'
+         }
+        ],
+        
+// 【搜索栏】
+        // 选择框——1市场选项
+        options_market: [{
+          value: 'stock',
+          label: '股票'
+        }, {
+          value: '期货',
+          label: '期货'
+        }, {
+          value: '债券',
+          label: '债券'
+        }],
+        optionsTime:[
+          {label: '半年',value:'half_year'},
+          {label: '季度',value:'quarter'},
+          {label: '月',value:'month'},
+        ],
+        // 选择框——2行业选项
+        options_industry: [
+          {label:'公募',value:'PubFund'},
+          {label:'私募',value:'PrivFund'},
+          {label:'上市企业',value:'listedComp'},
+          {label:'海外机构',value:'ForeignComp'},
+          {label:'量化机构',value:'QuantFund'},
+        ],
+        // 整合收据进行接收（3个）
+        formInline1: {
+            timeType:'',
+            quarter_date:'',
+            pre_date:'',
+            market: '',
+            industry: '',
+            start_pre:'',
+            start_quarter:'',
+            end_pre:'',
+          end_quarter:'',
+          },
+        // 详情页
+        formInline2: {
+          key_nodes: false,
+          transmissibility_max: false,
+        },
+        formInline3: {
+          regional_selection: false,//地域选择
+          ndustry_selection: false,//行业选择
+        },
+        formInline4: {
+          type:'',
+        },
+
+
+        // 图表数据
+        pieDataIndus:[],
+        pieDataType:[],
+        tableData: [
+          { name: '主体1',
+            main_risk: '市场风险',
+            zhfs: 85,
+            leve: "中",},
+
+        ],
+        tableLabel: {
+          comp_name: '主体名称',
+          Total_score: '影响力综合分数',
+          grade: '影响等级',
+          spread_ability:'传播能力'
+        },
+        historyData:[],
+        timeLis:[],
+        historyDataLabel: {
+
+          // duration:'时间',
+          comp_name: '主体名称',
+          Total_score: '影响力综合分数',
+          // grade: '影响等级',
+          // spread_ability:'传播能力'
+        },
+                // 柱状图
+        barData: [
+          {
+            date: '周一',
+            new: 5,
+            active: 200
+          },
+          {
+            date: '周二',
+            new: 10,
+            active: 500
+          },
+          {
+            date: '周三',
+            new: 12,
+            active: 550
+          },
+          {
+            date: '周四',
+            new: 60,
+            active: 800
+          },
+          {
+            date: '周五',
+            new: 65,
+            active: 550
+          },
+          {
+            date: '周六',
+            new: 53,
+            active: 770
+          },
+          {
+            date: '周日',
+            new: 33,
+            active: 170
+          }
+        ],
+
+        
+        
+
+
+      }},
+    
+    mounted(){
+               // 饼状图
+              const echarts1 = echarts.init(this.$refs.echarts_1)
+              const echarts2 = echarts.init(this.$refs.echarts_2)
+              http.get('/risk_model/get_data/').then(response=>{
+                for (let key in response.data['行业分布']){
+                  this.pieDataIndus.push({name:key,value:response.data['行业分布'][key]})
+                }
+                for (let key in response.data['风险分布']){
+                  this.pieDataType.push({name:key,value:response.data['风险分布'][key]})
+                }
+                this.totalType=response.data['风险类型']
+                this.totalRisk=response.data['个体总数']
+                const option_1 = {
+                  // 右上角存图
+                  toolbox: {
+                    feature: {
+                      saveAsImage: {}
+                    }
+                  },
+                  tooltip: {
+                    trigger: "item",
+                  },
+                  title: {
+                    text: '风险行业分布',
+
+                    x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    y:'bottom',
+
+                    textStyle: {//主标题文本样式
+                      fontSize: 13,
+                      color:'#696969',
+                    },
+                    padding:[ 35,0,5,0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+                  },
+
+                  series: [
+                    {
+                      data: this.pieDataIndus,
+                      type: 'pie',
+                      avoidLabelOverlap: true,   //是否启用防止标签重叠策略
+                      minAngle: 5,               //最小的扇区角度（0 ~ 360），用于防止某个值过小导致扇区太小影响交互
+
+                    }
+                  ],
+
+                }
+
+                const option_2 = {
+                  // 右上角存图
+                  toolbox: {
+                    feature: {
+                      saveAsImage: {}
+                    }
+                  },
+                  tooltip: {
+                    trigger: "item",
+                  },
+                  title: {
+                    text: '风险类型分布',
+                    x:'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    textStyle: {//主标题文本样式
+                      fontSize: 13,
+                      color:'#696969',
+                    },
+                    padding:[ 5,0,20,0],//[5,10] | [ 5,6, 7, 8] ,标题内边距
+                  },
+
+                  series: [
+                    {
+                      data: this.pieDataType,
+                      type: 'pie',
+                    }
+                  ],
+                }
+                this.$nextTick(()=>{
+                  echarts1.setOption(option_1)
+                  echarts2.setOption(option_2)
+                })
+              })
+
+  },
+    methods:{
+      // width(){
+      //   return '60px'
+      // },
+    // 影响力排名
+      onSubmit1(){
+        console.log("影响力排名")
+        console.log(this.formInline1.start_date)
+        // console.log(this.formInline1)
+        //时间格式不一样，所以要分参数quarter_date
+        if (this.formInline1.timeType!=='quarter') {
+          http.get(
+              "/rank/network/",
+              {
+                params: {
+                  market: this.formInline1.market,
+                  com_type: this.formInline1.industry,
+                  time: this.formInline1.pre_date,
+                  time_type: this.formInline1.timeType
+                },
+                //   防止带中括号
+                paramsSerializer: params => {
+                  return qs.stringify(params, {indices: false})
+                }
+              }).then(response => {
+            if (response.data.length === 0)
+              alert('没有结果')
+            else {
+              let dat = response.data
+              this.tableData = dat
+              this.barData = dat
+
+              console.log(this.tableData)
+              this.result = response.data
+              // 柱状图
+              const echarts3 = echarts.init(this.$refs.echarts_3)
+              const option_3 = {
+                // 右上角存图
+                toolbox: {
+                  feature: {
+                    saveAsImage: {}
+                  }
+                },
+                legend: {
+                  // 图例文字颜色
+                  textStyle: {
+                    color: "#333",
+                  },
+                },
+                grid: {
+                  left: "20%",
+                },
+                // 提示框
+                tooltip: {
+                  trigger: "axis",
+                  axisPointer: {
+                    type: 'shadow'
+                  }
+                },
+                xAxis: {
+                  type: "category", // 类目轴
+                  // xData太多显示不出来
+                  data: []
+                },
+                yAxis: [
+                  {
+                    type: "value",
+                  }
+                ],
+                title: {
+                  text: '中心性分析',
+                  x: 'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                  y: "bottom",
+                  textStyle: {//主标题文本样式
+                    fontSize: 13,
+                  },
+                  padding: [5, 0, 10, 0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+                },
+                series: [
+                  {
+                    name: '介接近中心性',
+                    data: this.barData.map(item => item.CC),
+                    type: 'bar'
+                  },
+                  {
+                    name: '介数中心性',
+                    data: this.barData.map(item => item.BC),
+                    type: 'bar'
+                  },
+                  {
+                    name: '加权PageRank',
+                    data: this.barData.map(item => item['weighted-PR']),
+                    type: 'bar'
+                  },
+                  {
+                    name: '度中心性',
+                    data: this.barData.map(item => item.DC),
+                    type: 'bar'
+                  },
+
+                ],
+              }
+              echarts3.setOption(option_3)
+            }
+          })
+        }
+        else {
+          {
+            http.get(
+                "/rank/network/",
+                {
+                  params: {
+                    market: this.formInline1.market,
+                    com_type: this.formInline1.industry,
+                    time: this.formInline1.quarter_date,
+                    time_type: this.formInline1.timeType
+                  },
+                  //   防止带中括号
+                  paramsSerializer: params => {
+                    return qs.stringify(params, {indices: false})
+                  }
+                }).then(response => {
+              if (response.data.length === 0)
+                alert('没有结果')
+              else {
+                let dat = response.data
+                this.tableData = dat
+                this.barData = dat
+
+                console.log(this.tableData)
+                this.result = response.data
+                // 柱状图
+                const echarts3 = echarts.init(this.$refs.echarts_3)
+                const option_3 = {
+                  // 右上角存图
+                  toolbox: {
+                    feature: {
+                      saveAsImage: {}
+                    }
+                  },
+                  legend: {
+                    // 图例文字颜色
+                    textStyle: {
+                      color: "#333",
+                    },
+                  },
+                  grid: {
+                    left: "20%",
+                  },
+                  // 提示框
+                  tooltip: {
+                    trigger: "axis",
+                    axisPointer: {
+                      type: 'shadow'
+                    }
+                  },
+                  xAxis: {
+                    type: "category", // 类目轴
+                    // xData太多显示不出来
+                    data: []
+                  },
+                  yAxis: [
+                    {
+                      type: "value",
+                    }
+                  ],
+                  title: {
+                    text: '中心性分析',
+                    x: 'center',//水平安放位置，默认为'left'，可选为：'center' | 'left' | 'right' | {number}（x坐标，单位px）
+                    y: "bottom",
+                    textStyle: {//主标题文本样式
+                      fontSize: 13,
+                    },
+                    padding: [5, 0, 10, 0],//[5,10] | [ 5,6, 7, 8] ,标题内边距[上，x，下，x]
+                  },
+                  series: [
+                    {
+                      name: '介接近中心性',
+                      data: this.barData.map(item => item.CC),
+                      type: 'bar'
+                    },
+                    {
+                      name: '介数中心性',
+                      data: this.barData.map(item => item.BC),
+                      type: 'bar'
+                    },
+                    {
+                      name: '加权PageRank',
+                      data: this.barData.map(item => item['weighted-PR']),
+                      type: 'bar'
+                    },
+                    {
+                      name: '度中心性',
+                      data: this.barData.map(item => item.DC),
+                      type: 'bar'
+                    },
+
+                  ],
+                }
+                echarts3.setOption(option_3)
+              }
+            })
+          }
+        }
+      },
+
+    // 关联主体、影响范围
+    onSubmit2(){
+      this.relatedRes.length=0
+      http.get('/rank/relate/',
+      {params:{
+            name:this.seleced,
+            type: this.typeRela,
+            market:this.formInline1.market,
+            industry: this.formInline1.industry,
+            start_date:this.formInline1.start_date,
+            end_date:this.formInline1.end_date,
+      }}).then(res=>{
+        console.log(res.data)
+        for (let i in res.data)
+        {this.relatedRes.push(res.data[i])
+          }
+        console.log(this.relatedRes)
+        this.showRelated=true
+      })
+    },
+    // 按行业、地域
+      onSubmit3(){
+      // this.relatedRes.length=0
+        http.get('/rank/spread/',
+            {params:{
+                name:this.seleced,
+                type: this.typeSpread,
+                market:this.formInline1.market,
+                industry: this.formInline1.industry,
+                start_date:this.formInline1.start_date,
+                end_date:this.formInline1.end_date,
+              }}).then(res=>{
+          console.log(res.data.data)
+
+        })
+      },
+      // 纵向对比表单提交
+      onSubmit4() {
+        if (this.formInline1.timeType !== 'quarter') {
+          http.get('/rank/history/',
+              {
+                params: {
+                  market: this.formInline1.market,
+                  com_type: this.formInline1.industry,
+                  time_type: this.formInline1.timeType,
+                  start: this.formInline1.start_pre,
+                  end: this.formInline1.end_pre,
+                },
+                paramsSerializer: params => {
+                  return qs.stringify(params, {indices: false})
+                }
+              }).then(res => {
+            if (res.data.length === 0)
+              alert('没有结果')
+            else {
+              // let tmp = res.data
+              // this.getSpanArr(tmp)
+              this.historyData=res.data.data
+              this.timeLis=res.data.time
+            }
+
+
+          })
+        } else {
+          http.get('/rank/history/',
+              {
+                params: {
+                  market: this.formInline1.market,
+                  com_type: this.formInline1.industry,
+                  time_type: this.formInline1.timeType,
+                  start: this.formInline1.start_quarter,
+                  end: this.formInline1.end_quarter,
+                },
+                paramsSerializer: params => {
+                  return qs.stringify(params, {indices: false})
+                }
+              }).then(res => {
+            if (res.data.length === 0)
+              alert('没有结果')
+            else {
+              // let tmp = res.data.data
+              // this.getSpanArr(tmp)
+              this.historyData=res.data.data
+              this.timeLis=res.data.time
+
+            }
+          })
+        }
+      },
+      getSpanArr(list) {
+        // 先给所有的数据都加一个v.rowspan = 1
+        list.forEach(item => {
+          item.rowspan = 1;
+          // item.rowspan1 = 1;
+          // 有几列想合并就设置几个
+
+        });
+        // 双层循环
+        for (let i = 0; i < list.length; i++) {
+          for (let j = i + 1; j < list.length; j++) {
+            //此处可根据相同字段进行合并
+            if (list[i].duration=== list[j].duration) {
+              list[i].rowspan++;
+              list[j].rowspan--;
+            }
+            // if (list[i].duration=== list[j].duration  && list[i].Total_score === list[j].Total_score ) {
+            //   list[i].rowspan1++;
+            //   // list[j].rowspan1--;
+            // }
+          }
+          console.log(list[i].rowspan)
+          // 这里跳过已经重复的数据
+          i = i + list[i].rowspan - 1;
+          // i = i + list[i].rowspan1 - 1;
+        }
+        this.historyData.length=0
+        this.historyData = list;
+        console.log(this.historyData)
+      },
+
+      // 复杂表格合并相同列
+      ObjectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        // 第一列
+        if (columnIndex === 0) {
+          return {
+            rowspan: row.rowspan,
+            colspan: 1,
+          };
+        }
+        // 第二列
+        // if (columnIndex === 1) {
+        //   return {
+        //     rowspan: row.rowspan1,
+        //     colspan: 1,
+        //   };
+        // }
+        // row.XXX的值跟上述函数对应
+
+      },
+
+    detail(row){
+      this.seleced=row.comp_name
+      this.datelis.length=0
+      this.asset.length=0
+      this.held_num.length=0
+      http.get('/rank/asset/',
+          {params:{
+              comp_name:this.seleced,
+            }}).then(res=>{
+            for (let i in res.data)
+            {
+              this.datelis.push(res.data[i]['duration'].slice(0,11))
+              this.asset.push(res.data[i]['asset'])
+              this.held_num.push(res.data[i]['held_num'])
+            }
+
+      })
+      this.detailData.length=0
+      for (let i in this.tableData)
+      {
+        if (this.tableData[i]['comp_name']===this.seleced)
+          this.detailData=Array(this.tableData[i])
+      }
+      // let tmp
+      // for (let i in this.result.index)
+      // {
+      //   console.log(this.result.index[i].n)
+      //   if (this.result.index[i].n===this.seleced)
+      //     tmp=this.result.index[i]
+      //  }
+      // console.log(this.result.rank)
+      // for (let i in this.result.rank)
+      //   if (this.result.rank[i].name===this.seleced)
+      //     tmp=Object.assign(this.result.rank[i],tmp)
+      //     // tmp=[...this.result.rank[i],tmp]
+      // this.detailData=Array(tmp)
+        console.log(this.detailData)
+      // console.log(row.name)//返回这一行所有的内容
+
+      this.detailsdialog = true//打开弹窗
+    },
+    initEcharts() {
+       // 详情页的线形图
+        // 详情图的柱状图、饼图
+        // 1、柱状图
+        var echarts4 = echarts.init(this.$refs.echarts_4);
+        var option_4={
+              title: {
+                text: "影响范围统计-行业",
+                left:"center",
+                textStyle:{
+                fontSize:17,
+                lineHeight:60
+                }
+              },
+              tooltip: {},
+              xAxis: {
+                data: ["银行", "保险", "运输"],
+                name:"行业",
+                nameTextStyle:{
+                  padding:[0,0,-40,-260],
+                  verticalAlign:'bottom'
+                }
+              },
+              yAxis: {
+                name:'影响行业的数量',
+                axisTick:{
+                  show:true,
+                },
+                axisLine:{
+                  show:true,
+                },
+                nameTextStyle:{
+                  position: 'left',
+                  nameLocation: 'middle', 
+                  nameGap: 60, 
+                  nameRotate: 90 
+                } 
+              },
+              series: [
+                {
+                name: "数量",
+                type: "bar",
+                data: [45, 20, 30],
+                barWidth:60,
+                itemStyle:{
+                  normal: {
+                    color: function (params) {
+                      let colorList = [
+                      'blue',
+                      'green',
+                      'red',
+                      ];
+                      let colorItem = colorList[params.dataIndex];
+                      return colorItem;
+                    },
+                    label:{          
+                      show:true,
+                      position:'top',          
+                    }
+                  }
+                }
+                },
+              ],
+                }
+        echarts4.setOption(option_4)
+          // 2、饼图
+
+        const  echarts5 = echarts.init(this.$refs.echarts_5);
+        const option_5 = {
+        title: {
+          text: "影响行业占比份额",
+          left: "center",
+          textStyle:{
+          fontSize:17,
+          lineHeight:85
+          }
+        },
+        tooltip: {
+          trigger: "item",
+        },
+        legend: {
+          orient: "vertical",
+          left: "30",
+          top:"40"
+        },
+        series: [
+          {
+          name: "占比份额",
+          type: "pie",
+          radius: "55%",
+          LabelOverlap: true,
+          data: [
+            { value: 45, name: "银行" },
+            { value: 20, name: "保险" },
+            { value: 30, name: "运输" },
+          ],
+          itemStyle:{
+            emphasis: {
+              shadowBlur: 10,
+              shadowOffsetX: 0,
+              shadowColor: "rgba(0, 0, 0, 0.5)",
+            },
+            borderWidth:2,
+            borderColor:'#fff'
+          }
+          },
+        ],
+
+
+            }
+
+        echarts5.setOption(option_5)
+    } ,
+
+
+      open(){
+              this.$nextTick(() => {
+              //  执行echarts方法
+                this.initEcharts()
+              })
+            },
+
+  }
+
+
+  };
+  </script>
+  
+  <style lang="less" scoped>
+/deep/ .el-checkbox__label {//弹窗单选框的表单样式
+    padding-right: 40px;
+    padding-left: 40px;
+}
+.grayish_btn{//浅灰色按钮
+  color: #fff;//文字颜色
+  background-color: #aaaaaa;//背景颜色
+}
+/deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+      border-bottom: 1px solid rgba(242, 242, 242, 0.654901960784314) !important;
+      padding: 0px 0 !important;
+      min-width: 0 !important;
+    }
+    .el-table .el-table__cell {
+      padding: 12px 0; 
+      min-width: 0;
+    }
+    /deep/ .active_header{//表头
+      color: #333333;
+      // font-size: 9px;
+      text-align: center !important;
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      // font-size: 10px;
+    }
+.text{
+      color:rgba(2, 167, 240, 0.729411764705882);
+    }
+.form{//2、产品搜索栏
+    
+    display:flex;
+    justify-content:space-between;//左右贴边
+    // margin-top:5px; 
+    // height: 40px;
+    padding-left: 10px;
+    margin-bottom: 0px;
+    padding-bottom: 0px;
+
+  }
+  
+  // 第一层
+  .one_twins_card{
+    margin-top:0px;
+    margin-bottom:3px;
+    display:flex;
+    justify-content:space-between;//左右贴边
+    .el-card {
+      width:49.5%;
+    } 
+    .el-col-2 {
+     width: 2%;
+
+}
+    // 数据
+    .num_card{
+    margin-top: 40px;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-bottom: 20px;
+
+
+    .desc{
+      text-align: center;//居中
+      font-weight: bold;//字体加粗
+      font-size: 17px;
+      color:'#696969';
+
+    }
+    .desc_value{
+      text-align: center;//居中
+      font-size: 18px;
+      color:#02A7F0;;
+    }
+
+
+
+
+    .el-divider--horizontal {
+    display: flex;
+    justify-content:center;
+    height: 1px;
+    width: 80%;
+    margin: 24px 70px 24px 30px;//上 右 下 左
+  }
+    .el-statistic {
+        font-size: 13px;
+        color:#02A7F0;;//没改成，之后再改
+      }
+  }
+    .twins_pie{
+        display:flex;
+        justify-content:space-between;
+        // padding:10px;
+        // margin-top: 30px;
+        // margin-left: 20px;
+        // margin-right: 20px;
+        // margin-bottom: 20px;
+
+    }
+  }
+
+  
+  //第二层
+.two{
+
+  // 表格中操作
+  .content{
+    display:flex;
+    justify-content:space-between;
+    .table{
+    padding: 20px 2px 2px 20px;//返回表格添加间隙 上 右
+
+
+    // 调整表头间隔、设置表头下方边框颜色
+    /deep/ .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+      border-bottom: 1px solid rgba(224, 223, 223, 0.771) !important;
+      padding: 0px 0; 
+      min-width: 0;
+    }
+    .el-table .el-table__cell {
+      padding: 12px 0; 
+      min-width: 0;
+    }
+    /deep/ .active_header{//表头
+      color: #333333;
+      font-size: 13px;
+      text-align: center !important;
+      // height: 1px;
+    }
+    /deep/ .content_center{//表的内容
+      text-align: center !important;
+      font-size: 13px;
+    }
+  
+
+    }
+    .bar{
+      padding: 20px 40px 2px 2px;//返回表格添加间隙 上 右
+    }
+
+  }
+  
+  .flex-charts{//并列图
+    // margin-top:20px; 
+    display:flex;
+    justify-content:space-between;
+    // padding:20px;
+}
+}
+
+.grayish_btn{//浅灰色按钮
+    color: #fff;//文字颜色
+    background-color: #aaaaaa;//背景颜色
+    margin-bottom: 20px;
+  }
+  
+  
+
+ .sublabel{ // 小标签标识
+    // font-size: 13px;
+    // padding:2px;
+    margin-top:10px;
+    background-color: rgba(2, 167, 240, 0.5);
+    width: 5px; 
+    height: 35px;
+    
+  } 
+  .title{
+    padding-left: 4px;
+    margin-top:15px;
+    font-weight: bold;//字体加粗
+    display:flex;
+    justify-content:flex-start
+}
+  
+   
+   
+  
+  
+  
+  </style>
+  
+  
+  
\ No newline at end of file