Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-oper into dev

epmet-oper-web/src/router/index.js

@@ -50,6 +50,12 @@ export const moduleRoutes = {
       name: 'home',
       meta: { title: '首页', isTab: true }
     }
+    // {
+    //   path: '/homeWork',
+    //   component: () => import('@/views/modules/HomeWork'),
+    //   name: 'homeWork',
+    //   meta: { title: '首页', isTab: true }
+    // }
   ]
 }
 
@@ -111,6 +117,7 @@ router.beforeEach((to, from, next) => {
   //   })
   //   .catch(() => {})
   // 获取菜单列表, 添加并全局变量保存
+
   const userType = localStorage.getItem('userType')
   console.log('获取菜单：：：：' + localStorage.getItem('userType'))
 

epmet-oper-web/src/views/main-navbar.vue

@@ -72,7 +72,7 @@
               <i class="el-icon-arrow-down"></i>
             </span>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item @click.native="updatePasswordHandle()">{{ $t('updatePassword.title') }}</el-dropdown-item>
+              <!-- <el-dropdown-item @click.native="updatePasswordHandle()">{{ $t('updatePassword.title') }}</el-dropdown-item> -->
               <el-dropdown-item @click.native="logoutHandle()">{{ $t('logout') }}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -114,6 +114,7 @@ export default {
   },
   methods: {
     changeCustomerName (customerName) {
+
       this.customerName = localStorage.getItem('customerName')
     },
     // 全屏
@@ -141,13 +142,18 @@ export default {
         cancelButtonText: this.$t('cancel'),
         type: 'warning'
       }).then(() => {
+        //关闭所有标签页
+        // tabs, 关闭全部
+        this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name === 'home')
+
+
         this.$http.post('/auth/login/logout').then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
 
           clearLoginInfo()
-          console.log('logout:::::' + localStorage.getItem('userType'))
+
           if (localStorage.getItem('userType') === 'work') {
             this.$router.push({ name: 'loginWork' })
           } else {

epmet-oper-web/src/views/modules/HomeWork.vue

@@ -0,0 +1,14 @@
+<template>
+  <div>
+    <customer-info></customer-info>
+  </div>
+</template>
+
+<script>
+import CustomerInfo from './customer/manage/CustomerInfo'
+export default {
+  components: {
+    CustomerInfo
+  }
+}
+</script>

epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue

@@ -23,6 +23,8 @@
                       content="请输入2-5个字"
                       placement="bottom-start">
             <el-input class="item_width_1"
+                      :maxlength="5"
+                      :minlength="2"
                       v-model="dataForm.functionName"
                       placeholder="功能名称"></el-input>
           </el-tooltip>

epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue

@@ -515,8 +515,9 @@ export default {
 
     // 上架/下架
     upOrDown (functionId, shoppingStatus) {
+
       this.optionType = '1'
-      this.upOrDownDia.title = shoppingStatus === 0 ? '下架原因' : '上架原因'
+      this.upOrDownDia.title = shoppingStatus === '0' ? '下架原因' : '上架原因'
       this.upOrDownForm = {
         customerId: this.customerId,
         functionId: functionId,

epmet-oper-web/src/views/modules/customer/customize/FootbarEdit.vue

@@ -155,13 +155,13 @@ export default {
         pageTitle: [
           { required: true, message: '页面标题不能为空', trigger: 'blur' },
           { min: 2, max: 10, message: '页面标题长度在 2 到 10 个字符', trigger: 'blur' }
-        ],
-        iconPath: [
-          { required: true, message: '图标不能为空', trigger: 'blur' }
-        ],
-        selectedIconPath: [
-          { required: true, message: '选中图标不能为空', trigger: 'blur' }
         ]
+        // iconPath: [
+        //   { required: true, message: '图标不能为空', trigger: 'blur' }
+        // ],
+        // selectedIconPath: [
+        //   { required: true, message: '选中图标不能为空', trigger: 'blur' }
+        // ]
       }
     }
   },

epmet-oper-web/src/views/modules/customer/init/RegisterList.vue

@@ -139,11 +139,11 @@ export default {
           plain: false,
           methodName: 'showToken', // 回调方法名称
           isShow: (row) => {
-            if (this.env !== 'prod') {
+            // if (this.env !== 'prod') {
             return true
-            } else {
+            // } else {
-              return false
+            //   return false
-            }
+            // }
           }
         }
       ],

epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitForm.vue

@@ -69,7 +69,7 @@
                    class="el-upload__tip">可上传小程序使用录屏，最多上传1个视频。视频支持mp4格式，视频大小不超过20M</div>
             </el-upload>
           </el-form-item>
-          <el-form-item label="审核加急"
+          <!-- <el-form-item label="审核加急"
                         label-width="150px"
                         style="display:block">
             <el-radio-group v-model="dataForm.isSpeed">
@@ -77,7 +77,7 @@
               <el-radio :label="true">加急 </el-radio>
             </el-radio-group>
             <div class="el-upload__tip">一年3次，不加急：预计在1-7天内完成，加急：预计再2-12小时内完成</div>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
 
       </el-tab-pane>
@@ -189,6 +189,7 @@ export default {
       sceneOtherDisabled: true, // 其他场景是否禁用
       dataForm: {
         isSpeed: false, // 是否加急
+        isRepeat: false, // 上一次提审是否是加急，初次提审都是false
         versionDesc: '', // 小程序版本说明和功能解释
         ugcDeclare: { // 用户生成内容场景（UGC）信息安全声明
           scene: [1, 2, 4], // UGC场景 0,不涉及用户生成内容, 1.用户资料,2.图片,3.视频,4.文本,5其他, 可多选,当scene填0时无需填写下列字段
@@ -231,6 +232,7 @@ export default {
     reseatDataForm () {
       this.dataForm = {
         isSpeed: false, // 是否加急
+        isRepeat: false, // 上一次提审是否是加急，初次提审都是false
         versionDesc: '', // 小程序版本说明和功能解释
         ugcDeclare: { // 用户生成内容场景（UGC）信息安全声明
           scene: [1, 2, 4], // UGC场景 0,不涉及用户生成内容, 1.用户资料,2.图片,3.视频,4.文本,5其他, 可多选,当scene填0时无需填写下列字段
@@ -437,7 +439,9 @@ export default {
         // console.log(params.previewInfo.videoIdList)
       }
       // 加急 
-      params.isSpeed = this.dataForm.isSpeed
+      // params.isSpeed = this.dataForm.isSpeed
+      params.isSpeed = false
+      params.isRepeat = false// 上一次提审是否是加急，初次提审都是false
 
       // 小程序描述排除空内容
       if (this.dataForm.versionDesc !== '') {

epmet-oper-web/src/views/modules/customer/miniProAgent/version/SubmitFormReject.vue

@@ -60,8 +60,10 @@ export default {
     return {
       loading: false,
       codeId: '', // 上传代码id，父组件传
+      isRepeat: false, // 上一次是否加急，父组件传
 
       dataForm: {
+
         feedbackInfo: '', // 反馈内容
         feedbackStuff: '' // 反馈素材
       },
@@ -91,8 +93,10 @@ export default {
     ...mapGetters(['clientHeight'])
   },
   methods: {
-    initData (codeId) {
+    initData (codeId, isRepeat) {
       this.codeId = codeId
+      this.isRepeat = isRepeat // 是否加急标识，父组件传
+
     },
     reseatDataForm () {
       this.dataForm = {
@@ -165,7 +169,8 @@ export default {
     submitCode () {
       let params = {
         codeId: this.codeId,
-        isSpeed: false
+        isSpeed: false,//重新提神一直是false
+        isRepeat: this.isRepeat, // 判断上一次是否加急，状态同上一次
       }
 
       // 反馈说明

epmet-oper-web/src/views/modules/customer/miniProAgent/version/VersionItem.vue

@@ -86,11 +86,11 @@
                            size="mini"
                            type="primary"
                            @click="submitRecall">审核撤回</el-button>
-                <el-button v-if="audit.status==='auditing'||audit.status==='delay'"
+                <!-- <el-button v-if="!audit.isSpeed&&(audit.status==='auditing'||audit.status==='delay')"
                            class="btn_card"
                            size="mini"
                            type="primary"
-                           @click="speedupaudit">加急申请</el-button>
+                           @click="speedupaudit">加急申请</el-button> -->
 
                 <el-button v-if="audit.status==='audit_success'||audit.status==='release_failed'"
                            class="btn_card"
@@ -132,6 +132,10 @@
                               label="上传时间">
                   <span>{{ audit.commitTime }}</span>
                 </el-form-item>
+                <!-- <el-form-item :label-width="labelWidth"
+                              label="是否加急">
+                  <span>{{ audit.isSpeedShow }}</span>
+                </el-form-item> -->
                 <el-form-item :label-width="labelWidth"
                               label="审核状态">
                   <span>{{ audit.statusShow }}</span>
@@ -383,6 +387,12 @@ export default {
             } else {
               this.audit.statusShow = '审核延后'
             }
+
+            // if (this.audit.isSpeed) {
+            //   this.audit.isSpeedShow = '加急'
+            // } else {
+            //   this.audit.isSpeedShow = '不加急'
+            // }
           }
 
           this.commit = data.commit
@@ -445,10 +455,11 @@ export default {
     // 审核驳回 打开提交审核窗口
     submitCodeRejectShow () {
       if (this.audit.status === 'audit_failed') {
-        this.showSubmit = '2'
+        this.showSubmit = '2'//显示重新提审div
-        this.$refs['ref_submit_form_reject'].initData(this.audit.codeId)
+        // this.$refs['ref_submit_form_reject'].initData(this.audit.codeId, this.audit.isSpeed)
+        this.$refs['ref_submit_form_reject'].initData(this.audit.codeId, false)
       } else {
-        this.showSubmit = '1'
+        this.showSubmit = '1'//显示提审div
         this.$refs['ref_submit_form'].initData(this.audit.codeId)
       }
     },
@@ -552,7 +563,8 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/release'
+        this.startLoading()
+        const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/speedupaudit'
         // const url = '/third/code/speedupaudit'
         const param = {
           codeId: this.audit.codeId
@@ -563,6 +575,7 @@ export default {
             this.refresh()
           },
           (rspMsg, data) => {
+            this.endLoading()
             this.$message.error(rspMsg)
           })
       }).catch(() => { })

epmet-oper-web/src/views/modules/home.vue

@@ -1,15 +1,47 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <div>
+    <el-card v-if="userType==='oper'"
+             shadow="never"
+             class="aui-card--fill">
       <div class="mod-home">
         <h3>{{ $t('home.desc.title') }}</h3>
         <ul>
-        <li v-for="item in $t('home.desc.list')" :key="item" v-html="item"></li>
+          <li v-for="item in $t('home.desc.list')"
+              :key="item"
+              v-html="item"></li>
         </ul>
       </div>
     </el-card>
+
+    <customer-info @changeCustomerName="changeCustomerName"
+                   v-if="userType==='work'"></customer-info>
+  </div>
 </template>
 
 <script>
+import CustomerInfo from './customer/manage/CustomerInfo'
 export default {
+  data () {
+    return {
+      // i18nMessages: messages,
+      updatePassowrdVisible: false,
+      customerName: localStorage.getItem('customerName'),
+      userType: localStorage.getItem('userType')
+
+    }
+  },
+  components: {
+    CustomerInfo
+  },
+  mounted () {
+    //关闭所有标签页
+    // tabs, 关闭全部
+    this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name === 'home')
+  },
+  methods: {
+    changeCustomerName (customerName) {
+      this.$emit('changeCustomerName', customerName)
+    },
+  }
 }
 </script>

epmet-oper-web/src/views/modules/productConfig/customizeFunction/Edit.vue

@@ -18,6 +18,8 @@
                     content="请输入2-5个字"
                     placement="bottom-start">
           <el-input class="item_width_1"
+                    :maxlength="5"
+                    :minlength="2"
                     v-model="dataForm.functionName"
                     placeholder="功能名称"></el-input>
         </el-tooltip>
@@ -55,10 +57,12 @@
       </el-form-item>
       <el-form-item label="外链地址"
                     prop="targetLink">
-        <el-input class="item_width_1"
+        <el-input v-if="isApply===0"
-                  :disabled="isApply===1"
+                  class="item_width_1"
                   v-model="dataForm.targetLink"
                   placeholder="外链地址"></el-input>
+        <span v-else
+              style="width:300px;display:block;margin-bottom:10px; float:left">{{dataForm.targetLink}} </span>
       </el-form-item>
 
       <el-form-item prop="iconLargeImg"
@@ -96,6 +100,7 @@
       <el-form-item prop="domainNameList"
                     class="block"
                     label="业务域名">
+        <div v-if="type==='A'||isApply===0">
           <div v-for="(item, index)  in domainNameList"
                :key="index">
             <el-input :disabled="isApply===1"
@@ -103,14 +108,14 @@
                       placeholder='请输入业务域名'
                       v-model="domainNameList[index]"> </el-input>
 
-          <el-button v-if="index===0&&isApply===0"
+            <el-button v-if="index===0"
                        size="mini"
                        class="btn_serve"
                        type="primary"
                        icon="el-icon-plus"
                        @click="addRequest()"
                        circle></el-button>
-          <el-button v-if="index!==0&&isApply===0"
+            <el-button v-if="index!==0"
                        size="mini"
                        type="danger"
                        class="btn_serve"
@@ -119,6 +124,14 @@
                        circle></el-button>
 
           </div>
+        </div>
+        <div v-else>
+          <div v-for="(item, index)  in domainNameList"
+               :key="index">
+            <span style="width:300px;display:block;margin-bottom:10px; float:left">{{domainNameList[index]}} </span>
+
+          </div>
+        </div>
 
       </el-form-item>
 
@@ -214,7 +227,7 @@ export default {
           { required: true, message: '功能描述不能为空', trigger: 'blur' }
         ],
         targetLink: [
-          { required: true, message: '不能为空', trigger: 'blur' }
+          { required: true, message: '外链地址不能为空', trigger: 'blur' }
         ]
       }
     }

epmet-oper-web/src/views/modules/productConfig/footbar/FootbarEdit.vue

@@ -4,9 +4,9 @@
              :close-on-click-modal="false"
              :before-close="handleClose"
              :close-on-press-escape="false"
-             :width="60+'%'"
+             :width="diaWidth+'%'"
-             :top="'30px'">
+             :top="diaTop">
-    <el-form :inline="false"
+    <el-form :inline="showForm==='customize'"
              :model="dataForm"
              :rules="dataRule"
              ref="dataForm"
@@ -78,14 +78,13 @@
 
       <el-form-item v-if="showForm==='customize'"
                     label="默认图标">
-
+        <div class="item_width_1">
           <img :src="dataForm.defaultIconPath"
-             style="width:70px;height:70px"
+               style="width:60px;height:60px"
                class="function-icon">
-
+        </div>
       </el-form-item>
-      <el-form-item prop="iconPath"
+      <el-form-item label="图标">
-                    label="图标">
         <el-upload class="item_width_1 avatar-uploader"
                    :action="uploadUlr"
                    :show-file-list="false"
@@ -93,22 +92,27 @@
                    :before-upload="beforeImgUpload">
           <img v-if="dataForm.iconPath"
                :src="dataForm.iconPath"
-               style="width:70px;height:70px"
+               style="width:60px;height:60px"
                class="function-icon">
           <i v-else
              class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
+        <el-button v-if="showForm==='customize'"
+                   class="btn_reset"
+                   type="primary"
+                   size="mini"
+                   @click="resetIcon">恢复默认</el-button>
       </el-form-item>
       <el-form-item v-if="showForm==='customize'"
                     label="默认选中图标">
-
+        <div class="item_width_1">
           <img :src="dataForm.defaultSelectedIconPath"
-             style="width:70px;height:70px"
+               style="width:60px;height:60px"
                class="function-icon">
+        </div>
 
       </el-form-item>
-      <el-form-item prop="selectedIconPath"
+      <el-form-item label="选中图标">
-                    label="选中图标">
         <el-upload class="item_width_1 avatar-uploader"
                    :action="uploadUlr"
                    :show-file-list="false"
@@ -116,11 +120,16 @@
                    :before-upload="beforeImgUpload">
           <img v-if="dataForm.selectedIconPath"
                :src="dataForm.selectedIconPath"
-               style="width:70px;height:70px"
+               style="width:60px;height:60px"
                class="function-icon">
           <i v-else
              class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
+        <el-button v-if="showForm==='customize'"
+                   class="btn_reset"
+                   type="primary"
+                   size="mini"
+                   @click="resetSelectIcon">恢复默认</el-button>
       </el-form-item>
 
     </el-form>
@@ -133,6 +142,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 
 let loading// 加载动画
@@ -140,6 +150,7 @@ export default {
   data () {
     return {
       visible: false,
+      title: '新增Footbar',
       type: '', // 操作类型A/U
       id: '', // 父组件传来功能id
       showForm: 'default',//来自默认配置default、自定义配置customize
@@ -189,16 +200,25 @@ export default {
         pageTitle: [
           { required: true, message: '页面标题不能为空', trigger: 'blur' },
           { min: 2, max: 10, message: '页面标题长度在 2 到 10 个字符', trigger: 'blur' }
-        ],
-        iconPath: [
-          { required: true, message: '图标不能为空', trigger: 'blur' }
-        ],
-        selectedIconPath: [
-          { required: true, message: '选中图标不能为空', trigger: 'blur' }
         ]
-      }
+        // iconPath: [
+        //   { required: true, message: '图标不能为空', trigger: 'blur' }
+        // ],
+        // selectedIconPath: [
+        //   { required: true, message: '选中图标不能为空', trigger: 'blur' }
+        // ]
       }
     },
+    diaWidth () {
+
+      return this.resolution === 'small' ? 60 : 50
+    },
+    diaTop () {
+
+      return this.resolution === 'small' ? '30px' : '100px'
+    },
+    ...mapGetters(['clientHeight', 'resolution']),
+  },
   methods: {
     init (id, type, appType, showForm) {
       this.type = type
@@ -208,6 +228,7 @@ export default {
       this.id = id
 
       if (type === 'A') {
+        this.title = '新增Footbar'
         this.dataForm = {
           customerId: '',
           barName: '',
@@ -223,6 +244,7 @@ export default {
         }
 
       } else {
+        this.title = '修改Footbar'
         this.loadFormData()
       }
     },
@@ -245,7 +267,14 @@ export default {
           this.$message.error(rspMsg)
         })
     },
-
+    // 重置图标
+    resetIcon () {
+      this.dataForm.iconPath = this.dataForm.defaultIconPath
+    },
+    // 重置选中图标
+    resetSelectIcon () {
+      this.dataForm.selectedIconPath = this.dataForm.defaultSelectedIconPath
+    },
     // 上传大图标成功
     handleImgSuccess (res, file, type) {
       if (res.code === 0 && res.msg === 'success') {
@@ -288,6 +317,7 @@ export default {
             // url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/oper/customize/customerfootbar/createfootbar'
             url = '/oper/customize/customerfootbar/createfootbar'
             this.dataForm.id = ''
+            this.dataForm.customerId = 'default'
           }
           window.app.ajax.post(url, this.dataForm,
             (data, rspMsg) => {
@@ -334,7 +364,7 @@ export default {
   width: 28px;
 }
 .item_width_1 {
-  width: 300px;
+  width: 200px;
 }
 .item_width_2 {
   width: 500px;
@@ -348,4 +378,8 @@ export default {
   margin-left: 10px;
   vertical-align: bottom;
 }
+.btn_reset {
+  vertical-align: bottom;
+  margin-left: 10px;
+}
 </style>