Merge branch 'master-yjp' into 'master'

比对分析



See merge request !66

+<title>对比分析配置</title>
+<iframe src="/vue3/index.html#/analysis" class="layadmin-iframe"  style="height: 99.5%!important;"/>

@@ -54,4 +54,42 @@
 }
 }
 .bottom-condition .el-input__inner,.bottom-condition .el-button{
 .bottom-condition .el-input__inner,.bottom-condition .el-button{
     border-color:#409eff;
     border-color:#409eff;
+}
+.analysis {
+    position: relative;
+    text-align: center;
+    height:100%;
+    width: 100%;
+    /*max-width: 490px;*/
+}
+.analysis .drop {
+    padding-top: 20px;
+    border: 2px dashed #0a93be;
+    width: 600px;
+    height: 170px;
+    line-height: 160px;
+    margin: 0 auto;
+    font-size: 16px;
+    border-radius: 5px;
+    text-align: center;
+    color: #bbb;
+    position: relative;
+}
+
+.analysis .el-upload__text {
+    height: 50px;
+    line-height: 50px;
+    em {
+    color: #0C4493;
+    font-style: normal;
+    }
+}
+.analysis .link-type,
+.analysis .link-type:focus {
+    color: #337ab7;
+    cursor: pointer;
+}
+
+
+
 }
 }

@@ -110,7 +110,13 @@ const routes = [{
 		name: 'analysis',
 		name: 'analysis',
 		// component: () => myImport('views/analysis/components/addIndex/index')
 		// component: () => myImport('views/analysis/components/addIndex/index')
 		component: () => myImport('views/analysis/index')
 		component: () => myImport('views/analysis/index')
-	}
+	},
+    {
+        path: '/analysis/add',
+        name: 'analysisAdd',
+        // component: () => myImport('views/analysis/components/addIndex/index')
+        component: () => myImport('views/analysis/components/add/index')
+    }
 ];
 ];
 
 
 // hash模式： createWebHashHistory
 // hash模式： createWebHashHistory

@@ -12,11 +12,7 @@
                         </el-button>
                         </el-button>
                         <template #dropdown>
                         <template #dropdown>
                             <el-dropdown-menu>
                             <el-dropdown-menu>
-                                <el-dropdown-item>Action 1</el-dropdown-item>
-                                <el-dropdown-item>Action 2</el-dropdown-item>
-                                <el-dropdown-item>Action 3</el-dropdown-item>
-                                <el-dropdown-item>Action 4</el-dropdown-item>
-                                <el-dropdown-item>Action 5</el-dropdown-item>
+                                <el-date-picker v-model="displayTime" type="datetime" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间" />
                             </el-dropdown-menu>
                             </el-dropdown-menu>
                         </template>
                         </template>
                     </el-dropdown>
                     </el-dropdown>

@@ -29,6 +29,17 @@ export default {
 
 
         }
         }
     },
     },
+    computed: {
+        displayTime: {
+
+            get() {
+                return (+new Date(this.display_time))
+            },
+            set(val) {
+                this.display_time = new Date(val)
+            }
+        }
+    },
     setup(){
     setup(){
 
 
     }
     }

-<div class="container" :style="{'height':height+'px','max-height':height+'px'}">
-    <div style="margin:0 0 5px 20px;font-size: 16px;color:#337ab7">
+<div class="analysis-add-container">
+    <div class="add-top-title" style=" padding: 20px 20px 20px 20px;font-size: 16px;color:#337ab7">
         比对分析场景
         比对分析场景
     </div>
     </div>
-    <div class="drop">
-        <template slot-scope="scope">
-            <router-link :to="'/example/edit/'" class="link-type">
-                <img src="../../assets/images/analysis/icon-add.png"></img>
+    <div class="analysis drop">
+        <router-link :to="'/analysis/add'" class="analysis link-type">
+            <div  class="analysis-index-container" style="display: grid;">
+                <img src="/vue3/src/assets/images/analysis/icon-add.png"></img>
                 <div class="el-upload__text">
                 <div class="el-upload__text">
                     <em>点击添加对比分析</em>
                     <em>点击添加对比分析</em>
                 </div>
                 </div>
-            </router-link>
-        </template>
-    </div>
-</div>
-<style type="text/css">
-    img {
-        padding-top: 30px;
-    }
-
-    .drop {
-        border: 2px dashed #0a93be;
-        width: 600px;
-        height: 160px;
-        line-height: 160px;
-        margin: 0 auto;
-        font-size: 16px;
-        border-radius: 5px;
-        text-align: center;
-        color: #bbb;
-        position: relative;
-    }
+            </div>
+        </router-link>
 
 
-    .el-upload__text {
-        height: 50px;
-        line-height: 50px;
-        em {
-            color: #0C4493;
-            font-style: normal;
-        }
-    }
-    .link-type,
-    .link-type:focus {
-        color: #337ab7;
-        cursor: pointer;
-    }
-</style>
+    </div>
+</div>