Merge branch 'preview' of http://120.46.222.128:10021/elink-star/epmet-oper-pc into preview

epmet-oper-web/.env.development

@@ -1,7 +1,7 @@
 NODE_ENV=development
 # VUE_APP_API_SERVER =  http://118.190.150.119:41080/api
-VUE_APP_API_SERVER =  http://localhost:8080/api
-# VUE_APP_API_SERVER =  http://192.168.1.144/api
+# VUE_APP_API_SERVER =  http://localhost:8080/api
+VUE_APP_API_SERVER =  http://192.168.1.144/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
 
 VUE_APP_NODE_ENV=dev

epmet-oper-web/.env.production.sit.project

@@ -0,0 +1,5 @@
+NODE_ENV=production
+VUE_APP_API_SERVER =  http://192.168.1.140/api
+# VUE_APP_API_SERVER =  http://192.168.1.140/api
+VUE_APP_NODE_ENV=prod:sit-project
+VUE_APP_PUBLIC_PATH=epmet-oper

epmet-oper-web/.vscode/settings.json

@@ -31,7 +31,7 @@
     }
   },
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "git.enableSmartCommit": true
 }

epmet-oper-web/src/components/ren-process-detail/src/ren-process-detail.vue

@@ -4,28 +4,23 @@
     <img :src="getResourceURL()" class="image">
     <h4>{{ $t('process.circulation') }}</h4>
     <div class="mod-sys__dict">
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
-        <el-table-column prop="activityName"  :label="$t('process.taskName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="assignee" :label="$t('process.assignee')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="startTime" :label="$t('task.startTime')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="endTime" :label="$t('task.endTime')"  header-align="center" align="center"></el-table-column>
-        <el-table-column prop="comment" :label="$t('process.comment')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="durationInSeconds" :label="$t('task.durationInSeconds')" header-align="center" align="center" width="180"></el-table-column>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle" style="width: 100%;">
+        <el-table-column prop="activityName" :label="$t('process.taskName')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="assignee" :label="$t('process.assignee')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="startTime" :label="$t('task.startTime')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="endTime" :label="$t('task.endTime')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="comment" :label="$t('process.comment')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="durationInSeconds" :label="$t('task.durationInSeconds')" header-align="center"
+          align="center" width="180"></el-table-column>
       </el-table>
-      <el-pagination
-        v-if="dataForm.pid === '0'"
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
+      <el-pagination v-if="dataForm.pid === '0'" :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit"
+        :total="total" layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
     </div>
