111

src/assets/css/reset.css

@@ -85,3 +85,137 @@
     text-align: center;
 }
 .queryul li span>em{display: inline-block; min-width: 80px; text-align: right; font-style: normal; margin:0 15px 0 0;}
+
+/* dialog */
+.el-dialog{
+    background:rgba(248,250,251,1);
+    border-radius:20px;
+}
+.el-dialog__headerbtn .el-dialog__close{
+    color:#111111;
+}
+.el-dialog__title{
+    font-size: 12px;
+}
+/* form MyEditForm */
+.MyEditForm .el-form-item{
+    display: inline-block;
+    margin-right:30px;
+    background: #fff;
+    padding:5px 0;
+    box-sizing: border-box;
+    border-radius:10px;
+    width: 235px;
+    box-shadow:0px 6px 14px 0px rgba(176,176,176,0.1);
+    position: relative;
+    min-height: 56px;
+}
+.MyEditForm .el-form-item .label{
+    font-size: 10px;
+    color:#888888;
+    padding-left: 15px;
+}
+.MyEditForm .el-form-item .el-form-item__content{
+    line-height: initial;
+}
+.MyEditForm .el-form-item .el-input__inner{
+    border: none;
+    outline: none;
+    width: 220px;
+}
+.MyEditForm .el-form-item .el-form-item__error{
+    top: 113%;
+}
+.vue-treeselect:not(.vue-treeselect--disabled):not(.vue-treeselect--focused) .vue-treeselect__control:hover{
+    border: none;
+}
+.vue-treeselect__control{
+    border: none;
+    height: 28px;
+
+}
+.vue-treeselect__menu{
+    border:none;
+}
+.MyEditForm .btnformItem{
+    display: block!important;
+    text-align: center;
+    font-size: 12px;
+    margin-top: 20px;
+}
+.MyEditForm .btnformItem span{
+    display: inline-block;
+    width:120px;
+    height:44px;
+    line-height:44px;
+    border-radius:22px;
+
+}
+.MyEditForm .btnformItem .submitBtn{
+    background:rgba(0,210,214,1);
+    color: #fff;
+    margin-right: 20px;
+}
+.MyEditForm .btnformItem .exitBtn{
+    border: 1px solid rgba(0,210,214,1);
+    color:rgba(0,210,214,1);
+}
+.MyEditForm .is-required::after, .is-required::before{
+    position: absolute;
+    left: -10px;
+    top: 10px;
+    content: '*';
+    color: #F56C6C;
+    margin-right: 4px;
+}
+/* 上传图片 */
+.uploadDiv{
+    width:120px;
+    height:120px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 6px 14px 0px rgba(176,176,176,0.1);
+    border-radius:10px;
+    margin-top:6px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+}
+.uploadDiv .el-upload__text{
+    color:#A6C6C6;
+    font-size: 12px;
+}
+.uploadUl {
+    float: left;
+}
+.uploadUl li{
+    display: inline-block;
+    width:120px;
+    height:120px;
+    border-radius:10px;
+    margin-right: 30px;
+    overflow: hidden;
+    position: relative;
+}
+.uploadUl li img{
+    min-height: 100%;
+    border-radius:10px;
+}
+.uploadUl li .hoverDiv{
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    background: rgba(0,0,0,0.2);
+    z-index: 20;
+    text-align: center;
+    display: none;
+}
+.uploadUl li:hover .hoverDiv{
+    display: block;
+}
+
+.uploadUl li .hoverDiv img{
+    margin-top:50px;
+    width:32px!important;min-height:32px!important;
+    cursor: pointer;
+}
\ No newline at end of file

src/components/Materialman/Archivesmaterials.vue

@@ -64,7 +64,7 @@
         <el-dialog
             :title="dialogtitle"
             :visible.sync="dialogState"
-            width="680px">
+            width="680px" style="height:700px">
             <el-form class="Archivesform" :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
                 <el-form-item label="档案名称" prop="Name">
                     <el-input size="small" v-model="addMsg.Name"></el-input>

src/components/Systemman/AssetsClassification.vue

@@ -11,7 +11,10 @@
             <span class="TreeSpan" slot-scope="{ node, data }">
                 <span>{{ node.label}}</span>
                 <span class="spanIcon">
-                    <el-button
+                    <img @click="Add(data)" style="width:12px;height:12px;margin-left:15px" src="../../assets/img/add.png" alt="">
+                    <img @click="Edit(data)" style="width:12px;height:12px;margin:0 15px" src="../../assets/img/treeedit.png" alt="">
+                    <img @click="DeleteNode(data)" style="width:12px;height:12px" src="../../assets/img/treedelete.png" alt="">
+                    <!-- <el-button
                         type="text"
                         size="mini"
                         @click="() => Add(data)">
@@ -28,7 +31,7 @@
                         size="mini"
                         @click="() => DeleteNode(node, data)">
                         删除
-                    </el-button>
+                    </el-button> -->
                 </span>
             </span>
             </el-tree>
@@ -212,7 +215,7 @@ export default {
         this.getflList(data.Tier)
     },
     DeleteNode(node,data){
-        this.Delete(data);
+        this.Delete(node);
     },
     Delete(data) {
         let Id=data.Id;
@@ -334,10 +337,16 @@ export default {
 }
 </script>
 
-<style scoped>
+<style>
 .Assetscation .TreeDiv .spanIcon {
     display: none;
   }
+ .Assetscation .el-tree{
+     color:#111111;
+ }
+.Assetscation .TreeDiv .el-tree-node__content:hover{
+    background: #fff;
+}
 .Assetscation .TreeDiv .el-tree-node__content:hover .spanIcon {
     display: inline-block!important;
   }
@@ -360,11 +369,17 @@ export default {
 .Assetscation{
     padding-top:30px;
     position: relative;
+    
 }
 .Assetscation .TreeDiv{
-    width: 250px;
+    width: 220px;
     position: absolute;
     left: 30px;
     z-index: 10;
+    background: #fff;
+    height:100%;
+    padding: 20px 10px;
+    box-sizing: border-box;
+    font-size:12px;
 }
 </style>

src/components/global/index.vue

@@ -60,6 +60,7 @@ export default {
   padding-top: 70px;
   position: relative;
   box-sizing: border-box;
+  background: #F8FAFB;
 }
 .nav{
   position: fixed;
@@ -67,13 +68,13 @@ export default {
   top:0;
   left: 0;
   height: 100%;
-  z-index: 9999;
+  z-index: 100;
 }
 .appContent .HeadDiv{
   position: absolute;
   width: calc(100% - 214px);
   top: 0;
-  
+  z-index: 200;
 }
 .appContent{
   width: 100%;

src/plugins/index.js

 import md5 from 'js-md5'
-
+import co from 'co'
 export default {
     data: {
         loginUser: {},
@@ -31,7 +31,7 @@ export default {
                 
                     javaUrl: "http://192.168.2.16:8087",
                     ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130',
-                    UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8130",
+                    UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120",
                     // UploadUrl: "http://uploadfile.oytour.com",
                     LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
                 };
@@ -284,6 +284,16 @@ export default {
             });
             }
         }
+        Vue.prototype.random_string = function (len) {
+            len = len || 32;
+            var chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';
+            var maxPos = chars.length;
+            var pwd = '';
+            for (let i = 0; i < len; i++) {
+              pwd += chars.charAt(Math.floor(Math.random() * maxPos));
+            }
+            return pwd;
+        },
             //验证只能输入2位小数
             Vue.prototype.checkPrice = function (item, filed) {
                 var value = "";