Merge branch 'dev' of http://www.lockingos.org:3000/yiyun-fe/yiyunjianzhu-vue into dev

public/static/img/success.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="27px" height="20px" viewBox="0 0 27 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>符号</title>
+    <g id="UI关系整理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="弹窗/提醒/通用备份-32" transform="translate(-23.000000, -26.000000)" fill="#4AE2A6" fill-rule="nonzero">
+            <g id="符号/提醒符号" transform="translate(20.000000, 20.000000)">
+                <path d="M28.7243304,6.6102222 C28.2658482,6.15464185 27.5694196,6.20107042 27.0703125,6.6102222 C23.1935268,9.7789722 11.3629464,18.7774097 11.3629464,18.7774097 C11.3629464,18.7774097 6.57790179,16.7142401 5.0921875,16.0468293 C4.503125,15.7827668 3.89375,15.5883472 3.43816964,16.0468293 C2.98258929,16.5024097 2.98258929,17.2452668 3.43816964,17.7008472 C3.43816964,17.7008472 10.4837054,24.7812043 10.515625,24.8160258 C10.7477679,25.0481686 11.0553571,25.1613383 11.3629464,25.1555347 C11.6676339,25.1613383 11.9752232,25.0510704 12.2102679,24.8160258 C12.2450893,24.7812043 24.5950893,12.4021865 28.7243304,8.26714185 C29.1799107,7.8086597 29.1828125,7.06870435 28.7243304,6.6102222" id="符号"></path>
+            </g>
+        </g>
+    </g>
+</svg>

public/static/img/删除.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>符号/小符号/删除-强调备份</title>
+    <g id="符号/小符号/删除-强调备份" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <circle id="椭圆形" fill="#999B9D" fill-rule="nonzero" cx="10" cy="10" r="10"></circle>
+        <path d="M12.969099,6 L13.7434433,6.77434433 L10.646,9.872 L13.7434433,12.969099 L12.969099,13.7434433 L9.872,10.646 L6.77434433,13.7434433 L6,12.969099 L9.098,9.872 L6,6.77434433 L6.77434433,6 L9.872,9.098 L12.969099,6 Z" id="形状结合" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>

src/components/notification/index.js

@@ -1,24 +1,25 @@
+import { options } from 'less';
 import vue from 'vue'
 import Notification from './notification.vue'
 
 //创建vue组件实例
-const notify = vue.extend(Notification);
+const NotificationConstructor = vue.extend(Notification);
 
 //添加通知节点
 
 let notifyWrap = document.createElement('div');
-notifyWrap.style = "position: fixed; right: 0px; top: 48px; transition-duration: .5s;"
+notifyWrap.style = "position: fixed; right: 0px; top: 48px;z-index:999"
 document.body.appendChild(notifyWrap);
 
-let myMsg = {
-    notify:({
-        type,
-        message,
-        duration,
-        offset,
-        title,
+const notify =(options) =>{
+    const instance = new NotificationConstructor({
+        propsData:options
+    })
+    instance.vm = instance.$mount()
+    notifyWrap.appendChild(instance.vm.$el);
+    //return instance.vm;
+}
 
-    })=>{
 
-    }
-}
+   
+export default notify

src/components/notification/notification.vue

@@ -1,16 +1,19 @@
 <template>
     <transition name="fade">
         <div class="notification_box" v-if="show">
-            <div class="notification_img">
+            <div class="notification_img" v-if="Array.isArray(type)">
                 <img :src="typeList[type[0]].imgSrc" alt="" :class="type[1]? 'leftIcon':`${typeList[type[0]].class}`">
                 <img :src="typeList[type[1]].imgSrc" alt="" class="righticon" v-if="type[1]" >
             </div>
+            <div class="notification_img" v-else>
+                <img :src="typeList[type].imgSrc" alt="" :class="typeList[type].class">
+            </div>
             <div class="notification_msg">
                 <div class="notification_msg_content">
-                    <div class="notification_title" :class="{hidden:!title}">新的协作文件</div>
-                    <div class="notification_context" :class="{middle:!title}">错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因错误原因</div>
+                    <div class="notification_title" :class="{hidden:!title}">{{title}}</div>
+                    <div class="notification_context" :class="{middle:!title , }">{{message}}</div>
                 </div>
-                <p href="" @click="handleClose" class="closeBtn">x</p>
+                <p href="" @click="handleClose" class="closeBtn"><img src="/static/img/删除.svg" alt=""></p>
             </div> 
         </div>
     </transition>
