Merge branch 'zj' into dev

src/components/service-header.vue

 <template>
   <div class="info_logo">
-    <div class="logo" :style="{backgroundImage:'url('+data.url+')'}">
+    <div class="logo">
+      <img :src="data.url" alt="">
     </div>
     <div class="info">
       <p class="info_title">
@@ -82,10 +83,15 @@ export default {
 }
 .logo {
   float: left;
+  overflow: hidden;
   width: 144px;
   height: 144px;
   margin-right: 13px;
   background-size: cover;
+  text-align: center;
+}
+.logo img{
+  width: 100%;
 }
 .info {
   float: left;

src/components/upload_file.vue

@@ -5,6 +5,7 @@
     </div>
     <div v-else>
       <el-upload
+        class="eeupload"
         action="/apaas/static/image/upload"
         :file-list="fileArray"
         :list-type="type=='picture'?'picture-card':''"
@@ -173,6 +174,12 @@ export default {
       this.hideUpload = fileList.length >= this.max;
       this.$emit("getNewList", this.fileArray);
     },
+    remove_pic(){
+      document.querySelector('.eeupload').querySelector('.el-upload-list__item-delete').click();
+      setTimeout(()=>{
+        document.querySelector('.eeupload').querySelector('.el-upload').click();
+      },1000)
+    },
     getNewUrl(val) {
       let fileObj = { name: val, url: val };
       this.$emit("getNewList", fileObj);

src/pages/authority/organizationdetail.vue

@@ -3,7 +3,7 @@
     <p class="now_page_title">权限管理 / 组织用户 / <span>用户管理</span></p>
     <div class="info_contain">
       <service-header
-        v-if="service_header_arr.url"
+        v-if="service_header_arr.name"
         :data="service_header_arr"
       ></service-header>
     </div>

src/pages/authority/organizationedit.vue

@@ -141,12 +141,6 @@ export default {
   watch: {},
   computed: {},
   created() {
-    this.now_user = this.$store.state.role
-    getRole().then(data => {
-        this.now_user = data;
-        this.$store.commit('rolefun',data)
-        this.getOriginArr()
-    });
     this.get_now_page()
   },
   mounted() {},
@@ -254,7 +248,7 @@ export default {
             });
     },
     removepic(){
-      this.$refs.servicepic.handleRemove()
+      this.$refs.servicepic.remove_pic()
     },
       onSubmit(formName) {
         console.log('submit!');

src/pages/authority/organizationuser.vue

@@ -250,7 +250,7 @@ export default {
                   type:data.is_admin,
                   systemname:data.system_name,
                   contact:data.link_man,
-                  phone:data.phone,
+                  phone:data.phone+'',
                   email:data.email,
                   origin:data.department_id,
                   able:data.state,
@@ -294,7 +294,7 @@ export default {
         "user_id":this.form.account,   // 用户名
         "user_name":this.form.nickname,  // 昵称
         "system_name":this.form.systemname,//系统名称
-        "phone":this.form.phone,  // 电话号
+        "phone":this.form.phone+'',  // 电话号
         "email":this.form.email, // 邮箱
         "department_id":this.form.origin, // 组织id
         "is_admin":this.form.type,
@@ -320,7 +320,7 @@ export default {
         "user_id":this.form.account,   // 用户名
         "user_name":this.form.nickname,  // 昵称
         "system_name":this.form.systemname,//系统名称
-        "phone":this.form.phone,  // 电话号
+        "phone":this.form.phone+'',  // 电话号
         "email":this.form.email, // 邮箱
         "department_id":this.form.origin, // 组织id
         "is_admin":this.form.type,

src/pages/workbench/fwgl/approval_service_detail.vue

@@ -56,6 +56,7 @@ import serviceHeader from "@/components/service-header";
 import infoList from "@/components/infoList";
 import tableUm from "@/components/table/table-um";
 import processCard from "@/components/process-card";
+import { mapGetters,mapState } from 'vuex'
 export default {
   props: {},
   components: {
@@ -72,7 +73,7 @@ export default {
       },
       id:'',
       zd_table_arr:[],
-      now_user: 1, //0：普通用户，1：组织管理员，2：超级管理员
+      now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员
       rules:{
           result:[
               { required: true, message: '请选择意见', trigger: 'change' },
@@ -155,7 +156,7 @@ export default {
           align: "left"
         }
       ],
-
+      color_arr:['#e15260','"#ef9433','#515fe7'],
       service_header_arr: {
         name: "",
         first: [
@@ -257,12 +258,37 @@ export default {
     };
   },
   watch: {},
-  computed: {},
+  computed: {
+    ...mapGetters([
+      'level',
+    ]),
+    ...mapState(['userInfo']),
+  },
   created() {
+    console.log(this.level);
+    if(this.userInfo){
+      this.now_user = this.level
+    }else{
+      this.getCurrentUser()
+    }
     this.get_service_info()
   },
   mounted() {},
   methods: {
+    getCurrentUser() {
+      this.$api.user.getNowUser().then(({ data }) => {
+        if (data.success == 1) {
+          console.log("--- user info ---");
+          console.log(data.data);
+          console.log("--- user info ---");
+          this.$store.commit("userInfofun", data.data);
+          this.now_user = this.level
+           console.log(this.level);
+        } else {
+          console.log(data.errMsg);
+        }
+      });
+    },
       onSubmit(formName){
         this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -303,6 +329,7 @@ export default {
             this.$set(this.service_header_arr['first'][0], 'text', data.data_service_type1_name);
             this.$set(this.service_header_arr['first'][1], 'text', data.data_service_type2_name);
             this.$set(this.service_header_arr['first'][2], 'text', data.service_apply_info.approval_status==0?'待审批':data.service_apply_info.approval_status==1?'审批通过':'审批未通过');
+            this.$set(this.service_header_arr['first'][2], 'color', this.color_arr[data.service_apply_info.approval_status+1]);
             this.$set(this.service_header_arr['second'][0], "text", data.service_apply_info.apply_time.replace('T'," ").split('+')[0]);
             this.$set(this.service_header_arr, "url", data.cover);
             this.$set(this.list_arr[0], "info", data.service_apply_info.apply_user_info.department_name);

src/pages/workbench/fwgl/serviceDetail.vue

@@ -146,6 +146,7 @@ import Topology from "@/components/topology.vue";
 import serviceHeader from "@/components/service-header";
 import dialogAction from "@/components/dialog-action";
 import { getRole,formatDateTime_date } from "@/utils/common";
+import { mapGetters,mapState } from 'vuex'
 export default {
   components: {
     infoList,
@@ -519,6 +520,12 @@ export default {
       ],
     };
   },
+  computed:{
+    ...mapGetters([
+      'level',
+    ]),
+    ...mapState(['userInfo']),
+  },
   watch: {
     now_service(n, o) {
       if (n == 2) {
@@ -527,16 +534,30 @@ export default {
     },
   },
   created() {
-    this.now_user = this.$store.state.role;
-    getRole().then((data) => {
-      this.now_user = data;
-      this.$store.commit("rolefun", data);
-      this.getServiceInfo();
-      this.getServiceyxztInfo();
-    });
+    if(this.userInfo){
+      this.now_user = this.level
+    }else{
+      this.getCurrentUser()
+    }
+    this.getServiceInfo();
+    this.getServiceyxztInfo();
   },
   mounted() {},
   methods: {
+    getCurrentUser() {
+      this.$api.user.getNowUser().then(({ data }) => {
+        if (data.success == 1) {
+          console.log("--- user info ---");
+          console.log(data.data);
+          console.log("--- user info ---");
+          this.$store.commit("userInfofun", data.data);
+          this.now_user = this.level
+           console.log(this.level);
+        } else {
+          console.log(data.errMsg);
+        }
+      });
+    },
     getData() {
       let url = "/static/antv.json";
       this.$http
@@ -562,7 +583,7 @@ export default {
           this.$set(this.service_header_arr, "fixedurl", this.$route.path.replace('servicedetail','serviceedit'));
           this.$set(this.list_arr[0], "info", data.descript);
           this.$set(this.list_arr[1], "info", this.scrvice_area_arr[data.sectors-1]);
-          this.$set(this.list_arr[2], "info", data.organization);
+          this.$set(this.list_arr[2], "info", data.organization_name);
           this.$set(this.list_arr[3], "info", data.openness_name);
           this.$set(this.list_arr[4], "info", data.encode_method);
           this.$set(this.list_arr[5], "info", data.create_time.replace('T'," ").split('+')[0]);

src/pages/workbench/fwgl/serviceEdit.vue

@@ -149,6 +149,7 @@
 <script>
 import uploadFile from '@/components/upload_file'
 import { getRole } from "@/utils/common";
+import { mapGetters,mapState } from 'vuex'
 export default {
   props: {},
   components: {
@@ -263,18 +264,38 @@ export default {
     };
   },
   watch: {},
-  computed: {},
+  computed: {
+    ...mapGetters([
+      'level',
+    ]),
+    ...mapState(['userInfo']),
+  },
   created() {
-    this.now_user = this.$store.state.role
-    getRole().then(data => {
-        this.now_user = data;
-        this.$store.commit('rolefun',data)
-        this.getOriginArr()
-        this.getServiceInfo()
-    });
+    console.log(this.level);
+    if(this.userInfo){
+      this.now_user = this.level
+    }else{
+      this.getCurrentUser()
+    }
+    this.getOriginArr()
+    this.getServiceInfo()
   },
   mounted() {},
   methods: {
+    getCurrentUser() {
+      this.$api.user.getNowUser().then(({ data }) => {
+        if (data.success == 1) {
+          console.log("--- user info ---");
+          console.log(data.data);
+          console.log("--- user info ---");
+          this.$store.commit("userInfofun", data.data);
+          this.now_user = this.level
+           console.log(this.level);
+        } else {
+          console.log(data.errMsg);
+        }
+      });
+    },
     getOriginArr(){
       this.$http
             .get('/static/serviceedit.json')
@@ -371,7 +392,7 @@ export default {
       }
     },
     removepic(){
-      this.$refs.servicepic.handleRemove()
+      this.$refs.servicepic.remove_pic()
     },
       onSubmit(formName) {
         console.log('submit!');

src/pages/workbench/workPlace.vue

@@ -15,7 +15,7 @@
               v-for="(item, index) in manage_arr"
               :key="index + 800"
               class="manage_box"
-              @click="manage_func(index)"
+              @click="manage_func(item.url)"
               v-if="item.role == now_user"
             >
               <img :src="item.pic" alt />
@@ -273,6 +273,7 @@
 import uuidv1 from "uuid/v1";
 import tableUm from "@/components/table/table-um";
 import { getRole } from "@/utils/common";
+import { mapGetters,mapState } from 'vuex'
 var echarts = require("echarts");
 export default {
   data() {
@@ -899,74 +900,86 @@ export default {
       ],
       app_arr: [],
       manage_arr: [
-        {
-          pic: require("@/assets/imgs/home_tool_ic_key.png"),
-          text: "我的密钥",
-          role: 0,
-        },
         {
           pic: require("@/assets/imgs/home_tool_ic_organize.png"),
           text: "组织管理",
           role: 1,
-        },
-        {
-          pic: require("@/assets/imgs/home_tool_ic_key.png"),
-          text: "密钥管理",
-          role: 1,
+          url:'',
         },
         {
           pic: require("@/assets/imgs/home_tool_ic_quanxian.png"),
           text: "权限管理",
           role: 2,
+          url:'/authority/organization'
         },
-        {
-          pic: require("@/assets/imgs/home_tool_ic_quanxian.png"),
-          text: "容器管理",
-          role: 2,
-        },
-        {
-          pic: require("@/assets/imgs/home_tool_ic_quanxian.png"),
-          text: "数据管控",
-          role: 2,
-        },
-        {
-          pic: require("@/assets/imgs/home_tool_ic_quanxian.png"),
-          text: "消息新闻管理",
-          role: 2,
-        },
+        // {
+        //   pic: require("@/assets/imgs/home_tool_ic_quanxian.png"),
+        //   text: "容器管理",
+        //   role: 2,
+        // },
+        // {
+        //   pic: require("@/assets/imgs/home_tool_ic_quanxian.png"),
+        //   text: "数据管控",
+        //   role: 2,
+        // },
       ],
     };
   },
   components: {
     tableUm,
   },
+  computed: {
+    ...mapGetters([
+      'level',
+    ]),
+    ...mapState(['userInfo']),
+  },
   created() {
     this.getUserData();
     this.getAppData();
   },
   mounted() {
-    this.now_user = this.$store.getters.level;
-    getRole().then((data) => {
-      this.now_user = data;
-      this.$store.commit("rolefun", data);
-      this.getInfoData();
-      setTimeout(() => {
-        if (this.now_user == 0) {
-          this.getHealth();
-          this.getoperatingdata();
-        } else if (this.now_user == 1) {
-          this.getHealth();
-          this.getoperatingdata();
-          this.getappusedata();
-        } else if (this.now_user == 2) {
-          this.getoperatingdata();
-          this.getfwlxdata();
-          this.getyylxdata();
-        }
-      }, 500);
-    });
+    console.log(this.level);
+    if(this.userInfo){
+      this.now_user = this.level
+      this.manage_arr[0].url = '/authority/organization/detail/'+this.userInfo.department_id
+      this.init_func()
+    }else{
+      this.getCurrentUser()
+    }
   },
   methods: {
+    init_func(){
+      this.getInfoData();
+          if (this.now_user == 0) {
+            this.getHealth();
+            this.getoperatingdata();
+          } else if (this.now_user == 1) {
+            this.getHealth();
+            this.getoperatingdata();
+            this.getappusedata();
+          } else if (this.now_user == 2) {
+            this.getoperatingdata();
+            this.getfwlxdata();
+            this.getyylxdata();
+          }
+    },
+    getCurrentUser() {
+      this.$api.user.getNowUser().then(({ data }) => {
+        if (data.success == 1) {
+          console.log("--- user info ---");
+          console.log(data.data);
+          console.log("--- user info ---");
+          this.$store.commit("userInfofun", data.data);
+          this.now_user = this.level
+          this.manage_arr[0].url = data.data.department_id
+           console.log(this.level);
+           this.init_func()
+        } else {
+          console.log(data.errMsg);
+        }
+      });
+    },
     gotoyy() {
       this.$router.push("/yygl/" + this.now_user);
     },
@@ -1076,6 +1089,7 @@ export default {
     },
     manage_func(n) {
       console.log(n);
+      this.$router.push(n)
     },
     init_health(num) {
       var options = {

src/pages/workbench/yygl/app_edit.vue

@@ -217,7 +217,7 @@ export default {
             });
     },
     removepic(){
-      this.$refs.servicepic.handleRemove()
+      this.$refs.servicepic.remove_pic()
     },
       onSubmit(formName) {
         console.log('submit!');