@@ -69,7 +64,7 @@ export default {
     // 获取流程(xml/image)url地址
     getResourceURL () {
       var params = qs.stringify({
-        'token': Cookies.get('token'),
+        'token': Cookies.get('oper_token'),
         'processInstanceId': this.dataForm.processInstanceId
       })
       return `${window.SITE_CONFIG['apiURL']}/activiti/his/getInstImage?${params}`

epmet-oper-web/src/js/ajax.js

@@ -46,8 +46,8 @@ function endLoading () {
 axios.interceptors.request.use(
   (config) => {
     config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN'
-    config.headers['token'] = Cookies.get('token') || ''
-    config.headers['Authorization'] = Cookies.get('token') || ''
+    config.headers['token'] = Cookies.get('oper_token') || ''
+    config.headers['Authorization'] = Cookies.get('oper_token') || ''
     // 默认参数
     var defaults = {}
     // 防止缓存，GET请求默认带_t参数

epmet-oper-web/src/main.js

@@ -63,7 +63,7 @@ window.SITE_CONFIG['storeState'] = cloneDeep(store.state)
 
 // el-uploader的header配置
 Vue.prototype.$getElUploadHeaders = () => ({
-  Authorization: Cookies.get('token') || ''
+  Authorization: Cookies.get('oper_token') || ''
   //   Authorization: localStorage.getItem('token') || ''
 })
 

epmet-oper-web/src/mixins/view-module-post.js

@@ -136,8 +136,7 @@ export default {
         .then(() => {
           this.$http
             .delete(
-              `${this.mixinViewModuleOptions.deleteURL}${
-                this.mixinViewModuleOptions.deleteIsBatch ? '' : '/' + id
+              `${this.mixinViewModuleOptions.deleteURL}${this.mixinViewModuleOptions.deleteIsBatch ? '' : '/' + id
               }`,
               this.mixinViewModuleOptions.deleteIsBatch
                 ? {
@@ -170,7 +169,7 @@ export default {
     // 导出
     exportHandle () {
       var params = qs.stringify({
-        token: Cookies.get('token'),
+        token: Cookies.get('oper_token'),
         ...this.dataForm
       })
       window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`

epmet-oper-web/src/mixins/view-module.js

@@ -171,7 +171,7 @@ export default {
     // 导出
     exportHandle () {
       var params = qs.stringify({
-        'token': Cookies.get('token'),
+        'token': Cookies.get('oper_token'),
         ...this.dataForm
       })
       window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`

epmet-oper-web/src/utils/request.js

@@ -16,8 +16,8 @@ const http = axios.create({
  */
 http.interceptors.request.use(config => {
   config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN'
-  config.headers['token'] = Cookies.get('token') || ''
-  config.headers['Authorization'] = Cookies.get('token') || ''
+  config.headers['token'] = Cookies.get('oper_token') || ''
+  config.headers['Authorization'] = Cookies.get('oper_token') || ''
   // 默认参数
   var defaults = {}
   // 防止缓存，GET请求默认带_t参数

epmet-oper-web/src/views/modules/activiti/model.vue

@@ -18,35 +18,30 @@
           <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="name" :label="$t('model.name')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="key" :label="$t('model.key')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="version" :label="$t('model.version')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createTime" :label="$t('model.createTime')" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column prop="lastUpdateTime" :label="$t('model.lastUpdateTime')" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="version" :label="$t('model.version')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="createTime" :label="$t('model.createTime')" header-align="center" align="center"
+          width="180"></el-table-column>
+        <el-table-column prop="lastUpdateTime" :label="$t('model.lastUpdateTime')" header-align="center" align="center"
+          width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <a :href="getModelerURL(scope.row.id)" target="_blank" class="el-button el-button--text el-button--small">{{ $t('model.design') }}</a>
+            <a :href="getModelerURL(scope.row.id)" target="_blank" class="el-button el-button--text el-button--small">{{
+              $t('model.design') }}</a>
             <el-button type="text" size="small" @click="deployHandle(scope.row.id)">{{ $t('model.deploy') }}</el-button>
-            <a :href="getExportURL(scope.row.id)" target="_blank" class="el-button el-button--text el-button--small">{{ $t('export') }}</a>
+            <a :href="getExportURL(scope.row.id)" target="_blank" class="el-button el-button--text el-button--small">{{
+              $t('export') }}</a>
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
@@ -83,7 +78,7 @@ export default {
     // 获取在线设计url地址
     getModelerURL (id) {
       var params = qs.stringify({
-        'token': Cookies.get('token'),
+        'token': Cookies.get('oper_token'),
         'modelId': id
       })
       return `${window.SITE_CONFIG['apiURL']}/activiti/modeler.html?${params}`
@@ -91,7 +86,7 @@ export default {
     // 获取导出url地址
     getExportURL (id) {
       var params = qs.stringify({
-        'token': Cookies.get('token')
+        'token': Cookies.get('oper_token')
       })
       return `${window.SITE_CONFIG['apiURL']}/activiti/model/export/${id}?${params}`
     },

epmet-oper-web/src/views/modules/activiti/process-deploy.vue

@@ -1,20 +1,8 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="$t('process.deployFile')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <el-upload
-      :headers="$getElUploadHeaders()"
-      name="processFile"
-      :action="url"
-      :file-list="fileList"
-      drag
-      :before-upload="beforeUploadHandle"
-      :on-success="successHandle"
-      class="text-center"
-    >
+  <el-dialog :visible.sync="visible" :title="$t('process.deployFile')" :close-on-click-modal="false"
+    :close-on-press-escape="false">
+    <el-upload :headers="$getElUploadHeaders()" name="processFile" :action="url" :file-list="fileList" drag
+      :before-upload="beforeUploadHandle" :on-success="successHandle" class="text-center">
       <i class="el-icon-upload"></i>
       <div class="el-upload__text" v-html="$t('upload.text')"></div>
       <div class="el-upload__tip" slot="tip">
@@ -37,9 +25,8 @@ export default {
   methods: {
     init () {
       this.visible = true
-      this.url = `${
-        window.SITE_CONFIG['apiURL']
-      }/activiti/process/deploy?token=${Cookies.get('token')}`
+      this.url = `${window.SITE_CONFIG['apiURL']
+        }/activiti/process/deploy?token=${Cookies.get('oper_token')}`
       this.fileList = []
     },
     // 上传之前

epmet-oper-web/src/views/modules/activiti/process-initiation.vue

@@ -12,43 +12,41 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="id" :label="$t('process.id')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deploymentId" :label="$t('process.deploymentId')" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column prop="deploymentId" :label="$t('process.deploymentId')" header-align="center" align="center"
+          width="80"></el-table-column>
         <el-table-column prop="name" :label="$t('process.name')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="key" :label="$t('process.key')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="version" :label="$t('process.version')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="resourceName" :label="$t('process.resourceName')" header-align="center" align="center" :show-overflow-tooltip="true" width="100">
+        <el-table-column prop="version" :label="$t('process.version')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="resourceName" :label="$t('process.resourceName')" header-align="center" align="center"
+          :show-overflow-tooltip="true" width="100">
           <template slot-scope="scope">
-            <a :href="getResourceURL(scope.row.deploymentId, scope.row.resourceName)" target="_blank">{{ scope.row.resourceName }}</a>
+            <a :href="getResourceURL(scope.row.deploymentId, scope.row.resourceName)" target="_blank">{{
+              scope.row.resourceName }}</a>
           </template>
         </el-table-column>
-        <el-table-column prop="diagramResourceName" :label="$t('process.diagramResourceName')" header-align="center" align="center" :show-overflow-tooltip="true" width="100">
+        <el-table-column prop="diagramResourceName" :label="$t('process.diagramResourceName')" header-align="center"
+          align="center" :show-overflow-tooltip="true" width="100">
           <template slot-scope="scope">
-            <a :href="getResourceURL(scope.row.deploymentId, scope.row.diagramResourceName)" target="_blank">{{ scope.row.diagramResourceName }}</a>
+            <a :href="getResourceURL(scope.row.deploymentId, scope.row.diagramResourceName)" target="_blank">{{
+              scope.row.diagramResourceName }}</a>
           </template>
         </el-table-column>
-        <el-table-column prop="deploymentTime" :label="$t('process.deploymentTime')" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="deploymentTime" :label="$t('process.deploymentTime')" header-align="center"
+          align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="createProcessInstance(scope.row)">{{ $t('process.createInstance') }}</el-button>
+            <el-button type="text" size="small" @click="createProcessInstance(scope.row)">{{
+              $t('process.createInstance') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
@@ -85,7 +83,7 @@ export default {
     // 获取流程(xml/image)url地址
     getResourceURL (id, name) {
       var params = qs.stringify({
-        'token': Cookies.get('token'),
+        'token': Cookies.get('oper_token'),
         'deploymentId': id,
         'resourceName': name
       })

epmet-oper-web/src/views/modules/activiti/process.vue

@@ -18,52 +18,55 @@
           <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="id" :label="$t('process.id')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deploymentId" :label="$t('process.deploymentId')" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column prop="deploymentId" :label="$t('process.deploymentId')" header-align="center" align="center"
+          width="80"></el-table-column>
         <el-table-column prop="name" :label="$t('process.name')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="key" :label="$t('process.key')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="version" :label="$t('process.version')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="resourceName" :label="$t('process.resourceName')" header-align="center" align="center" :show-overflow-tooltip="true" width="100">
+        <el-table-column prop="version" :label="$t('process.version')" header-align="center"
+          align="center"></el-table-column>
+        <el-table-column prop="resourceName" :label="$t('process.resourceName')" header-align="center" align="center"
+          :show-overflow-tooltip="true" width="100">
           <template slot-scope="scope">
-            <a :href="getResourceURL(scope.row.deploymentId, scope.row.resourceName)" target="_blank">{{ scope.row.resourceName }}</a>
+            <a :href="getResourceURL(scope.row.deploymentId, scope.row.resourceName)" target="_blank">{{
+              scope.row.resourceName }}</a>
           </template>
         </el-table-column>
-        <el-table-column prop="diagramResourceName" :label="$t('process.diagramResourceName')" header-align="center" align="center" :show-overflow-tooltip="true" width="100">
+        <el-table-column prop="diagramResourceName" :label="$t('process.diagramResourceName')" header-align="center"
+          align="center" :show-overflow-tooltip="true" width="100">
           <template slot-scope="scope">
-            <a :href="getResourceURL(scope.row.deploymentId, scope.row.diagramResourceName)" target="_blank">{{ scope.row.diagramResourceName }}</a>
+            <a :href="getResourceURL(scope.row.deploymentId, scope.row.diagramResourceName)" target="_blank">{{
+              scope.row.diagramResourceName }}</a>
           </template>
         </el-table-column>
-        <el-table-column prop="deploymentTime" :label="$t('process.deploymentTime')" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="deploymentTime" :label="$t('process.deploymentTime')" header-align="center"
+          align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.suspended" type="text" size="small" @click="activeHandle(scope.row.id)">{{ $t('process.active') }}</el-button>
-            <el-button v-else type="text" size="small" @click="suspendHandle(scope.row.id)">{{ $t('process.suspend') }}</el-button>
-            <el-button type="text" size="small" @click="deleteHandle(scope.row.deploymentId)">{{ $t('delete') }}</el-button>
-            <el-button type="text" size="small" @click="convertToModelHandle(scope.row.id)">{{ $t('process.convertToModel') }}</el-button>
-            <el-button type="text" size="small" @click="setBizRoute(scope.row)">{{ $t('process.bizRouteSet') }}</el-button>
+            <el-button v-if="scope.row.suspended" type="text" size="small" @click="activeHandle(scope.row.id)">{{
+              $t('process.active') }}</el-button>
+            <el-button v-else type="text" size="small" @click="suspendHandle(scope.row.id)">{{ $t('process.suspend')
+              }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.deploymentId)">{{ $t('delete')
+              }}</el-button>
+            <el-button type="text" size="small" @click="convertToModelHandle(scope.row.id)">{{
+              $t('process.convertToModel') }}</el-button>
+            <el-button type="text" size="small" @click="setBizRoute(scope.row)">{{ $t('process.bizRouteSet')
+              }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
+      <el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
+        layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
       <!-- 弹窗, 部署流程文件 -->
       <deploy v-if="deployVisible" ref="deploy" @refreshDataList="getDataList"></deploy>
-      <process-biz-route v-if="setBizRouteVisible" ref="processBizRoute" @refreshDataList="getDataList"></process-biz-route>
+      <process-biz-route v-if="setBizRouteVisible" ref="processBizRoute"
+        @refreshDataList="getDataList"></process-biz-route>
     </div>
   </el-card>
 </template>
@@ -101,7 +104,7 @@ export default {
     // 获取流程(xml/image)url地址
     getResourceURL (id, name) {
       var params = qs.stringify({
-        'token': Cookies.get('token'),
+        'token': Cookies.get('oper_token'),
         'deploymentId': id,
         'resourceName': name
       })

epmet-oper-web/src/views/modules/message/mail-template-add-or-update.vue

@@ -1,41 +1,20 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="!dataForm.id ? $t('add') : $t('update')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
-      label-width="120px"
-    >
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false"
+    :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+      label-width="120px">
       <el-form-item prop="name" :label="$t('mail.name')">
-        <el-input
-          v-model="dataForm.name"
-          :placeholder="$t('mail.name')"
-        ></el-input>
+        <el-input v-model="dataForm.name" :placeholder="$t('mail.name')"></el-input>
       </el-form-item>
       <el-form-item prop="subject" :label="$t('mail.subject')">
-        <el-input
-          v-model="dataForm.subject"
-          :placeholder="$t('mail.subject')"
-        ></el-input>
+        <el-input v-model="dataForm.subject" :placeholder="$t('mail.subject')"></el-input>
       </el-form-item>
       <el-form-item prop="content" :label="$t('mail.content')">
         <!-- 富文本编辑器, 容器 -->
         <div id="J_quillEditor"></div>
         <!-- 自定义上传图片功能 (使用element upload组件) -->
-        <el-upload
-          :headers="$getElUploadHeaders()"
-          :action="uploadUrl"
-          :show-file-list="false"
-          :before-upload="uploadBeforeUploadHandle"
-          :on-success="uploadSuccessHandle"
-          style="display: none"
-        >
+        <el-upload :headers="$getElUploadHeaders()" :action="uploadUrl" :show-file-list="false"
+          :before-upload="uploadBeforeUploadHandle" :on-success="uploadSuccessHandle" style="display: none">
           <el-button ref="uploadBtn" type="primary" size="small">{{
             $t('upload.button')
           }}</el-button>
@@ -143,9 +122,8 @@ export default {
         theme: 'snow'
       })
       // 自定义上传图片功能 (使用element upload组件)
-      this.uploadUrl = `${
-        window.SITE_CONFIG['apiURL']
-      }/oss/file/upload?token=${Cookies.get('token')}`
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']
+        }/oss/file/upload?token=${Cookies.get('oper_token')}`
       this.quillEditor.getModule('toolbar').addHandler('image', () => {
         this.$refs.uploadBtn.$el.click()
       })

epmet-oper-web/src/views/modules/oss/oss-upload.vue

@@ -1,20 +1,8 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="$t('oss.upload')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <el-upload
-      :headers="$getElUploadHeaders()"
-      :action="url"
-      :file-list="fileList"
-      drag
-      multiple
-      :before-upload="beforeUploadHandle"
-      :on-success="successHandle"
-      class="text-center"
-    >
+  <el-dialog :visible.sync="visible" :title="$t('oss.upload')" :close-on-click-modal="false"
+    :close-on-press-escape="false">
+    <el-upload :headers="$getElUploadHeaders()" :action="url" :file-list="fileList" drag multiple
+      :before-upload="beforeUploadHandle" :on-success="successHandle" class="text-center">
       <i class="el-icon-upload"></i>
       <div class="el-upload__text" v-html="$t('upload.text')"></div>
       <div class="el-upload__tip" slot="tip">
@@ -38,9 +26,8 @@ export default {
   methods: {
     init () {
       this.visible = true
-      this.url = `${
-        window.SITE_CONFIG['apiURL']
-      }/oss/file/upload?token=${Cookies.get('token')}`
+      this.url = `${window.SITE_CONFIG['apiURL']
+        }/oss/file/upload?token=${Cookies.get('oper_token')}`
       this.num = 0
       this.fileList = []
     },

epmet-oper-web/src/views/modules/sys/news-add-or-update.vue

@@ -1,47 +1,25 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="!dataForm.id ? $t('add') : $t('update')"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
-      label-width="120px"
-    >
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false"
+    :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+      label-width="120px">
       <el-form-item prop="title" :label="$t('news.title')">
-        <el-input
-          v-model="dataForm.title"
-          :placeholder="$t('news.title')"
-        ></el-input>
+        <el-input v-model="dataForm.title" :placeholder="$t('news.title')"></el-input>
       </el-form-item>
       <el-form-item prop="content" :label="$t('news.content')">
         <!-- 富文本编辑器, 容器 -->
         <div id="J_quillEditor"></div>
         <!-- 自定义上传图片功能 (使用element upload组件) -->
-        <el-upload
-          :headers="$getElUploadHeaders()"
-          :action="uploadUrl"
-          :show-file-list="false"
-          :before-upload="uploadBeforeUploadHandle"
-          :on-success="uploadSuccessHandle"
-          style="display: none"
-        >
+        <el-upload :headers="$getElUploadHeaders()" :action="uploadUrl" :show-file-list="false"
+          :before-upload="uploadBeforeUploadHandle" :on-success="uploadSuccessHandle" style="display: none">
           <el-button ref="uploadBtn" type="primary" size="small">{{
             $t('upload.button')
           }}</el-button>
         </el-upload>
       </el-form-item>
       <el-form-item prop="pubDate" :label="$t('news.pubDate')">
-        <el-date-picker
-          v-model="dataForm.pubDate"
-          type="datetime"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('news.pubDate')"
-        ></el-date-picker>
+        <el-date-picker v-model="dataForm.pubDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+          :placeholder="$t('news.pubDate')"></el-date-picker>
       </el-form-item>
     </el-form>
     <template slot="footer">
@@ -145,9 +123,8 @@ export default {
         theme: 'snow'
       })
       // 自定义上传图片功能 (使用element upload组件)
-      this.uploadUrl = `${
-        window.SITE_CONFIG['apiURL']
-      }/sys/oss/upload?token=${Cookies.get('token')}`
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']
+        }/sys/oss/upload?token=${Cookies.get('oper_token')}`
       this.quillEditor.getModule('toolbar').addHandler('image', () => {
         this.$refs.uploadBtn.$el.click()
       })

epmet-oper-web/src/views/modules/sys/upgrade-version-history.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
-    <el-card shadow="never"
-             class="aui-card--fill">
+    <el-card shadow="never" class="aui-card--fill">
 
       <!-- 按钮 -->
       <div class="btn-group">
@@ -12,9 +11,7 @@
       <!-- 数据列表 -->
       <div>
         <el-table :data="histories" border style="width: 100%">
-          <el-table-column
-              prop="versionNo"
-              label="版本">
+          <el-table-column prop="versionNo" label="版本">
           </el-table-column>
           <el-table-column label="操作" :width="250">
             <template slot-scope="scope">
@@ -26,13 +23,8 @@
       </div>
 
       <!-- 分页条-->
-      <el-pagination
-          background
-          layout="prev, pager, next"
-          @current-change="onCurrentPageChanged"
-          :current-page="this.pageArgs.pageNo"
-          :page-size="this.pageArgs.pageSize"
-          :total="this.pageArgs.total">
+      <el-pagination background layout="prev, pager, next" @current-change="onCurrentPageChanged"
+        :current-page="this.pageArgs.pageNo" :page-size="this.pageArgs.pageSize" :total="this.pageArgs.total">
       </el-pagination>
 
       <!--      <Tinymce
@@ -43,11 +35,8 @@
     </el-card>
 
     <!-- 新增/修改 -->
-    <el-dialog :visible.sync="publishVersionUpgradeShow"
-               v-if="publishVersionUpgradeShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="this.operation === 'create' ? '发布新版本' : '修改'">
+    <el-dialog :visible.sync="publishVersionUpgradeShow" v-if="publishVersionUpgradeShow" :close-on-click-modal="false"
+      :close-on-press-escape="false" :title="this.operation === 'create' ? '发布新版本' : '修改'">
       <el-form :model="createOrUpdateForm" ref="createOrUpdateForm">
         <el-form-item prop="versionNo" label="版本">
           <el-input v-model="createOrUpdateForm.versionNo">
@@ -61,14 +50,8 @@
           <!-- :customerId="customerId" -->
           <div id="J_quillEditor"></div>
           <!-- 自定义上传图片功能 (使用element upload组件) -->
-        <el-upload
-          :headers="$getElUploadHeaders()"
-          :action="uploadUrl"
-          :show-file-list="false"
-          :before-upload="uploadBeforeUploadHandle"
-          :on-success="uploadSuccessHandle"
-          style="display: none"
-        >
+          <el-upload :headers="$getElUploadHeaders()" :action="uploadUrl" :show-file-list="false"
+            :before-upload="uploadBeforeUploadHandle" :on-success="uploadSuccessHandle" style="display: none">
             <el-button ref="uploadBtn" type="primary" size="small">{{
               $t('upload.button')
               }}</el-button>
@@ -167,9 +150,8 @@ export default {
         theme: 'snow'
       })
       // 自定义上传图片功能 (使用element upload组件)
-      this.uploadUrl = `${
-        window.SITE_CONFIG['apiURL']
-      }/oss/file/upload?token=${Cookies.get('token')}`
+      this.uploadUrl = `${window.SITE_CONFIG['apiURL']
+        }/oss/file/upload?token=${Cookies.get('oper_token')}`
       this.quillEditor.getModule('toolbar').addHandler('image', () => {
         this.$refs.uploadBtn.$el.click()
       })

epmet-oper-web/src/views/pages/login.vue

@@ -7,13 +7,8 @@
         </div>
         <div class="login-body">
           <h3 class="login-title">{{ $t('login.title') }}</h3>
-          <el-form
-            :model="dataForm"
-            :rules="dataRule"
-            ref="dataForm"
-            @keyup.enter.native="dataFormSubmitHandle()"
-            status-icon
-          >
+          <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
+            status-icon>
             <!-- <el-form-item>
               <el-select v-model="$i18n.locale"
                          class="w-percent-100">
@@ -33,11 +28,7 @@
               </el-input>
             </el-form-item>
             <el-form-item prop="password">
-              <el-input
-                v-model="dataForm.password"
-                type="password"
-                :placeholder="$t('login.password')"
-              >
+              <el-input v-model="dataForm.password" type="password" :placeholder="$t('login.password')">
                 <span slot="prefix" class="el-input__icon">
                   <svg class="icon-svg" aria-hidden="true">
                     <use xlink:href="#icon-lock"></use>
@@ -48,10 +39,7 @@
             <el-form-item prop="captcha">
               <el-row :gutter="20">
                 <el-col :span="14">
-                  <el-input
-                    v-model="dataForm.captcha"
-                    :placeholder="$t('login.captcha')"
-                  >
+                  <el-input v-model="dataForm.captcha" :placeholder="$t('login.captcha')">
                     <span slot="prefix" class="el-input__icon">
                       <svg class="icon-svg" aria-hidden="true">
                         <use xlink:href="#icon-safetycertificate"></use>
@@ -65,22 +53,14 @@
               </el-row>
             </el-form-item>
             <el-form-item>
-              <el-button
-                type="primary"
-                @click="dataFormSubmitHandle()"
-                class="w-percent-100"
-                >{{ $t('login.title') }}</el-button
-              >
+              <el-button type="primary" @click="dataFormSubmitHandle()" class="w-percent-100">{{ $t('login.title')
+                }}</el-button>
             </el-form-item>
           </el-form>
         </div>
         <div class="login-footer">
           <p>
-            <a
-              href="https://demo.cloud.renren.io/renren-cloud"
-              target="_blank"
-              >{{ $t('login.demo') }}</a
-            >
+            <a href="https://demo.cloud.renren.io/renren-cloud" target="_blank">{{ $t('login.demo') }}</a>
           </p>
           <!-- 2020 © renren.io -->
           <p>
@@ -177,8 +157,8 @@ export default {
                 return this.$message.error(res.msg)
               }
               localStorage.setItem('userType', 'oper')
-              localStorage.setItem('token', res.data.token)
-              Cookies.set('token', res.data.token)
+              localStorage.setItem('oper_token', res.data.token)
+              Cookies.set('oper_token', res.data.token)
               this.$router.replace({ name: 'home' }).catch(() => { })
             })
             .catch(() => { })