@@ -22,9 +25,9 @@
 const cfg = (v, t) => ({ imgSrc:'/static/img/'+ v, class: t })
 
 var typeList={
-    'success':cfg('success', 'notifyIcon'),
-    'error':cfg('警示.svg','notifyIcon'),
-    'warning':cfg('警示.svg','notifyIcon'),
+    'success':cfg('success.svg', 'notifyIcon'),
+    'error':cfg('严重警示.svg','notifyIcon'),
+    'warning':cfg('事件警示.svg','notifyIcon'),
     'file-txt':cfg('file_txt.png','fileIcon'),
     'file-pdf':cfg('file_pdf.png','fileIcon'),
     'file-word':cfg('file_word.png','fileIcon'),
@@ -32,15 +35,23 @@ var typeList={
     'file-ppt':cfg('file_ppt.png','fileIcon'),
     'upload':cfg('upload.png','notifyIcon'),
     'download':cfg('download.svg','notifyIcon'),    
+    'cooperation':cfg('download.svg','notifyIcon'),
 }
 export default {
     name:"Notification",
     props:{
+        // type:{
+        //     type:Array,
+        //     default:function(){
+        //         return ['file-excel']
+        //     }
+        // },
         type:{
-            type:Array,
-            default:function(){
-                return ['file-excel']
-            }
+
+        },
+        inItem:{
+            type:Boolean,
+            defalt: false
         },
         offset:{
             type:Number,
@@ -54,22 +65,52 @@ export default {
         message:{
             type:String,
             default:'',
+        },
+        duration:{
+            type:Number,
+            default:3000,            
         }
     },
     data(){
         return{
-            show:true,
-            typeList
-
+            show:false,
+            typeList,
+            timer:'',
         }
     },
+    // watch: {
+    //   // 监听是否关闭
+    //   show(newVal) {
+    //     // 关闭
+    //     if (!newVal) {
+    //       //this.$el.addEventListener('transitionend', this.destroyElement);
+    //       // this.destroyElement();
+    //     }
+    //   }
+    // },
     methods:{
-        
-    handleClose (e) {
-      e.preventDefault()
-      this.show=false;
+    //   destroyElement() {
+    //     // 移除transitionend事件
+    //     //this.$el.removeEventListener('transitionend', this.destroyElement);
+    //     this.$destroy(true);
+    //     this.$el.parentNode.removeChild(this.$el);
+    //   },            
+    handleClose () {
+      //this.closed = true;
+      this.show=false;      
     }
 
+    },
+    created(){
+        this.timer = setTimeout(()=>{
+            this.show = false;
+        },this.duration)
+    },
+    mounted(){
+        this.show = true;
+    },
+    beforeDestroy() {
+      clearTimeout(this.timer);
     }
 }
 </script>
@@ -139,12 +180,15 @@ export default {
     cursor: pointer;
 
 }
-
-.fade-enter-active, .fade-leave-active{
-  transition: opacity .5s  
+.fade-enter-active,.fade-leave-active {
+  transition: all .3s ease;
 }
+// .fade-enter-active, .fade-leave-active{
+//   transition: opacity .5s  
+// }
 .fade-enter, .fade-leave-to{
-  opacity: 0  
+  transform: translateX(10px);
+  opacity: 0;
 }
 .notifyIcon{
     width: 32px;

src/main.js

@@ -25,6 +25,8 @@ import "@/../public/static/css/main.css"
 // 引入lazyload
 // import 'babel-polyfill'
 import axios, { fetchApi } from './utils/request';
+// import notify
+import notify from '@/components/notification/index'
 
 Vue.use(ElementUI);
 Vue.use(VueLazyload);
@@ -42,6 +44,8 @@ Vue.filter('resolveAvator', resolveAvator);
 
 // 事件总线
 Vue.prototype.$bus = new Vue();
+//弹窗 api
+Vue.prototype.$notify = notify;
 //右键菜单
 Vue.use(VueContextMenu)
 Vue.config.productionTip = false

src/services/system.js

@@ -102,7 +102,12 @@ const system = {
       });
       socket.on('message', (e) => {
         if(e.data === '-1') {
-          notify.error('文件下载失败，请检查网络。');
+          //notify.error('文件下载失败，请检查网络。');
+          this.$notify({
+            message:`${fileName},网络请求失败。`,
+            type:['warning','download'],
+            title:"文件下载失败"
+          })
           onErrorHandler(e);
           return;
         }
@@ -320,11 +325,12 @@ const system = {
           // console.log('tempNumCount', tempNumWrap.tempNumCount);
           // console.log('totalReadyUploadNum', totalReadyUploadNum);
           if(tempNumWrap.tempNumCount == totalReadyUploadNum) {
-            notify.success('文件已上传。')
+            Vue.prototype.$notify({
+              type:["success","upload"],
+              title:"文件上传成功",
+              message:`${uploadFile.ArchName}`
+            })
           }
-         
-          
-          
           resolveSuccess(uploadFile);
         } catch (e) {
           console.error('socket-upload-file parse data have error:', e);

src/utils/request.js

@@ -79,7 +79,19 @@ export async function fetchApi(path, params, config) {
 
 export function wrapErrorHint(response) {
   if (response.Code !== 0) {
-    notify.error(response.Msg);
+    // notify.error(response.Msg);
+    var title = (response.Code).toString();
+    var type ="error";
+    if(response.Code === 404){
+      type = "warning";
+    }
+    this.$notify({
+      message:response.Msg,
+      title:title + '错误',
+      type: type
+    })
+
+
   }
   return response;
 }

src/utils/tool.js

@@ -19,24 +19,20 @@ export const sleep = t => new Promise(r => setTimeout(r, t));
 export const notify = {
   success: (message) => {
     Vue.prototype.$notify({
-      title:'',
       message,
-      type: 'success',
-      offset: 100,
+      type: ['success'],
       duration: 2500,
     });
   },
   error: (message) => {
     Vue.prototype.$notify({
       message,
-      type: 'error',
-      offset: 100,
+      type: ['error'],
       duration: 2500,
     });
   },
   info: (message) => {
     Vue.prototype.$notify({
-      title:'',
       message,
       type: 'info',
       offset: 100,
@@ -45,10 +41,8 @@ export const notify = {
   },
   warning: (message) => {
     Vue.prototype.$notify({
-      title:'',
       message,
-      type: 'warning',
-      offset: 100,
+      type: ['warning'],
       duration: 2500,
     });
   }

src/views/components_web/newProj/newProj.vue

@@ -801,7 +801,7 @@
           confirmButtonText: "放弃",
           cancelButtonText: "取消",
           showClose:false,
-          type: "warning",
+          type: "error",
           beforeClose: function(action, instance, done) {
             if (action == 'confirm') {
               thisApp.isDisableCreate = false
@@ -1446,9 +1446,7 @@
           if(res.Code === 0) {
               thisApp.$notify({
                 message:  "新项目创建成功。",
-                type: "success",
-                offset: 100,
-                duration: 2500,
+                type: ["success"],
               });
               thisApp.reSetDialog();
               thisApp.isDisableCreate = false;

src/views/components_web/projDetail/projDetail.vue

@@ -1009,14 +1009,12 @@
       if(res.Code === 0) {
          thisApp.$notify({
               message: '工作指派完成。',
-              type: "success",
-              offset: 100,
-              duration: 2500
+              type: ["success"],
             });
       } else {
-         thisApp.$notify.error({
+         thisApp.$notify({
               message: '服务器异常,工作指派失败。',
-              offset: 100,
+              type: ["error"],
               duration: 5000
             });
       }

src/views/components_web/projSetting/projSetting.vue

@@ -728,19 +728,16 @@ import { wrapOssProtocol} from "@/services/oss";
         if (res.Code === 0) {
           this.$notify({
             message: '项目概况已修改。',
-            type: "success",
-            offset: 30,
-            duration: 2500
+            type: ["success"],
           });
           // setTimeout(()=> {
           //   thisApp.$emit("editSuccess");
           // },2000)
         } else {
           this.$notify({
-            message: '项目信息修改出现错误。',
-            type: "error",
-            offset: 30,
-            duration: 5000
+            title:"创建失败",
+            message: res.Data.message,
+            type: ["error"],
           });
         }
         this.isShowSaveAllBtn = false;

src/views/components_web/project/newProj.vue

@@ -161,7 +161,7 @@ export default {
             this.newProjData.projectData.projName == "") {
             this.$notify({           
                 message: "请输入项目名称。",
-                type: "warning",
+                type: ["warning"],
                 offset: 100,
                 duration: 2500
             });
@@ -171,7 +171,7 @@ export default {
             if (rg.test(this.newProjData.projectData.projName)) {
             this.$notify({    
                 message: "项目名称请不要包含'/' '\\'等字符。",
-                type: "warning",
+                type: ["warning"],
                 offset: 100,
                 duration: 2500
             });
@@ -302,13 +302,10 @@ export default {
         const res = await templateService.queryTemplateNodeByTemplateId(this.selectTemplate.Id);
         this.checkNewProjData.Node = res.Data;
         this.$fetchApi('project/createProject', this.checkNewProjData).then(res => {
-          console.log(res);
           if(res.Code === 0) {
               thisApp.$notify({
                 message:  "新项目创建成功。",
-                type: "success",
-                offset: 100,
-                duration: 2500,
+                type: ["success"],
               });
             
             sessionStorage.projId = res.Data;

src/views/components_web/share_setting/fileshare.vue

@@ -421,7 +421,6 @@
           .then(response => {
             if (response.data.state == 1) {
               thisApp.$notify.success({
-                title: "  ",
                 message: response.data.message,
                 type: "error",
                 offset: 100,
@@ -468,7 +467,6 @@
           .then(response => {
             if (response.data.state == 1) {
               thisApp.$notify.success({
-                title: "  ",
                 message: response.data.message,
                 type: "error",
                 offset: 100,
@@ -542,7 +540,6 @@
             .then(response => {
               if (response.data.state == 1) {
                 thisApp.$notify.success({
-                  title: "  ",
                   message: response.data.message,
                   type: "error",
                   offset: 100,
@@ -590,7 +587,6 @@
             .then(response => {
               if (response.data.state == 1) {
                 thisApp.$notify.success({
-                  title: "  ",
                   message: response.data.message,
                   type: "error",
                   offset: 100,
@@ -636,7 +632,6 @@
           .then(response => {
             if (response.data.state == 1) {
               thisApp.$notify.success({
-                title: "  ",
                 message: response.data.message,
                 type: "error",
                 offset: 100,

src/views/login/index.vue

@@ -323,9 +323,8 @@ export default {
     next: function () {
       if (!/^1[3456789]\d{9}$/.test(this.phoneNumber)) {
         this.$notify({
-           
           message: "请检查手机号是否填写正确。",
-          type: "warning",
+          type: ["warning"],
           offset: 100,
           duration: 2500,
         });
@@ -388,7 +387,7 @@ export default {
         this.$notify({
            
           message: "您输入的两次密码不一致",
-          type: "warning",
+          type:["warning"],
           offset: 100,
           duration: 2500,
         });
@@ -467,8 +466,12 @@ export default {
       const resData = await this.$store.login(this.account, this.pwd);
       const loginSuccess = resData.Code === 0;
       if (!loginSuccess) {
-        thisApp.errTips = true;
-        thisApp.tipmgs = resData.Msg;
+        //thisApp.errTips = true;
+        // thisApp.tipmgs = resData.Msg;
+        this.$notify({
+          message:"登录失败，用户名或密码错误！",
+          type:['warning'],
+        });
         return;
       }
 
@@ -520,11 +523,8 @@ export default {
       // });
 
       thisApp.$notify({
-        title: "  ",
         message: "链接成功。",
         type: "success",
-        offset: 100,
-        duration: 2500,
       });
     },
     /**

src/views/main_web/cloud.vue

@@ -536,7 +536,6 @@
               .then(response => {
                 if (response.data.state == 1) {
                   this.$notify({
-                    title: "  ",
                     message: "删除成功!",
                     type: "success",
                     offset: 100,
@@ -581,7 +580,6 @@
               .then(response => {
                 if (response.data.state == 1) {
                   this.$notify({
-                    title: "  ",
                     message: "删除成功!",
                     type: "success",
                     offset: 100,
@@ -632,7 +630,6 @@
             .then(response => {
               this.loadData(this.openFolderId);
               this.$notify({
-                title: "  ",
                 message: "文件上传成功！",
                 type: "success",
                 offset: 100,
@@ -720,7 +717,6 @@
                 thisApp.offDialog();
                 thisApp.loadData(this.openFolderId);
                 thisApp.$notify({
-                  title: "  ",
                   message: "文件夹创建成功！",
                   type: "success",
                   offset: 100,

src/views/main_web/cloudrecycle.vue

@@ -156,7 +156,6 @@
               .then(response => {
                 if (response.data.state == 1) {
                   thisApp.$notify({
-                    title: "  ",
                     message: "删除成功!",
                     type: "success",
                     offset: 100,
@@ -200,7 +199,6 @@
               .then(function (response) {
                 if (response.data.state == 1) {
                   thisApp.$notify({
-                    title: "  ",
                     message: response.data.message,
                     type: "success",
                     offset: 100,
@@ -246,7 +244,6 @@
               .then(response => {
                 if (response.data.state == 1) {
                   thisApp.$notify({
-                    title: "  ",
                     message: "清空成功!",
                     type: "success",
                     offset: 100,

src/views/main_web/recycle.vue

@@ -254,7 +254,6 @@ export default {
         .then(function (response) {
           if (response.data.state == 1) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 100,
@@ -292,7 +291,6 @@ export default {
             .then(function (response) {
               if (response.data.state == 1) {
                 thisApp.$notify({
-                  title: "  ",
                   message: response.data.message,
                   type: "success",
                   offset: 100,
@@ -342,7 +340,6 @@ export default {
             .then((response) => {
               if (response.data.state == 1) {
                 thisApp.$notify({
-                  title: "  ",
                   message: "清空成功!",
                   type: "success",
                   offset: 100,
@@ -458,7 +455,6 @@ export default {
             .then((response) => {
               if (response.data.state == 1) {
                 this.$notify({
-                  title: "  ",
                   message: response.data.message,
                   type: "success",
                   offset: 100,
@@ -512,7 +508,6 @@ export default {
             .then((response) => {
               if (response.data.state == 1) {
                 this.$notify({
-                  title: "  ",
                   message: response.data.message,
                   type: "success",
                   offset: 100,

src/views/main_web/workspace/workspace.new.vue

@@ -553,7 +553,13 @@ export default {
       sessionStorage.projName, sessionStorage.userId,
       this.onSocketFileChangeDetected.bind(this),
        (localWorkspacePrefix) => { this.localWorkspacePrefix = localWorkspacePrefix;},
-      errorEvent => { notify.error('本地网关通讯失败'); }
+      errorEvent => { 
+        this.$notify({
+          message:'本地网关通讯失败',
+          title:'502错误',
+          type:'error'
+        })
+       }
     );
     this.intervalTask();
 
@@ -727,7 +733,6 @@ export default {
           if(isFileInWorking) {
             // 提示 该文件夹下有他人正在工作中的文件 -> 删除失败
             thisApp.$notify({
-                title: "  ",
                 message: `“${deleteFolderName}”文件夹下存在“工作中”文件,删除失败。`,
                 type: "error",
                 offset: 100,
@@ -742,10 +747,8 @@ export default {
               counter = res.Code == 0 ? counter+1 : counter;
               if(counter == totalNum) {
                 thisApp.$notify({
-                  title: "  ",
                   message: `“${deleteFolderName}”文件夹已删除。`,
-                  type: "success",
-                  offset: 100,
+                  type: ["success"],
                   duration: 2500,
                 });
               }
@@ -1127,14 +1130,14 @@ export default {
      */
      async createSubFolder(){
       if (!this.folderGroupData.FolderName) {
-        notify.error('请输入文件夹名称！');
+        notify.warning('请输入文件夹名称！');
         return;
       }
       const folderName = this.folderGroupData.FolderName;
       const parentFolderPath = this.currentFolder.folderPath || '';
       const folderPath = parentFolderPath ? `${parentFolderPath}/${folderName}` : folderName;
       if(this.subFolderMap[folderPath]) {
-        notify.error('创建失败，已存在同名文件夹！');
+        notify.warning('创建失败，已存在同名文件夹！');
         return;
       }
       const newVirtualFolder = new VirtualFolder(folderPath, folderName, parentFolderPath);
@@ -1341,7 +1344,11 @@ export default {
           if(process !== 100) return;
           this.addLocalFileRecord(fileStoreKey, ipfsCid);
           this.removeFileLoadingState(file.id);
-          notify.success(`${fileName}，下载完成。`);
+          this.$notify({
+            type:["success","download"],
+            title:"文件已下载",
+            message:`${fileName}`
+          })
           socketIns.close();
           // this.$forceUpdate();
         } catch (e) {
@@ -1414,6 +1421,7 @@ export default {
      * 点击文件事件：直接打开文件
      */
     fileClick: async function (file) {
+
       //debugger;
       if(!this.isClient) return;
       const { archName, extension, id: fileId, nodeName } = file;
@@ -1422,10 +1430,16 @@ export default {
       const isCooperationFile = !!nodeName;
       // const fileStoreKey = `${folderName}${isCooperationFile ? '\\协作文件': ''}\\${archName}${extension ? `.${extension}` : ''}`;
       const fileStoreKey = getFileStoreKey(file, this.currentNodeFolder);
-      if(!this.localFileHashMap[fileStoreKey]) return;
+      if(!this.localFileHashMap[fileStoreKey]) return;                   
       const filePath = `${localWorkspacePrefix}\\${fileStoreKey}`;
+      
       if(!isCooperationFile && (file.workStatus === 2 && sessionStorage.userId !== file.modifyUserId)) {
-        this.$notify.warning(`${file.modifyName}正在编辑此文件，请在“工作中”标识消失后再尝试打开。`);
+       console.log("1111")
+       this.$notify({
+         type:["warning"],
+         title:"暂不能打开此文件",
+         message:`${file.modifyName}正在编辑此文件，请在“工作中”标识消失后再尝试打开。`
+       })
         return;
       }
       
@@ -1536,9 +1550,9 @@ export default {
       var thisApp = this;
         if (createUserId != sessionStorage.userId) {
           thisApp.$notify({
-            message: "不能删除他人文件。",
-            type: "info",
-            offset: 100,
+            message: "不能删除其他用户创建的文件。",
+            type: ["error"],
+            //offset: 100,
             duration: 2500,
           });
           return;
@@ -1552,10 +1566,8 @@ export default {
           const res = await services.deleteFile(fileId);
           if(res.Code === 0) {
             thisApp.$notify({
-                title: "  ",
                 message: `“${archName}”文件已移除。`,
-                type: "success",
-                offset: 100,
+                type: ["success"],
                 duration: 2500,
               });
               for(let key in thisApp.localFileHashMap) {

src/views/main_web/workspace/workspace.vue

@@ -3713,7 +3713,6 @@ export default {
         .then(function (response) {
           if (response.data.state == 1) {
             thisApp.$notify({
-              title: "  ",
               message: "操作成功",
               type: "success",
               offset: 100,
@@ -4711,7 +4710,12 @@ export default {
           const key = `${folderName}\\${extensionedFileName}`;
           this.fileDownloadStatusHash[key] = ipfsCid;
           this.refreshFileStatus();
-          notify.success(`${fileName}，下载完成。`);
+          //notify.success(`${fileName}，下载完成。`);
+          this.$notify({
+            type:["success","download"],
+            title:"文件已下载",
+            message:'${fileName}'
+          })
           // this.$forceUpdate();
         } catch (e) {
           console.error('socket-download-file parse data have error:', e);
@@ -4864,7 +4868,6 @@ export default {
             .then(function (response) {
               if (response.data.state == 1) {
                 thisApp.$notify({
-                  title: "  ",
                   message: "重命名成功",
                   type: "success",
                   offset: 100,
@@ -4928,7 +4931,6 @@ export default {
         })
           .then(function (response) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 100,
@@ -5066,7 +5068,7 @@ export default {
         .then((response) => {
           if (response.data.state === 1) {
             this.$notify({
-              title: "  ",
+              
               message: response.data.message,
               type: "success",
               offset: 30,
@@ -5124,7 +5126,7 @@ export default {
             if (response.data.state == 1) {
               thisApp.refreshPages();
               this.$notify({
-                title: "  ",
+
                 message: "地图应用创建成功！",
                 type: "success",
                 offset: 100,
@@ -5182,7 +5184,7 @@ export default {
             if (response.data.state == 1) {
               thisApp.refreshPages();
               this.$notify({
-                title: "  ",
+
                 message: "地图应用创建成功！",
                 type: "success",
                 offset: 100,
@@ -5274,7 +5276,7 @@ export default {
         .then((response) => {
           if (response.data.state == 1) {
             this.$notify({
-              title: "  ",
+
               message: "操作成功！",
               type: "success",
               offset: 100,
@@ -5321,7 +5323,7 @@ export default {
           .then((response) => {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
+
                 message: response.data.message,
                 type: "success",
                 offset: 100,
@@ -5358,7 +5360,7 @@ export default {
           .then((response) => {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
+
                 message: response.data.message,
                 type: "success",
                 offset: 100,
@@ -5460,7 +5462,7 @@ export default {
       if(Res.Code !=-1){
         this.refreshPages();
         this.$notify({
-          title: "  ",
+
           message: "成功保存历史文件",
           type: "success",
           offset: 100,
@@ -5643,7 +5645,6 @@ export default {
         .then((response) => {
           if (response.data.state == 1) {
             thisApp.$notify({
-              title: "  ",
               message: "复制文件成功",
               type: "success",
               offset: 100,
@@ -5747,7 +5748,6 @@ export default {
           .then((response) => {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
                 message: "操作成功",
                 type: "success",
                 offset: 100,
@@ -5835,7 +5835,6 @@ export default {
         .then((response) => {
           if (response.data.state === 1) {
             this.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 30,
@@ -5891,7 +5890,6 @@ export default {
       })
         .then(() => {
           this.$notify({
-            title: "  ",
             message: "删除成功!",
             type: "success",
             offset: 30,
@@ -6227,7 +6225,6 @@ export default {
             .then((response) => {
               if (response.data.state == 1) {
                 this.$notify({
-                  title: "  ",
                   message: "删除成功!",
                   type: "success",
                   offset: 100,
@@ -6422,7 +6419,6 @@ export default {
           if (response.data.state == 1) {
             thisApp.refreshPages();
             this.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 100,
@@ -6699,10 +6695,8 @@ export default {
       if (Res.Code != -1) {
         this.refreshPages();
         this.$notify({
-          title: "  ",
           message: "文件夹创建成功！",
-          type: "success",
-          offset: 100,
+          type: ["success"],
           duration: 2500,
         });
       }
@@ -6933,7 +6927,6 @@ export default {
             .then(function (response) {
               if (response.data.state == 1) {
                 thisApp.$notify({
-                  title: "  ",
                   message: "重命名成功",
                   type: "success",
                   offset: 100,
@@ -7025,7 +7018,6 @@ export default {
         .then((response) => {
           if (response.data.state == 1) {
             thisApp.$notify({
-              title: "  ",
               message: "操作成功",
               type: "success",
               offset: 100,
@@ -7092,7 +7084,6 @@ export default {
               thisApp.intoFoldergroup(thisApp.dbClickSelectedFolderGroupData);
             }
             thisApp.$notify({
-              title: "  ",
               message: "移至回收站成功！",
               type: "success",
               offset: 100,
@@ -7193,7 +7184,6 @@ export default {
           if (response.data.state == 1) {
             thisApp.refreshPages();
             thisApp.$notify({
-              title: "  ",
               message: "操作成功！",
               type: "success",
               offset: 100,

src/views/manage_company/app.vue

@@ -176,7 +176,6 @@
           .then(response => {
             if (response.data.state == 1) {
               this.$notify({
-                title: "  ",
                 message: text,
                 type: "success",
                 offset: 100,

src/views/manage_company/project.vue

@@ -698,7 +698,6 @@
             .then(function (response) {
               if (response.data.state == 1) {
                 thisApp.$notify({
-                  title: "  ",
                   type: "success",
                   message: response.data.message,
                   offset: 100,
@@ -764,7 +763,6 @@
             .then(function (response) {
               if (response.data.state == 1) {
                 thisApp.$notify({
-                  title: "  ",
                   type: "success",
                   message: response.data.message,
                   offset: 100,
@@ -849,7 +847,6 @@
           .then(function (response) {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
                 type: "success",
                 message: response.data.message,
                 offset: 100,
@@ -1215,7 +1212,6 @@
           }).then(response => {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
                 type: "success",
                 message: response.data.message,
                 offset: 100,
@@ -1278,7 +1274,6 @@
           }).then(response => {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
                 type: "success",
                 message: response.data.message,
                 offset: 100,
@@ -1343,7 +1338,6 @@
           }).then(response => {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
                 type: "success",
                 message: response.data.message,
                 offset: 100,

src/views/manage_company/setting.vue

@@ -1027,7 +1027,6 @@
         }).then(response => {
           if (response.data.state == 1) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 100,
@@ -1114,7 +1113,6 @@
         }).then(response => {
           if (response.data.state == 1) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 100,
@@ -1147,7 +1145,6 @@
           }).then(response => {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
                 message: response.data.message,
                 type: "success",
                 offset: 100,

src/views/manage_company/template.vue

@@ -197,7 +197,6 @@
           }).then(function (response) {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
                 type: "success",
                 message: response.data.message,
                 offset: 100,

src/views/manage_company/template_detail.vue

@@ -174,7 +174,6 @@
           }).then(function (response) {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
                 type: "success",
                 message: response.data.message,
                 offset: 100,
@@ -209,7 +208,6 @@
           }).then(function (response) {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
                 type: "success",
                 message: "移除模板成功",
                 offset: 100,

src/views/manage_company/template_market.vue

@@ -120,7 +120,6 @@
           .then(response => {
             if (response.data.state == 1) {
               this.$notify({
-                title: "  ",
                 message: "模板添加成功",
                 type: "success",
                 offset: 100,

src/views/manage_company/user/index.vue

@@ -1872,8 +1872,8 @@ export default {
         thisApp.addDeptDisable = false;
         this.$notify({
           message:`部门“${this.deptData.deptName}”已完成添加。`,
-          type: "success",
-          offset: 100,
+          type: ["success"],
+          // offset: 100,
           duration: 2500,
         });
         thisApp.listDepts();
@@ -1985,7 +1985,7 @@ export default {
       this.$confirm(`部门删除后将无法恢复，是否继续删除部门“${deptName}”？`, "", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "error",
       })
         .then(async () => {
           data.data.modifyUserId = sessionStorage.userId;
@@ -2004,10 +2004,8 @@ export default {
             return;
           }
           thisApp.$notify({
-            title: "  ",
             message:`部门“${deptName}”已删除。`,
-            type: "success",
-            offset: 100,
+            type: ["success"],
             duration: 2500,
           });
           thisApp.listDepts();
@@ -2084,10 +2082,8 @@ export default {
         return;
       }
       this.$notify({
-        title: "  ",
         message: "已完成指派。",
         type: "success",
-        offset: 100,
         duration: 2500,
       });
       this.isDistWorkDeptDialog = false;
@@ -2105,8 +2101,7 @@ export default {
       if (thisApp.multipleSelection.some((user) => user.default === 1)) {
         this.$notify({   
           message: "法人账号不能删除。",
-          type: "warning",
-          offset: 100,
+          type: ["erro"],
           duration: 2500,
         });
         return;
@@ -2141,10 +2136,8 @@ export default {
             return;
           }
           thisApp.$notify({
-            title: "  ",
             message: "所选用户删除完成。",
-            type: "success",
-            offset: 100,
+            type: ["success"],
             duration: 2500,
           });
           this.getUserList();
@@ -2178,10 +2171,8 @@ export default {
       }
       // thisApp.newUser = {};
       thisApp.$notify({
-        title: "  ",
-        message: `${this.newUser.cnName}添加成功`,
-        type: "success",
-        offset: 100,
+        message: `${this.newUser.cnName}添加成功。`,
+        type: ["success"],
         duration: 2500,
       });
       var node = this.$refs.tree.getCurrentNode();
@@ -2292,7 +2283,6 @@ export default {
           .then((response) => {
             if (response.status == 200 && response.data != null) {
               this.$notify({
-                title: "  ",
                 message: "导出成功",
                 type: "success",
                 offset: 100,
@@ -2449,7 +2439,6 @@ export default {
             .then((response) => {
               if (response.data.state == 1) {
                 thisApp.$notify({
-                  title: "  ",
                   message: `${this.currentUser.cnName}已${actionText}`,
                   type: "success",
                   offset: 100,
@@ -2488,7 +2477,7 @@ export default {
         {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning",
+          type: "error",
         }
       )
         .then(async () => {
@@ -2496,8 +2485,7 @@ export default {
             id: this.currentUser.id,
           });
           if (res.Code !== 0) {
-            thisApp.$notify.error({
-               
+            thisApp.$notify.error({               
               message: res.Msg,
               offset: 100,
               duration: 5000,
@@ -2506,10 +2494,8 @@ export default {
           }
           thisApp.currentPain = 1;
           thisApp.$notify({
-            title: "  ",
-            message: "删除成功",
-            type: "success",
-            offset: 100,
+            message: `“${this.currentUser.cnName}”的账户已删除。`,
+            type: ["success"],
             duration: 2500,
           });
           thisApp.listDepts();

src/views/manage_system/appcenter.vue

@@ -207,7 +207,6 @@
             if (response.data.state == 1) {
               this.loadListFiles();
               this.$notify({
-                title: "  ",
                 message: response.data.message,
                 type: "success",
                 offset: 100,
@@ -256,7 +255,6 @@
             if (response.data.state == 1) {
               this.loadListFiles();
               this.$notify({
-                title: "  ",
                 message: response.data.message,
                 type: "success",
                 offset: 100,

src/views/manage_system/appinfo.vue

@@ -280,7 +280,6 @@
           .then(response => {
             if (response.data.state == 1) {
               this.$notify({
-                title: "  ",
                 message: response.data.message,
                 type: "success",
                 offset: 100,
@@ -339,7 +338,6 @@
           .then(response => {
             if (response.data.state == 1) {
               this.$notify({
-                title: "  ",
                 message: text,
                 type: "success",
                 offset: 100,

src/views/manage_system/customer/index.vue

@@ -1175,10 +1175,9 @@ export default {
           return;
         }
         thisApp.$notify({
-          title: "  ",
           message: `企业“${this.currentCompany.companyName}”已完成修改。`,
-          type: "success",
-          offset: 100,
+          type: ["success"],
+          // offset: 100,
           duration: 2500,
         });
         thisApp.listCompany();
@@ -1196,116 +1195,116 @@ export default {
     /**
      * 验证企业信息表单数据
      */
-    checkCompanyData: function () {
-      if (
-        this.currentCompany.companyName == null ||
-        this.currentCompany.companyName == ""
-      ) {
-        this.$notify({
-          message: "请输入企业名称",
-          type: "warning",
-          offset: 100,
-          duration: 2500,
-        });
+    // checkCompanyData: function () {
+    //   if (
+    //     this.currentCompany.companyName == null ||
+    //     this.currentCompany.companyName == ""
+    //   ) {
+    //     this.$notify({
+    //       message: "请输入企业名称",
+    //       type: ["warning"],
+    //       offset: 100,
+    //       duration: 2500,
+    //     });
 
-        return false;
-      }
-      if (
-        this.currentCompany.compAllName == null ||
-        this.currentCompany.compAllName == ""
-      ) {
-        this.$notify({
-          message: "请输入企业全称",
-          type: "warning",
-          offset: 100,
-          duration: 2500,
-        });
+    //     return false;
+    //   }
+    //   if (
+    //     this.currentCompany.compAllName == null ||
+    //     this.currentCompany.compAllName == ""
+    //   ) {
+    //     this.$notify({
+    //       message: "请输入企业全称",
+    //       type: ["warning"],
+    //       offset: 100,
+    //       duration: 2500,
+    //     });
 
-        return false;
-      }
-      if (
-        this.currentCompany.cnName == null ||
-        this.currentCompany.cnName == ""
-      ) {
-        this.$notify({
-          message: "请输入法人姓名",
-          type: "warning",
-          offset: 100,
-          duration: 2500,
-        });
-        return false;
-      }
-      if (this.currentCompany.sex == null) {
-        this.$notify({
-          message: "请选择性别",
-          type: "warning",
-          offset: 100,
-          duration: 2500,
-        });
-        return false;
-      }
-      if (
-        this.currentCompany.phone == null ||
-        this.currentCompany.phone == ""
-      ) {
-        this.$notify({
-          message: "请输入负责人手机号",
-          type: "warning",
-          offset: 100,
-          duration: 2500,
-        });
-        return false;
-      }
-      if (
-        this.currentCompany.email == null ||
-        this.currentCompany.email == ""
-      ) {
-        this.$notify({
-          message: "请输入负责人邮箱",
-          type: "warning",
-          offset: 100,
-          duration: 2500,
-        });
-        return false;
-      }
-      if (
-        this.currentCompany.telphone == null ||
-        this.currentCompany.telphone == ""
-      ) {
-        this.$notify({
-          message: "请输入企业电话",
-          type: "warning",
-          offset: 100,
-          duration: 2500,
-        });
-        return false;
-      }
-      if (
-        this.currentCompany.proviceID == null ||
-        this.currentCompany.proviceID == ""
-      ) {
-        this.$notify({
-          message: "请选择所属省份",
-          type: "warning",
-          offset: 100,
-          duration: 2500,
-        });
-        return false;
-      }
-      if (
-        this.currentCompany.industryID == null ||
-        this.currentCompany.industryID == ""
-      ) {
-        this.$notify({
-          message: "请选择行业划分",
-          type: "warning",
-          offset: 100,
-          duration: 2500,
-        });
-        return false;
-      }
-      return true;
-    },
+    //     return false;
+    //   }
+    //   if (
+    //     this.currentCompany.cnName == null ||
+    //     this.currentCompany.cnName == ""
+    //   ) {
+    //     this.$notify({
+    //       message: "请输入法人姓名",
+    //       type: ["warning"],
+    //       offset: 100,
+    //       duration: 2500,
+    //     });
+    //     return false;
+    //   }
+    //   if (this.currentCompany.sex == null) {
+    //     this.$notify({
+    //       message: "请选择性别",
+    //       type: ["warning"],
+    //       offset: 100,
+    //       duration: 2500,
+    //     });
+    //     return false;
+    //   }
+    //   if (
+    //     this.currentCompany.phone == null ||
+    //     this.currentCompany.phone == ""
+    //   ) {
+    //     this.$notify({
+    //       message: "请输入负责人手机号",
+    //       type: ["warning"],
+    //       offset: 100,
+    //       duration: 2500,
+    //     });
+    //     return false;
+    //   }
+    //   if (
+    //     this.currentCompany.email == null ||
+    //     this.currentCompany.email == ""
+    //   ) {
+    //     this.$notify({
+    //       message: "请输入负责人邮箱",
+    //       type: ["warning"],
+    //       offset: 100,
+    //       duration: 2500,
+    //     });
+    //     return false;
+    //   }
+    //   if (
+    //     this.currentCompany.telphone == null ||
+    //     this.currentCompany.telphone == ""
+    //   ) {
+    //     this.$notify({
+    //       message: "请输入企业电话",
+    //       type: "warning",
+    //       offset: 100,
+    //       duration: 2500,
+    //     });
+    //     return false;
+    //   }
+    //   if (
+    //     this.currentCompany.proviceID == null ||
+    //     this.currentCompany.proviceID == ""
+    //   ) {
+    //     this.$notify({
+    //       message: "请选择所属省份",
+    //       type: "warning",
+    //       offset: 100,
+    //       duration: 2500,
+    //     });
+    //     return false;
+    //   }
+    //   if (
+    //     this.currentCompany.industryID == null ||
+    //     this.currentCompany.industryID == ""
+    //   ) {
+    //     this.$notify({
+    //       message: "请选择行业划分",
+    //       type: "warning",
+    //       offset: 100,
+    //       duration: 2500,
+    //     });
+    //     return false;
+    //   }
+    //   return true;
+    // },
     /**
      * 返回主界面
      */
@@ -1335,16 +1334,18 @@ export default {
     disableCompanyClick: function (state) {
       var thisApp = this;
       var actionText = "";
+      var type ="warning"
       if (state == 0) {
         actionText = "启用";
       } else {
         actionText = "禁用";
+        type="error"
       }
       this.$confirm(`${actionText}的企业将${actionText == "禁用" ? "无法" : "有权"}访问LOCKING， 确定${actionText}企业“${this.currentCompany.companyName}”吗？`,"",
         {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning",
+          type: type,
         }
       )
         .then(async () => {
@@ -1365,10 +1366,9 @@ export default {
             return;
           }
           thisApp.$notify({
-            title: "  ",
             message: `企业“${this.currentCompany.companyName}”已${actionText}。`,
-            type: "success",
-            offset: 100,
+            type: ["success"],
+            //offset: 100,
             duration: 2500,
           });
         })
@@ -1403,10 +1403,8 @@ export default {
           if (deleteSuccess) {
             thisApp.currentPain = 1;
             thisApp.$notify({
-              title: "  ",
               message: `企业“${this.currentCompany.companyName}”已删除。`,
-              type: "success",
-              offset: 100,
+              type: ["success"],
               duration: 2500,
             });
             thisApp.listCompany();
@@ -1516,8 +1514,8 @@ export default {
           }
           thisApp.$notify({
             message: `企业“${this.currentCompany.companyName}”已完成添加。`,
-            type: "success",
-            offset: 100,
+            type: ["success"],
+            // offset: 100,
             duration: 2500,
           });
           this.currentPain = 1;

src/views/manage_system/runmanage.vue

@@ -1396,7 +1396,6 @@
             )
           }).then(function (response) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 100,
@@ -1468,7 +1467,6 @@
               })
               .then(function (response) {
                 thisApp.$notify({
-                  title: "  ",
                   message: response.data.message,
                   type: "success",
                   offset: 100,
@@ -1501,7 +1499,6 @@
           })
           .then(function (response) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 100,
@@ -1538,7 +1535,6 @@
             })
             .then(function (response) {
               thisApp.$notify({
-                title: "  ",
                 message: response.data.message,
                 type: "success",
                 offset: 100,
@@ -1573,7 +1569,6 @@
               })
               .then(function (response) {
                 thisApp.$notify({
-                  title: "  ",
                   message: response.data.message,
                   type: "success",
                   offset: 100,
@@ -1630,7 +1625,6 @@
             })
             .then(function (response) {
               thisApp.$notify({
-                title: "  ",
                 message: response.data.message,
                 type: "success",
                 offset: 100,
@@ -1707,7 +1701,6 @@
             })
             .then(function (response) {
               thisApp.$notify({
-                title: "  ",
                 message: response.data.message,
                 type: "success",
                 offset: 100,
@@ -1744,7 +1737,6 @@
               })
               .then(function (response) {
                 thisApp.$notify({
-                  title: "  ",
                   message: response.data.message,
                   type: "success",
                   offset: 100,
@@ -1785,7 +1777,6 @@
               })
               .then(function (response) {
                 thisApp.$notify({
-                  title: "  ",
                   message: response.data.message,
                   type: "success",
                   offset: 100,
@@ -1878,7 +1869,6 @@
           })
           .then(function (response) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 100,
@@ -1917,7 +1907,6 @@
             })
             .then(function (response) {
               thisApp.$notify({
-                title: "  ",
                 message: response.data.message,
                 type: "success",
                 offset: 100,
@@ -1947,7 +1936,6 @@
           })
           .then(function (response) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 100,
@@ -1982,7 +1970,6 @@
               })
               .then(function (response) {
                 thisApp.$notify({
-                  title: "  ",
                   message: response.data.message,
                   type: "success",
                   offset: 100,
@@ -2021,7 +2008,6 @@
             })
             .then(function (response) {
               thisApp.$notify({
-                title: "  ",
                 message: response.data.message,
                 type: "success",
                 offset: 100,
@@ -2073,7 +2059,6 @@
           })
           .then(function (response) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 100,
@@ -2107,7 +2092,6 @@
           })
           .then(function (response) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 100,
@@ -2143,7 +2127,6 @@
           })
           .then(function (response) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
               type: "success",
               offset: 100,
@@ -2347,7 +2330,6 @@
         }).then(response => {
             if (response.data.state === 1) {
               this.$notify({
-                title: "  ",
                 message: response.data.message,
                 type: "success",
                 offset: 30,
@@ -2393,7 +2375,6 @@
         }).then(response => {
             if (response.data.state === 1) {
               this.$notify({
-                title: "  ",
                 message: response.data.message,
                 type: "success",
                 offset: 30,

src/views/manage_system/setting.vue

@@ -246,9 +246,8 @@
        */
       BtnDeleteUserManager: function () {
         if (this.listCurrSelectUserPerm.length == 0) {
-          this.$notify.info({
-             
-            message: "请选择人员后再进行移除操作",
+          this.$notify.warning({
+            message: "请选择人员后再进行移除操作。",
             offset: 100,
             duration: 2500
           });
@@ -267,9 +266,8 @@
           .then(response => {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
                 message: response.data.message,
-                type: "success",
+                type: ["success"],
                 offset: 100,
                 duration: 2500
               });
@@ -279,7 +277,7 @@
               thisApp.$notify({
                  
                 message: response.data.message,
-                type: "error",
+                type: ["error"],
                 offset: 100,
                 duration: 5000
               });
@@ -341,9 +339,8 @@
             .then(response => {
               if (response.data.state == 1) {
                 thisApp.$notify({
-                  title: "  ",
                   message: response.data.message,
-                  type: "success",
+                  type: ["success"],
                   offset: 100,
                   duration: 2500
                 });
@@ -352,7 +349,7 @@
                 thisApp.$notify({
                    
                   message: response.data.message,
-                  type: "error",
+                  type: ["error"],
                   offset: 100,
                   duration: 5000
                 });
@@ -412,18 +409,16 @@
               .then(response => {
                 if (response.data.state == 1) {
                   thisApp.$notify({
-                    title: "  ",
                     message: response.data.message,
-                    type: "success",
+                    type: ["success"],
                     offset: 100,
                     duration: 2500
                   });
                   thisApp.loadSettings();
                 } else {
                   thisApp.$notify({
-                     
                     message: response.data.message,
-                    type: "error",
+                    type: ["error"],
                     offset: 100,
                     duration: 5000
                   });

src/views/manage_system/template/index.vue

@@ -2090,9 +2090,8 @@ export default {
       })
         .then(function (response) {
           thisApp.$notify({
-            title: "  ",
             message: response.data.message,
-            type: "success",
+            type: ["success"],
             offset: 100,
             duration: 2500,
           });
@@ -2214,7 +2213,7 @@ export default {
           thisApp.$notify({
              
             message: "名称过长，最多可输入50个字",
-            type: "error",
+            type: ["warning"],
             offset: 100,
             duration: 2500,
           });
@@ -2235,10 +2234,8 @@ export default {
           .then(function (response) {
             if (response.data.state == 1) {
               thisApp.$notify({
-                title: "  ",
                 message: "文件夹创建成功",
-                type: "success",
-                offset: 100,
+                type: ["success"],
                 duration: 2500,
               });
               thisApp.getFolderData(thisApp.superID, thisApp.templateID);
@@ -2246,8 +2243,7 @@ export default {
               thisApp.$notify({
                  
                 message: response.data.message,
-                type: "error",
-                offset: 100,
+                type: ["error"],
                 duration: 2500,
               });
             }
@@ -2272,7 +2268,7 @@ export default {
         // todo 自定义自定去重
         // if(listProperty)
         if (!isEdit && (!data.Node || data.Node.length === 0)) {
-          notify.error("Xmind文件尚未上传。");
+          notify.warning("Xmind文件尚未上传。");
           return;
         }
         if (isEdit) {
@@ -2294,7 +2290,7 @@ export default {
           // notify.error(res.Msg || `${keyword}失败`);
           return;
         }
-        notify.success(`模板${keyword}完成。`);
+        notify.success(`模板“${keyword}”创建完成。`);
         if (!isEdit) {
           thisApp.isShowModelpanel = false;
           thisApp.isShowLookIndustryInfo = true;
@@ -2464,7 +2460,7 @@ export default {
             thisApp.$notify({
                
               message: "名称过长，最多可输入50个字",
-              type: "error",
+              type: ["warning"],
               offset: 100,
               duration: 2500,
             });
@@ -2480,9 +2476,8 @@ export default {
             .then(function (response) {
               if (response.data.state == 1) {
                 thisApp.$notify({
-                  title: "  ",
                   message: "重命名成功",
-                  type: "success",
+                  type: ["success"],
                   offset: 100,
                   duration: 2500,
                 });
@@ -2493,8 +2488,7 @@ export default {
             });
         })
         .catch(() => {
-          thisApp.$notify.info({
-             
+          thisApp.$notify.warning({
             message: "操作已取消",
             offset: 100,
             duration: 2500,
@@ -2534,9 +2528,8 @@ export default {
         })
           .then(function (response) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
-              type: "success",
+              type: ["success"],
               offset: 100,
               duration: 2500,
             });
@@ -2587,9 +2580,8 @@ export default {
             .then(function (response) {
               if (response.data.state == 1) {
                 thisApp.$notify({
-                  title: "  ",
                   message: titleName + "成功",
-                  type: "success",
+                  type: ["success"],
                   offset: 100,
                   duration: 2500,
                 });
@@ -2600,8 +2592,7 @@ export default {
             });
         })
         .catch(() => {
-          thisApp.$notify.info({
-             
+          thisApp.$notify.warning({
             message: "操作已取消",
             offset: 100,
             duration: 2500,
@@ -2633,9 +2624,8 @@ export default {
             .then(function (response) {
               if (response.data.state == 1) {
                 thisApp.$notify({
-                  title: "  ",
                   message: "禁用模板成功",
-                  type: "success",
+                  type: ["success"],
                   offset: 100,
                   duration: 2500,
                 });
@@ -2647,8 +2637,7 @@ export default {
             });
         })
         .catch(() => {
-          thisApp.$notify.info({
-             
+          thisApp.$notify.warning({
             message: "操作已取消",
             offset: 100,
             duration: 2500,
@@ -2689,9 +2678,8 @@ export default {
         })
           .then(function (response) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
-              type: "success",
+              type: ["success"],
               offset: 100,
               duration: 2500,
             });
@@ -2785,9 +2773,8 @@ export default {
         })
           .then((response) => {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
-              type: "success",
+              type: ["success"],
               offset: 100,
               duration: 2500,
             });
@@ -2855,9 +2842,8 @@ export default {
       })
         .then((response) => {
           thisApp.$notify({
-            title: "  ",
             message: response.data.message,
-            type: "success",
+            type: ["success"],
             offset: 100,
             duration: 2500,
           });
@@ -2892,9 +2878,8 @@ export default {
         })
           .then(function (response) {
             thisApp.$notify({
-              title: "  ",
               message: response.data.message,
-              type: "success",
+              type: ["success"],
               offset: 100,
               duration: 2500,
             });
@@ -3023,7 +3008,7 @@ export default {
     onUploadSuccess({ response: res }) {
       if (res.Code !== 0) {
         // notify.error(`xmind文件解析失败，${res.Msg}`);
-        notify.error('请上传正确的Xmind文件。');
+        notify.warning('请上传正确的Xmind文件。');
         return;
       }
       notify.success("Xmind文件解析成功。");