update

default.conf

@@ -67,6 +67,13 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 
+    location /salpa/ {
+        proxy_pass  http://192.168.1.217:9080/;
+        proxy_set_header Host $proxy_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    }
+
     #error_page  404              /404.html;
 
     # redirect server error pages to the static page /50x.html

src/api/datamodel/model.js

@@ -8,3 +8,11 @@ export function createDataSource(data) {
   })
 }
 
+export function editDataSource(data) {
+  return request({
+    url: '/salpa/subject/project/updateDataSource',
+    method: 'put',
+    data: data
+  })
+}
+

src/api/metadata/datasource.js

@@ -113,3 +113,21 @@ export function getMetadatablood(data) {
     data: data
   })
 }
+
+export function uploadFile(data, type) {
+  return request({
+    url: '/data/metadata/sources/upload/' + type,
+    method: 'post',
+    data: data
+  })
+}
+
+export function pageOfflineData(data) {
+  return request({
+    url: '/data/metadata/offline/page',
+    method: 'get',
+    params: data
+  })
+}
+
+

src/styles/datastyle.css

@@ -458,7 +458,8 @@ body .el-radio__input.is-checked+.el-radio__label {
 
 /*el-input*/
 body .el-textarea__inner:focus,
-body .el-input__inner:focus{
+body .el-input__inner:focus,
+body .el-select .el-input__inner:focus{
 	border-color:#233A82
 }
 
@@ -526,6 +527,11 @@ body .el-form-item .el-form-item__label {
 	font-weight: normal;
 }
 
+/*el-progress*/
+body .el-progress-bar__inner {
+    background-color: #233A82 !important;
+}
+
 /*modellist*/
 .modellist{
 	display: flex;

src/views/market/apilog/LogList.vue

@@ -92,14 +92,12 @@
             trigger="click"
           >
             <el-button
-              v-hasPerm="['market:api:log:detail']"
               size="mini"
               type="text"
               icon="el-icon-view"
               @click="handleDetail(scope.row)"
             >详情</el-button>
             <el-button
-              v-hasPerm="['market:api:log:remove']"
               size="mini"
               type="text"
               icon="el-icon-delete"

src/views/market/apimask/ApiMaskAdd.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['market:mask:add']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/market/apimask/ApiMaskEdit.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['market:mask:edit']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/market/apimask/ApiMaskList.vue

@@ -20,7 +20,6 @@
       <el-col :span="12">
         <el-button-group>
           <el-button
-            v-hasPerm="['market:mask:add']"
             type="primary"
             icon="el-icon-plus"
             size="mini"
@@ -100,21 +99,18 @@
             trigger="click"
           >
             <el-button
-              v-hasPerm="['market:mask:edit']"
               size="mini"
               type="text"
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             >修改</el-button>
             <el-button
-              v-hasPerm="['market:mask:detail']"
               size="mini"
               type="text"
               icon="el-icon-view"
               @click="handleDetail(scope.row)"
             >详情</el-button>
             <el-button
-              v-hasPerm="['market:mask:remove']"
               size="mini"
               type="text"
               icon="el-icon-delete"

src/views/market/dataapi/DataApiAdd.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['market:api:add']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/market/dataapi/DataApiDetail.vue

@@ -3,8 +3,8 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['market:api:word']" size="mini" icon="el-icon-coin" round @click="handleWord">接口文档</el-button>
+        <el-button size="mini" icon="el-icon-coin" round @click="handleWord">接口文档</el-button>
-        <el-button v-hasPerm="['market:api:example']" size="mini" icon="el-icon-s-data" round @click="handleExample">接口示例</el-button>
+        <el-button size="mini" icon="el-icon-s-data" round @click="handleExample">接口示例</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/market/dataapi/DataApiEdit.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['market:api:edit']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/market/dataapi/DataApiExample.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['market:api:example']" size="mini" icon="el-icon-s-data" round @click="handleCall">接口调用</el-button>
+        <el-button size="mini" icon="el-icon-s-data" round @click="handleCall">接口调用</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/market/dataapi/DataApiList.vue

@@ -20,7 +20,6 @@
       <el-col :span="12">
         <el-button-group>
           <el-button
-            v-hasPerm="['market:api:add']"
             type="primary"
             icon="el-icon-plus"
             size="mini"
@@ -100,28 +99,24 @@
             trigger="click"
           >
             <el-button
-              v-hasPerm="['market:api:edit']"
               size="mini"
               type="text"
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             >修改</el-button>
             <el-button
-              v-hasPerm="['market:api:detail']"
               size="mini"
               type="text"
               icon="el-icon-view"
               @click="handleDetail(scope.row)"
             >详情</el-button>
             <el-button
-              v-hasPerm="['market:api:remove']"
               size="mini"
               type="text"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
             >删除</el-button>
             <el-button
-              v-hasPerm="['market:api:copy']"
               size="mini"
               type="text"
               icon="el-icon-copy-document"
@@ -129,7 +124,6 @@
             >拷贝</el-button>
             <el-button
               v-if="scope.row.status !== '2'"
-              v-hasPerm="['market:api:release']"
               size="mini"
               type="text"
               icon="el-icon-upload2"
@@ -137,7 +131,6 @@
             >发布</el-button>
             <el-button
               v-if="scope.row.status === '2'"
-              v-hasPerm="['market:api:cancel']"
               size="mini"
               type="text"
               icon="el-icon-download"

src/views/market/dataservice/DataServiceAdd.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['market:service:add']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/market/dataservice/DataServiceEdit.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['market:service:edit']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/market/dataservice/DataServiceList.vue

@@ -20,7 +20,6 @@
       <el-col :span="12">
         <el-button-group>
           <el-button
-            v-hasPerm="['market:service:add']"
             type="primary"
             icon="el-icon-plus"
             size="mini"
@@ -100,21 +99,18 @@
             trigger="click"
           >
             <el-button
-              v-hasPerm="['market:service:edit']"
               size="mini"
               type="text"
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             >修改</el-button>
             <el-button
-              v-hasPerm="['market:service:detail']"
               size="mini"
               type="text"
               icon="el-icon-view"
               @click="handleDetail(scope.row)"
             >详情</el-button>
             <el-button
-              v-hasPerm="['market:service:remove']"
               size="mini"
               type="text"
               icon="el-icon-delete"

src/views/market/servicelog/LogList.vue

@@ -92,14 +92,12 @@
             trigger="click"
           >
             <el-button
-              v-hasPerm="['market:service:log:detail']"
               size="mini"
               type="text"
               icon="el-icon-view"
               @click="handleDetail(scope.row)"
             >详情</el-button>
             <el-button
-              v-hasPerm="['market:service:log:remove']"
               size="mini"
               type="text"
               icon="el-icon-delete"

src/views/masterdata/datamanage/DataAdd.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['masterdata:data:add']" type="primary" size="mini" icon="el-icon-finished" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-finished" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/masterdata/datamanage/DataEdit.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['masterdata:data:edit']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/masterdata/datamanage/DataList.vue

@@ -208,7 +208,6 @@
             <el-col :span="12">
               <el-button-group>
                 <el-button
-                  v-hasPerm="['masterdata:data:add']"
                   type="primary"
                   icon="el-icon-plus"
                   size="mini"
@@ -248,21 +247,18 @@
                   trigger="click"
                 >
                   <el-button
-                    v-hasPerm="['masterdata:data:edit']"
                     size="mini"
                     type="text"
                     icon="el-icon-edit-outline"
                     @click="handleEdit(scope.row)"
                   >修改</el-button>
                   <el-button
-                    v-hasPerm="['masterdata:data:detail']"
                     size="mini"
                     type="text"
                     icon="el-icon-view"
                     @click="handleDetail(scope.row)"
                   >详情</el-button>
                   <el-button
-                    v-hasPerm="['masterdata:data:remove']"
                     size="mini"
                     type="text"
                     icon="el-icon-delete"

src/views/masterdata/datamodel/DataModelAdd.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['masterdata:model:add']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button  size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/masterdata/datamodel/DataModelDetail.vue

@@ -3,8 +3,8 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-if="form.flowStatus === '1' || form.flowStatus === '6'" v-hasPerm="['masterdata:model:submit']" size="mini" icon="el-icon-s-data" round @click="submit">提交</el-button>
+        <el-button v-if="form.flowStatus === '1' || form.flowStatus === '6'"  size="mini" icon="el-icon-s-data" round @click="submit">提交</el-button>
-        <el-button v-if="form.flowStatus === '4'" v-hasPerm="['masterdata:model:create']" :disabled="form.isSync === '1'" size="mini" icon="el-icon-s-data" round @click="createTable">建模</el-button>
+        <el-button v-if="form.flowStatus === '4'"  :disabled="form.isSync === '1'" size="mini" icon="el-icon-s-data" round @click="createTable">建模</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/masterdata/datamodel/DataModelEdit.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['masterdata:model:edit']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/masterdata/datamodel/DataModelList.vue

@@ -20,7 +20,6 @@
       <el-col :span="12">
         <el-button-group>
           <el-button
-            v-hasPerm="['masterdata:model:add']"
             type="primary"
             icon="el-icon-plus"
             size="mini"
@@ -100,7 +99,6 @@
             trigger="click"
           >
             <el-button
-              v-hasPerm="['masterdata:model:edit']"
               v-flow-edit="scope.row.flowStatus"
               size="mini"
               type="text"
@@ -108,14 +106,12 @@
               @click="handleEdit(scope.row)"
             >修改</el-button>
             <el-button
-              v-hasPerm="['masterdata:model:detail']"
               size="mini"
               type="text"
               icon="el-icon-view"
               @click="handleDetail(scope.row)"
             >详情</el-button>
             <el-button
-              v-hasPerm="['masterdata:model:remove']"
               v-flow-del="scope.row.flowStatus"
               size="mini"
               type="text"

src/views/masterdata/datamodel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <iframe src="http://192.168.1.217:8001/model/modelChildren" width="100%" height="850px" frameborder="0" />
+    <iframe src="http://127.0.0.1:8000/model/modelChildren?hideInMenu=true" width="100%" height="850px" frameborder="0" />
   </div>
 </template>
 

src/views/metadata/changerecord/ChangeRecordAdd.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['metadata:changerecord:add']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/metadata/changerecord/ChangeRecordEdit.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['metadata:changerecord:edit']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/metadata/changerecord/ChangeRecordList.vue

@@ -92,21 +92,18 @@
             trigger="click"
           >
             <el-button
-              v-hasPerm="['metadata:changerecord:edit']"
               size="mini"
               type="text"
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             >修改</el-button>
             <el-button
-              v-hasPerm="['metadata:changerecord:detail']"
               size="mini"
               type="text"
               icon="el-icon-view"
               @click="handleDetail(scope.row)"
             >详情</el-button>
             <el-button
-              v-hasPerm="['metadata:changerecord:remove']"
               size="mini"
               type="text"
               icon="el-icon-delete"

src/views/metadata/datacolumn/DataColumnDetail.vue

@@ -12,21 +12,21 @@
           <el-col :span="8">
             <el-form-item label="字段名称" prop="columnName">
               <el-input v-model="form.columnName" disabled>
-                <el-button slot="append" v-hasPerm="['metadata:changerecord:add']" icon="el-icon-edit-outline" @click="changeRecord('columnName')" />
+                <el-button slot="append" icon="el-icon-edit-outline" @click="changeRecord('columnName')" />
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="字段注释" prop="columnComment">
               <el-input v-model="form.columnComment" disabled>
-                <el-button slot="append" v-hasPerm="['metadata:changerecord:add']" icon="el-icon-edit-outline" @click="changeRecord('columnComment')" />
+                <el-button slot="append" icon="el-icon-edit-outline" @click="changeRecord('columnComment')" />
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="数据默认值" prop="dataDefault">
               <el-input v-model="form.dataDefault" disabled>
-                <el-button slot="append" v-hasPerm="['metadata:changerecord:add']" icon="el-icon-edit-outline" @click="changeRecord('dataDefault')" />
+                <el-button slot="append" icon="el-icon-edit-outline" @click="changeRecord('dataDefault')" />
               </el-input>
             </el-form-item>
           </el-col>

src/views/metadata/datacolumn/DataColumnList.vue

@@ -118,7 +118,6 @@
                 trigger="click"
               >
                 <el-button
-                  v-hasPerm="['metadata:datacolumn:detail']"
                   size="mini"
                   type="text"
                   icon="el-icon-view"

src/views/metadata/datasource/DataSourceAdd.vue

@@ -140,7 +140,7 @@
             <el-input v-model="form2.password" placeholder="请输入密码" />
           </el-form-item>
           <el-form-item>
-            <el-button v-hasPerm="['metadata:datasource:connect']" size="mini" type="primary" @click="handleCheckConnection">连通性检测</el-button>
+            <el-button size="mini" type="primary" @click="handleCheckConnection">连通性检测</el-button>
           </el-form-item>
         </div>
       </el-form>
@@ -334,11 +334,11 @@ export default {
     saveModelDataSource() {
       const dbType = this.form.dbType
       const dataSource = {
-        projectId: '11111',
+        projectId: this.form2.dbName,
         databaseName: this.form2.dbName,
         schemaName: this.form2.schema === '' ? this.form2.dbName : this.form2.schema,
         databaseType: dbType,
-        url: this.form2.host + this.form2.port,
+        url: this.form2.host + ':' + this.form2.port + '/' + this.form2.dbName,
         username: this.form2.username,
         password: this.form2.password
       }

src/views/metadata/datasource/DataSourceDetail.vue

@@ -4,74 +4,191 @@
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
         <!-- zrx add-->
-        <el-button v-if="form.isSync === '0'" v-hasPerm="['metadata:datasource:sync']" size="mini" icon="el-icon-coin" round @click="handleSync">元数据同步</el-button>
+        <el-button v-if="form.isSync === '0'" type="primary" size="mini" icon="el-icon-coin" @click="handleSync">元数据同步</el-button>
-        <el-button v-if="form.isSync === '2'" v-hasPerm="['metadata:datasource:sync']" size="mini" icon="el-icon-coin" round @click="handleSync">元数据更新</el-button>
+        <el-button v-if="form.isSync === '2'" type="primary" size="mini" icon="el-icon-coin" @click="handleSync">元数据更新</el-button>
-        <el-button v-if="form.isSync === '2'" v-hasPerm="['metadata:datasource:word']" size="mini" icon="el-icon-coin" round @click="handleWord">数据库文档</el-button>
+        <el-button v-if="form.isSync === '2'" type="primary" size="mini" icon="el-icon-coin" @click="handleWord">数据库文档</el-button>
-        <el-button v-if="form.isSync === '3'" v-hasPerm="['metadata:datasource:sync']" size="mini" icon="el-icon-coin" round @click="handleSync">元数据再次同步</el-button>
+        <el-button v-if="form.isSync === '3'" type="primary" size="mini" icon="el-icon-coin" @click="handleSync">元数据再次同步</el-button>
-        <el-button v-hasPerm="['metadata:datasource:connect']" size="mini" icon="el-icon-coin" round @click="handleCheckConnection">连通性检测</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-coin" @click="handleCheckConnection">连通性检测</el-button>
-        <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
+        <el-button size="mini" icon="el-icon-back" @click="showCard">返回</el-button>
       </el-button-group>
     </div>
     <div class="body-wrapper">
-      <el-steps :active="active" finish-status="success" align-center>
+      <el-descriptions style="margin-top: 20px" title="数据源信息" :column="2" border size="medium" >
-        <el-step title="数据源信息" />
+        <el-descriptions-item :labelStyle="{width: '200px'}" :contentStyle="{width: '35%'}">
-        <el-step title="连接信息" />
+          <template slot="label">
-      </el-steps>
+            <i class="el-icon-tickets"></i>
-      <el-form v-if="active == 1" ref="form" :model="form" label-width="80px" disabled>
+            数据源名称
-        <el-form-item label="数据源类型" prop="dbType">
+          </template>
-          <el-select v-model="form.dbType">
+          {{form.sourceName}}
-            <el-option
+        </el-descriptions-item>
-              v-for="item in dbTypeOptions"
+        <el-descriptions-item :labelStyle="{width: '200px'}">
-              :key="item.id"
+          <template slot="label">
-              :label="item.itemValue"
+            <i class="el-icon-star-off"></i>
-              :value="item.itemText"
+            状态
-            />
+          </template>
-          </el-select>
+          <template v-for="dict in statusOptions">
-        </el-form-item>
+            <el-tag v-if="form.status == dict.itemText && form.status == '1' " size="small" type="success">{{ dict.itemValue }}</el-tag>
-        <el-form-item label="数据源名称" prop="sourceName">
+            <el-tag v-if="form.status == dict.itemText && form.status != '1'  " size="small" type="warning">{{ dict.itemValue }}</el-tag>
-          <el-input v-model="form.sourceName" placeholder="请输入数据源名称" />
+          </template>
-        </el-form-item>
+        </el-descriptions-item>
-        <el-form-item label="状态" prop="status">
+        <el-descriptions-item :labelStyle="{width: '200px'}">
-          <el-radio-group v-model="form.status">
+          <template slot="label">
-            <el-radio
+            <i class="el-icon-document"></i>
-              v-for="dict in statusOptions"
+            备注
-              :key="dict.id"
+          </template>
-              :label="dict.itemText"
+          {{form.remark}}
-            >{{ dict.itemValue }}</el-radio>
+        </el-descriptions-item>
-          </el-radio-group>
+      </el-descriptions >
-        </el-form-item>
+      <el-descriptions style="margin-top: 20px" title="数据库类型" :column="1" :colon="false" border size="medium">
-        <el-form-item label="备注" prop="remark">
+        <el-descriptions-item :labelStyle="{width: '200px'}">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <template slot="label">
-        </el-form-item>
+            <i class="el-icon-menu"></i>
-      </el-form>
+            数据库类型
-      <el-form v-if="active == 2" ref="form2" :model="form2" label-width="80px" disabled>
+          </template>
-        <el-form-item label="主机" prop="host">
+          <div class="modellist" style="width:100%">
-          <el-input v-model="form2.host" placeholder="请输入主机" />
+            <div v-if="form.dbType =='1'" class="list" @click="chooseDbType('1')">
-        </el-form-item>
+              <div class="limg"><img :src="databaseImg.imgMySQL"></div>
-        <el-form-item label="端口" prop="port">
+              <div class="ltitle">
-          <el-input v-model="form2.port" placeholder="请输入端口" />
+                <el-tooltip content="mysql数据库" placement="bottom" effect="light">
-        </el-form-item>
+                  <p class="title">mysql</p>
-        <el-form-item v-if="form.dbType === '3' || form.dbType === '4'" label="服务名" prop="sid">
+                </el-tooltip>
-          <el-input v-model="form2.sid" placeholder="请输入服务名" />
+              </div>
-        </el-form-item>
+            </div>
-        <el-form-item v-if="form.dbType !== '3' && form.dbType !== '4'" label="数据库" prop="dbName">
+            <div v-if="form.dbType =='2'" class="list"  @click="chooseDbType('2')">
-          <el-input v-model="form2.dbName" placeholder="请输入数据库" />
+              <div class="limg"><img :src="databaseImg.imgMariaDB"></div>
-        </el-form-item>
+              <div class="ltitle">
-        <el-form-item label="用户名" prop="username">
+                <el-tooltip content="mariadb-3.0.3数据库" placement="bottom" effect="light">
-          <el-input v-model="form2.username" placeholder="请输入用户名" />
+                  <p class="title">mariadb-3.0.3</p>
-        </el-form-item>
+                </el-tooltip>
-        <el-form-item label="密码" prop="password">
+              </div>
-          <el-input v-model="form2.password" placeholder="请输入密码" />
+            </div>
-        </el-form-item>
+            <div v-if="form.dbType =='3'" class="list"  @click="chooseDbType('3')">
-      </el-form>
+              <div class="limg"><img :src="databaseImg.imgOracle"></div>
-      <el-button v-if="active == 1" style="margin-top: 12px;" @click="handleNextStep">下一步</el-button>
+              <div class="ltitle">
-      <el-button v-if="active == 2" style="margin-top: 12px;" @click="handleLastStep">上一步</el-button>
+                <el-tooltip content="oracle数据库" placement="bottom" effect="light">
+                  <p class="title">oracle</p>
+                </el-tooltip>
+              </div>
+            </div>
+            <div v-if="form.dbType =='9'" class="list"  @click="chooseDbType('9')">
+              <div class="limg"><img :src="databaseImg.imgdm8"></div>
+              <div class="ltitle">
+                <el-tooltip content="dm数据库" placement="bottom" effect="light">
+                  <p class="title">dm</p>
+                </el-tooltip>
+              </div>
+            </div>
+            <div v-if="form.dbType =='8'" class="list"  @click="chooseDbType('8')">
+              <div class="limg"><img :src="databaseImg.imgibmdb2"></div>
+              <div class="ltitle">
+                <el-tooltip content="db2数据库" placement="bottom" effect="light">
+                  <p class="title">db2</p>
+                </el-tooltip>
+              </div>
+            </div>
+            <div v-if="form.dbType =='5'" class="list"  @click="chooseDbType('5')">
+              <div class="limg"><img :src="databaseImg.imgPostgreSQL"></div>
+              <div class="ltitle">
+                <el-tooltip content="PostgreSQ数据库" placement="bottom" effect="light">
+                  <p class="title">PostgreSQ</p>
+                </el-tooltip>
+              </div>
+            </div>
+            <div v-if="form.dbType =='6'" class="list" @click="chooseDbType('6')">
+              <div class="limg"><img :src="databaseImg.imgSqlserver"></div>
+              <div class="ltitle">
+                <el-tooltip content="Sqlserver数据库" placement="bottom" effect="light">
+                  <p class="title">Sqlserver</p>
+                </el-tooltip>
+              </div>
+            </div>
+            <div v-if="form.dbType =='7'" class="list" @click="chooseDbType('7')">
+              <div class="limg"><img :src="databaseImg.imgkingbase"></div>
+              <div class="ltitle">
+                <el-tooltip content="kingbase数据库" placement="bottom" effect="light">
+                  <p class="title">kingbase</p>
+                </el-tooltip>
+              </div>
+            </div>
+            <div v-if="form.dbType =='10'" class="list"  @click="chooseDbType('10')">
+              <div class="limg"><img :src="databaseImg.imggaussdb"></div>
+              <div class="ltitle">
+                <el-tooltip content="GaussDB数据库" placement="bottom" effect="light">
+                  <p class="title">GaussDB</p>
+                </el-tooltip>
+              </div>
+            </div>
+            <div v-if="form.dbType =='4'" class="list"  @click="chooseDbType('4')">
+              <div class="limg"><img :src="databaseImg.imgdefault"></div>
+              <div class="ltitle">
+                <el-tooltip content="MaxCompute数据库" placement="bottom" effect="light">
+                  <p class="title">MaxCompute</p>
+                </el-tooltip>
+              </div>
+            </div>
+          </div><!--modellist 模型监控列表-->
+        </el-descriptions-item>
+      </el-descriptions>
+      <el-descriptions style="margin-top: 20px" title="连接信息" :column="2" border size="medium">
+        <el-descriptions-item :labelStyle="{width: '200px'}" :contentStyle="{width: '35%'}">
+          <template slot="label">
+            <i class="el-icon-coin"></i>
+            主机
+          </template>
+          {{form2.host}}
+        </el-descriptions-item>
+        <el-descriptions-item :labelStyle="{width: '200px'}">
+          <template slot="label">
+            <i class="el-icon-thumb"></i>
+            端口
+          </template>
+          {{form2.port}}
+        </el-descriptions-item>
+        <el-descriptions-item v-if="form.dbType === '3' || form.dbType === '4'">
+          <template slot="label">
+            <i class="el-icon-user"></i>
+            服务名
+          </template>
+          {{form2.sid}}
+        </el-descriptions-item>
+        <el-descriptions-item >
+          <template slot="label">
+            <i class="el-icon-coin"></i>
+            数据库
+          </template>
+          {{form2.dbName}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-user"></i>
+            用户名
+          </template>
+          {{form2.username}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">
+            <i class="el-icon-s-check"></i>
+            密码
+          </template>
+          {{form2.password}}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-card>
 </template>
 
 <script>
 import { getDataSource, checkConnection, sync, word } from '@/api/metadata/datasource'
+import imgMySQL from '@/assets/database/MySQL.svg'
+import imgMariaDB from '@/assets/database/MariaDB.svg'
+import imgOracle from '@/assets/database/Oracle.svg'
+import imgdm8 from '@/assets/database/dm8.png'
+import imgibmdb2 from '@/assets/database/ibmdb2.png'
+import imgPostgreSQL from '@/assets/database/PostgreSQL.svg'
+import imgSqlserver from '@/assets/database/Sqlserver.svg'
+import imgdefault from '@/assets/database/default.svg'
+import imgkingbase from '@/assets/database/kingbase.png'
+import imggaussdb from '@/assets/database/gaussdb.png'
 
 export default {
   name: 'DataSourceDetail',
@@ -86,6 +203,18 @@ export default {
   data() {
     return {
       title: '数据源详情',
+      databaseImg: {
+        imgMySQL: imgMySQL,
+        imgMariaDB: imgMariaDB,
+        imgOracle: imgOracle,
+        imgdm8: imgdm8,
+        imgibmdb2: imgibmdb2,
+        imgPostgreSQL: imgPostgreSQL,
+        imgSqlserver: imgSqlserver,
+        imgdefault: imgdefault,
+        imgkingbase: imgkingbase,
+        imggaussdb: imggaussdb
+      },
       // 展示切换
       showOptions: {
         data: {},
@@ -129,6 +258,7 @@ export default {
       getDataSource(id).then(response => {
         if (response.success) {
           this.form = response.data
+          console.log('ddd', this.form)
           this.form2 = this.form.dbSchema
         }
       })

src/views/metadata/datasource/DataSourceEdit.vue

@@ -3,73 +3,164 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-if="active == 2" v-hasPerm="['metadata:datasource:edit']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button v-if="active == 3" type="primary" size="mini" icon="el-icon-plus" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button v-if="active != 3" size="mini" type="primary" @click="handleNextStep">下一步</el-button>
+        <el-button v-if="active != 1" size="mini" type="primary" @click="handleLastStep">上一步</el-button>
         <el-button size="mini" icon="el-icon-back" @click="showCard">返回</el-button>
       </el-button-group>
     </div>
     <div class="body-wrapper">
       <el-steps :active="active" finish-status="success" align-center>
-        <el-step title="数据源信息" />
+        <el-step title="填写数据源信息" />
-        <el-step title="连接信息" />
+        <el-step title="选择数据库类型" />
+        <el-step title="填写连接信息" />
       </el-steps>
       <el-form v-if="active == 1" ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="数据源类型" prop="dbType">
+        <div style="padding: 20px 200px">
-          <el-select v-model="form.dbType">
+          <el-form-item label="数据源名称" prop="sourceName">
-            <el-option
+            <el-input v-model="form.sourceName" placeholder="请输入数据源名称" />
-              v-for="item in dbTypeOptions"
+          </el-form-item>
-              :key="item.id"
+          <el-form-item label="状态" prop="status">
-              :label="item.itemValue"
+            <el-radio-group v-model="form.status">
-              :value="item.itemText"
+              <el-radio
-            />
+                v-for="dict in statusOptions"
-          </el-select>
+                :key="dict.id"
-        </el-form-item>
+                :label="dict.itemText"
-        <el-form-item label="数据源名称" prop="sourceName">
+              >{{ dict.itemValue }}</el-radio>
-          <el-input v-model="form.sourceName" placeholder="请输入数据源名称" />
+            </el-radio-group>
-        </el-form-item>
+          </el-form-item>
-        <el-form-item label="状态" prop="status">
+          <el-form-item label="备注" prop="remark">
-          <el-radio-group v-model="form.status">
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-            <el-radio
+          </el-form-item>
-              v-for="dict in statusOptions"
+        </div>
-              :key="dict.id"
-              :label="dict.itemText"
-            >{{ dict.itemValue }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
       </el-form>
-      <el-form v-if="active == 2" ref="form2" :model="form2" :rules="rules2" label-width="80px">
+      <el-form v-if="active == 2" ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="主机" prop="host">
+        <div class="modellist" style="padding: 20px 200px">
-          <el-input v-model="form2.host" placeholder="请输入主机" />
+          <div :class="[form.dbType =='1' ? 'choosedDbType' : '','list']" @click="chooseDbType('1')">
-        </el-form-item>
+            <div class="limg"><img :src="databaseImg.imgMySQL"></div>
-        <el-form-item label="端口" prop="port">
+            <div class="ltitle">
-          <el-input v-model="form2.port" placeholder="请输入端口" />
+              <el-tooltip content="mysql数据库" placement="bottom" effect="light">
-        </el-form-item>
+                <p class="title">mysql</p>
-        <el-form-item v-if="form.dbType === '3' || form.dbType === '4'" label="服务名" prop="sid">
+              </el-tooltip>
-          <el-input v-model="form2.sid" placeholder="请输入服务名" />
+            </div>
-        </el-form-item>
+          </div>
-        <el-form-item v-if="form.dbType !== '3' && form.dbType !== '4'" label="数据库" prop="dbName">
+          <div :class="[form.dbType =='2' ? 'choosedDbType' : '','list']" @click="chooseDbType('2')">
-          <el-input v-model="form2.dbName" placeholder="请输入数据库" />
+            <div class="limg"><img :src="databaseImg.imgMariaDB"></div>
-        </el-form-item>
+            <div class="ltitle">
-        <el-form-item label="用户名" prop="username">
+              <el-tooltip content="mariadb-3.0.3数据库" placement="bottom" effect="light">
-          <el-input v-model="form2.username" placeholder="请输入用户名" />
+                <p class="title">mariadb-3.0.3</p>
-        </el-form-item>
+              </el-tooltip>
-        <el-form-item label="密码" prop="password">
+            </div>
-          <el-input v-model="form2.password" placeholder="请输入密码" />
+          </div>
-        </el-form-item>
+          <div :class="[form.dbType =='3' ? 'choosedDbType' : '','list']" @click="chooseDbType('3')">
-        <el-form-item>
+            <div class="limg"><img :src="databaseImg.imgOracle"></div>
-          <el-button v-hasPerm="['metadata:datasource:connect']" size="mini" type="primary" @click="handleCheckConnection">连通性检测</el-button>
+            <div class="ltitle">
-        </el-form-item>
+              <el-tooltip content="oracle数据库" placement="bottom" effect="light">
+                <p class="title">oracle</p>
+              </el-tooltip>
+            </div>
+          </div>
+          <div :class="[form.dbType =='9' ? 'choosedDbType' : '','list']" @click="chooseDbType('9')">
+            <div class="limg"><img :src="databaseImg.imgdm8"></div>
+            <div class="ltitle">
+              <el-tooltip content="dm数据库" placement="bottom" effect="light">
+                <p class="title">dm</p>
+              </el-tooltip>
+            </div>
+          </div>
+          <div :class="[form.dbType =='8' ? 'choosedDbType' : '','list']" @click="chooseDbType('8')">
+            <div class="limg"><img :src="databaseImg.imgibmdb2"></div>
+            <div class="ltitle">
+              <el-tooltip content="db2数据库" placement="bottom" effect="light">
+                <p class="title">db2</p>
+              </el-tooltip>
+            </div>
+          </div>
+          <div :class="[form.dbType =='5' ? 'choosedDbType' : '','list']" @click="chooseDbType('5')">
+            <div class="limg"><img :src="databaseImg.imgPostgreSQL"></div>
+            <div class="ltitle">
+              <el-tooltip content="PostgreSQ数据库" placement="bottom" effect="light">
+                <p class="title">PostgreSQ</p>
+              </el-tooltip>
+            </div>
+          </div>
+          <div :class="[form.dbType =='6' ? 'choosedDbType' : '','list']" @click="chooseDbType('6')">
+            <div class="limg"><img :src="databaseImg.imgSqlserver"></div>
+            <div class="ltitle">
+              <el-tooltip content="Sqlserver数据库" placement="bottom" effect="light">
+                <p class="title">Sqlserver</p>
+              </el-tooltip>
+            </div>
+          </div>
+          <div :class="[form.dbType =='7' ? 'choosedDbType' : '','list']" @click="chooseDbType('7')">
+            <div class="limg"><img :src="databaseImg.imgkingbase"></div>
+            <div class="ltitle">
+              <el-tooltip content="kingbase数据库" placement="bottom" effect="light">
+                <p class="title">kingbase</p>
+              </el-tooltip>
+            </div>
+          </div>
+          <div :class="[form.dbType =='10' ? 'choosedDbType' : '','list']" @click="chooseDbType('10')">
+            <div class="limg"><img :src="databaseImg.imggaussdb"></div>
+            <div class="ltitle">
+              <el-tooltip content="GaussDB数据库" placement="bottom" effect="light">
+                <p class="title">GaussDB</p>
+              </el-tooltip>
+            </div>
+          </div>
+          <div :class="[form.dbType =='4' ? 'choosedDbType' : '','list']" @click="chooseDbType('4')">
+            <div class="limg"><img :src="databaseImg.imgdefault"></div>
+            <div class="ltitle">
+              <el-tooltip content="MaxCompute数据库" placement="bottom" effect="light">
+                <p class="title">MaxCompute</p>
+              </el-tooltip>
+            </div>
+          </div>
+        </div><!--modellist 模型监控列表-->
+
+      </el-form>
+      <el-form v-if="active == 3" ref="form2" :model="form2" :rules="rules2" label-width="80px">
+        <div style="padding: 20px 200px">
+          <el-form-item label="主机" prop="host">
+            <el-input v-model="form2.host" placeholder="请输入主机" />
+          </el-form-item>
+          <el-form-item label="端口" prop="port">
+            <el-input v-model="form2.port" placeholder="请输入端口" />
+          </el-form-item>
+          <el-form-item v-if="form.dbType === '3' || form.dbType === '4'" label="服务名" prop="sid">
+            <el-input v-model="form2.sid" placeholder="请输入服务名" />
+          </el-form-item>
+          <el-form-item v-if="form.dbType !== '3' && form.dbType !== '4'" label="数据库" prop="dbName">
+            <el-input v-model="form2.dbName" placeholder="请输入数据库" />
+          </el-form-item>
+          <el-form-item label="用户名" prop="username">
+            <el-input v-model="form2.username" placeholder="请输入用户名" />
+          </el-form-item>
+          <el-form-item label="密码" prop="password">
+            <el-input v-model="form2.password" placeholder="请输入密码" />
+          </el-form-item>
+          <el-form-item>
+            <el-button size="mini" type="primary" @click="handleCheckConnection">连通性检测</el-button>
+          </el-form-item>
+        </div>
       </el-form>
-      <el-button v-if="active == 1" style="margin-top: 12px;" @click="handleNextStep">下一步</el-button>
-      <el-button v-if="active == 2" style="margin-top: 12px;" @click="handleLastStep">上一步</el-button>
     </div>
   </el-card>
 </template>
 
 <script>
 import { getDataSource, updateDataSource, checkConnection } from '@/api/metadata/datasource'
+import { editDataSource } from '@/api/datamodel/model'
+import imgMySQL from '@/assets/database/MySQL.svg'
+import imgMariaDB from '@/assets/database/MariaDB.svg'
+import imgOracle from '@/assets/database/Oracle.svg'
+import imgdm8 from '@/assets/database/dm8.png'
+import imgibmdb2 from '@/assets/database/ibmdb2.png'
+import imgPostgreSQL from '@/assets/database/PostgreSQL.svg'
+import imgSqlserver from '@/assets/database/Sqlserver.svg'
+import imgdefault from '@/assets/database/default.svg'
+import imgkingbase from '@/assets/database/kingbase.png'
+import imggaussdb from '@/assets/database/gaussdb.png'
 
 export default {
   name: 'DataSourceEdit',
@@ -84,6 +175,19 @@ export default {
   data() {
     return {
       title: '数据源编辑',
+      databaseImg: {
+        isActive: true,
+        imgMySQL: imgMySQL,
+        imgMariaDB: imgMariaDB,
+        imgOracle: imgOracle,
+        imgdm8: imgdm8,
+        imgibmdb2: imgibmdb2,
+        imgPostgreSQL: imgPostgreSQL,
+        imgSqlserver: imgSqlserver,
+        imgdefault: imgdefault,
+        imgkingbase: imgkingbase,
+        imggaussdb: imggaussdb
+      },
       // 展示切换
       showOptions: {
         data: {},
@@ -202,6 +306,7 @@ export default {
           updateDataSource(this.form).then(response => {
             if (response.success) {
               this.$message.success('保存成功')
+              this.updateModelDataSource()
               setTimeout(() => {
                 // 2秒后跳转列表页
                 this.$emit('showCard', this.showOptions)
@@ -219,6 +324,21 @@ export default {
           })
         }
       })
+    },
+    updateModelDataSource() {
+      const dbType = this.form.dbType
+      const dataSource = {
+        projectId: this.form2.dbName,
+        databaseName: this.form2.dbName,
+        schemaName: this.form2.schema === '' ? this.form2.dbName : this.form2.schema,
+        databaseType: dbType,
+        url: this.form2.host + ':' + this.form2.port + '/' + this.form2.dbName,
+        username: this.form2.username,
+        password: this.form2.password
+      }
+      editDataSource(dataSource).then(() => {
+      }).catch(() => {
+      })
     }
   }
 }
@@ -229,4 +349,7 @@ export default {
   height: calc(100vh - 230px);
   overflow-y: auto;
 }
+.choosedDbType{
+  border: 1px solid #165DFF;
+}
 </style>

src/views/metadata/datasource/DataSourceList.vue

@@ -20,14 +20,12 @@
       <el-col :span="12">
         <el-button-group>
           <el-button
-            v-hasPerm="['metadata:datasource:add']"
             type="primary"
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
           >新增</el-button>
           <el-button
-            v-hasPerm="['metadata:datasource:refresh']"
             type="warning"
             icon="el-icon-refresh"
             size="mini"
@@ -103,21 +101,18 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            v-hasPerm="['metadata:datasource:edit']"
             size="mini"
             type="text"
             icon="el-icon-edit-outline"
             @click="handleEdit(scope.row)"
           >修改</el-button>
           <el-button
-            v-hasPerm="['metadata:datasource:detail']"
             size="mini"
             type="text"
             icon="el-icon-view"
             @click="handleDetail(scope.row)"
           >详情</el-button>
           <el-button
-            v-hasPerm="['metadata:datasource:remove']"
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -146,7 +141,7 @@ export default {
   name: 'DataSourceList',
   data() {
     return {
-      tableHeight: document.body.offsetHeight - 310 + 'px',
+      tableHeight: document.body.offsetHeight - 330 + 'px',
       // 展示切换
       showOptions: {
         data: {},
@@ -160,6 +155,12 @@ export default {
       // 表格头
       tableColumns: [
         { prop: 'sourceName', label: '数据源名称', show: true },
+        {
+          prop: 'dbType',
+          label: '数据库类型',
+          show: true,
+          formatter: this.dbTypeFormatter
+        },
         {
           prop: 'isSync',
           label: '同步状态',
@@ -179,6 +180,7 @@ export default {
       tableSize: 'medium',
       // 状态数据字典
       statusOptions: [],
+      dbTypeOptions: [],
       // 数据源表格数据
       dataSourceList: [],
       // 总数据条数
@@ -197,6 +199,11 @@ export default {
         this.statusOptions = response.data
       }
     })
+    this.getDicts('data_db_type').then(response => {
+      if (response.success) {
+        this.dbTypeOptions = response.data
+      }
+    })
     this.getList()
   },
   mounted() {
@@ -312,6 +319,10 @@ export default {
       this.queryParams.pageNum = val
       this.getList()
     },
+    dbTypeFormatter(row, column, cellValue, index) {
+      const dictLabel = this.selectDictLabel(this.dbTypeOptions, cellValue)
+      return dictLabel
+    },
     syncFormatter(row, column, cellValue, index) {
       if (cellValue === '0') {
         return <el-tag type='warning'>未同步</el-tag>

src/views/metadata/offlinedata/OfflineDataList.vue

@@ -0,0 +1,327 @@
+<template>
+  <el-card class="box-card" shadow="always">
+    <el-form ref="queryForm" :model="queryParams" :inline="true">
+      <el-form-item label="离线文件名称" prop="sourceName">
+        <el-input
+          v-model="queryParams.fileName"
+          placeholder="请输入离线文件名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row type="flex" justify="space-between">
+      <el-col :span="12">
+        <el-button-group>
+          <el-upload
+            class="upload-demo"
+            action="#"
+            :show-file-list="false"
+            :http-request="uploadOfflineFile">
+            <el-button size="mini" type="primary"  icon="el-icon-upload2">上传</el-button>
+          </el-upload>
+        </el-button-group>
+      </el-col>
+      <el-col :span="12">
+        <div class="right-toolbar">
+          <el-tooltip content="密度" effect="dark" placement="top">
+            <el-dropdown trigger="click" @command="handleCommand">
+              <el-button circle size="mini">
+                <i class="el-icon-s-grid"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="medium">正常</el-dropdown-item>
+                <el-dropdown-item command="small">中等</el-dropdown-item>
+                <el-dropdown-item command="mini">紧凑</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-tooltip>
+          <el-tooltip content="刷新" effect="dark" placement="top">
+            <el-button circle size="mini" @click="handleRefresh">
+              <i class="el-icon-refresh"></i>
+            </el-button>
+          </el-tooltip>
+          <el-tooltip content="列设置" effect="dark" placement="top">
+            <el-popover placement="bottom" width="100" trigger="click">
+              <el-checkbox-group v-model="checkedTableColumns" @change="handleCheckedColsChange">
+                <el-checkbox
+                  v-for="(item, index) in tableColumns"
+                  :key="index"
+                  :label="item.prop"
+                >{{ item.label }}</el-checkbox>
+              </el-checkbox-group>
+              <span slot="reference">
+                <el-button circle size="mini">
+                  <i class="el-icon-setting"></i>
+                </el-button>
+              </span>
+            </el-popover>
+          </el-tooltip>
+        </div>
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="tableDataList"
+      border
+      tooltip-effect="dark"
+      :size="tableSize"
+      :height="tableHeight"
+      style="width: 100%;margin: 15px 0;"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" width="55" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.$index +1 }}</span>
+        </template>
+      </el-table-column>
+      <template v-for="(item, index) in tableColumns">
+        <el-table-column
+          v-if="item.show"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :formatter="item.formatter"
+          align="center"
+          show-overflow-tooltip
+        />
+      </template>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-sort"
+            @click="handleEdit(scope.row)"
+          >执行接入</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleEdit(scope.row)"
+          >接入详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-download"
+            @click="handleDownload(scope.row)"
+          >下载</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDetail(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-pagination
+      :page-sizes="[10, 20, 50, 100]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :current-page.sync="queryParams.pageNum"
+      :page-size.sync="queryParams.pageSize"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </el-card>
+</template>
+
+<script>
+  import { pageOfflineData, delDataSource, uploadFile } from '@/api/metadata/datasource'
+
+  export default {
+    name: 'OfflineDataList',
+    data() {
+      return {
+        tableHeight: document.body.offsetHeight - 330 + 'px',
+        // 展示切换
+        showOptions: {
+          data: {},
+          showList: true,
+          showAdd: false,
+          showEdit: false,
+          showDetail: false
+        },
+        // 遮罩层
+        loading: true,
+        // 表格头
+        tableColumns: [
+          { prop: 'fileName', label: '离线文件名称', show: true },
+          {
+            prop: 'offlineType',
+            label: '离线文件类型',
+            show: true,
+            formatter: this.offlineTypeeFormatter
+          },
+          {
+            prop: 'isSwitch',
+            label: '接入状态',
+            show: true,
+            formatter: this.isSwitchFormatter
+          },
+          { prop: 'createTime', label: '上传时间', show: true },
+          { prop: 'switchTime', label: '接入时间', show: true }
+        ],
+        // 默认选择中表格头
+        checkedTableColumns: [],
+        tableSize: 'medium',
+        // 状态数据字典
+        statusOptions: [],
+        dbTypeOptions: [],
+        // 数据源表格数据
+        tableDataList: [],
+        // 总数据条数
+        total: 0,
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 20,
+          fileName: ''
+        }
+      }
+    },
+    created() {
+      this.getDicts('sys_common_status').then(response => {
+        if (response.success) {
+          this.statusOptions = response.data
+        }
+      })
+      this.getDicts('data_db_type').then(response => {
+        if (response.success) {
+          this.dbTypeOptions = response.data
+        }
+      })
+      this.getList()
+    },
+    mounted() {
+      this.initCols()
+    },
+    methods: {
+      /** 查询数据源列表 */
+      getList() {
+        this.loading = true
+        pageOfflineData(this.queryParams).then(response => {
+          this.loading = false
+          if (response.success) {
+            const { data } = response
+            this.tableDataList = data.data
+            this.total = data.total
+          }
+        })
+      },
+      initCols() {
+        this.checkedTableColumns = this.tableColumns.map(col => col.prop)
+      },
+      handleCheckedColsChange(val) {
+        this.tableColumns.forEach(col => {
+          if (!this.checkedTableColumns.includes(col.prop)) {
+            col.show = false
+          } else {
+            col.show = true
+          }
+        })
+      },
+      handleCommand(command) {
+        this.tableSize = command
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1
+        this.getList()
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 20,
+          fileName: ''
+        }
+        this.handleQuery()
+      },
+      /** 刷新列表 */
+      handleRefresh() {
+        this.getList()
+      },
+      handleUpload() {
+
+      },
+      handleDownload(row) {
+
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        this.$confirm('选中数据将被永久删除, 是否继续？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          delDataSource(row.id).then(response => {
+            if (response.success) {
+              this.$message.success('删除成功')
+              this.getList()
+            }
+          })
+        }).catch(() => {
+        })
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.queryParams.pageNum = 1
+        this.queryParams.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        console.log(`当前页: ${val}`)
+        this.queryParams.pageNum = val
+        this.getList()
+      },
+      offlineTypeeFormatter(row, column, cellValue, index) {
+        if (cellValue === 'sjy') {
+          return '数据源文件'
+        } else if (cellValue === 'sj') {
+          return '数据文件'
+        }
+      },
+      isSwitchFormatter(row, column, cellValue, index) {
+        if (cellValue === 'djr') {
+          return <el-tag type='info'>待接入</el-tag>
+        } else if (cellValue === 'jrcg') {
+          return <el-tag type='success'>接入成功</el-tag>
+        } else if (cellValue === 'jrsb') {
+          return <el-tag type='error'>接入失败</el-tag>
+        }
+      },
+      uploadOfflineFile(file){
+        this.formData = new FormData()
+        this.formData.append('file', file.file)
+        // 请求接口
+        uploadFile(this.formData, 'sjy').then((response) => {
+          if (response.success) {
+            this.$message.success('上传成功')
+          } else {
+            this.$message.error('上传失败')
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .right-toolbar {
+    float: right;
+  }
+  .el-card ::v-deep .el-card__body {
+    height: calc(100vh - 170px);
+  }
+</style>
+

src/views/metadata/offlinedata/index.vue

@@ -0,0 +1,33 @@
+<template>
+  <div class="app-container">
+    <transition name="el-zoom-in-center">
+      <offline-data-list v-if="options.showList" @showCard="showCard" />
+    </transition>
+  </div>
+</template>
+
+<script>
+  import OfflineDataList from './OfflineDataList'
+
+  export default {
+    name: 'OfflineData',
+    components: { OfflineDataList },
+    data() {
+      return {
+        options: {
+          data: {},
+          showList: true
+        }
+      }
+    },
+    methods: {
+      showCard(data) {
+        Object.assign(this.options, data)
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/quality/checkcontentrule/CheckContentRuleAdd.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['quality:rule:add']" type="primary" size="mini" icon="el-icon-finished" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button  type="primary" size="mini" icon="el-icon-finished" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/quality/checkcontentrule/CheckContentRuleEdit.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['quality:rule:edit']" type="primary" size="mini" icon="el-icon-finished" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-finished" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/quality/checkcontentrule/CheckContentRuleList.vue

@@ -65,7 +65,6 @@
           <el-col :span="12">
             <el-button-group>
               <el-button
-                v-hasPerm="['quality:rule:add']"
                 type="primary"
                 icon="el-icon-plus"
                 size="mini"
@@ -142,21 +141,18 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
             <template slot-scope="scope">
               <el-button
-                v-hasPerm="['quality:rule:edit']"
                 size="mini"
                 type="text"
                 icon="el-icon-edit-outline"
                 @click="handleEdit(scope.row)"
               >修改</el-button>
               <el-button
-                v-hasPerm="['quality:rule:detail']"
                 size="mini"
                 type="text"
                 icon="el-icon-view"
                 @click="handleDetail(scope.row)"
               >详情</el-button>
               <el-button
-                v-hasPerm="['quality:rule:remove']"
                 size="mini"
                 type="text"
                 icon="el-icon-delete"

src/views/quality/checkrule/CheckRuleEdit.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['quality:rule:edit']" type="primary" size="mini" icon="el-icon-finished" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-finished" :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/quality/checkrule/CheckRuleList.vue

@@ -65,7 +65,6 @@
           <el-col :span="12">
             <el-button-group>
               <el-button
-                v-hasPerm="['quality:rule:add']"
                 type="primary"
                 icon="el-icon-plus"
                 size="mini"
@@ -151,21 +150,18 @@
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
             <template slot-scope="scope">
               <el-button
-                v-hasPerm="['quality:rule:edit']"
                 size="mini"
                 type="text"
                 icon="el-icon-edit-outline"
                 @click="handleEdit(scope.row)"
               >修改</el-button>
               <el-button
-                v-hasPerm="['quality:rule:detail']"
                 size="mini"
                 type="text"
                 icon="el-icon-view"
                 @click="handleDetail(scope.row)"
               >详情</el-button>
               <el-button
-                v-hasPerm="['quality:rule:remove']"
                 size="mini"
                 type="text"
                 icon="el-icon-delete"

src/views/quality/checkstat/CheckStatList.vue

@@ -69,7 +69,6 @@
           </template><el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
           <template slot-scope="scope">
             <el-button
-              v-hasPerm="['quality:rule:detail']"
               size="mini"
               type="text"
               icon="el-icon-view"

src/views/standard/datadict/DataDictAdd.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['standard:dict:add']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button  size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/standard/datadict/DataDictEdit.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['standard:dict:edit']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/standard/datadict/DataDictList.vue

@@ -18,9 +18,9 @@
               <span class="custom-tree-node" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                 <span><i v-if="node.level === 1" class="iconfont icon-zuzhi tree-folder" />{{ node.label }}</span>
                 <span class="tree-bts">
-                  <i v-show="!data.id && data.show" v-hasPerm="['standard:type:add']" class="el-icon-circle-plus-outline bt-add" @click="() => handleAddType()" />
+                  <i v-show="!data.id && data.show" class="el-icon-circle-plus-outline bt-add" @click="() => handleAddType()" />
-                  <i v-show="data.id && data.show" v-hasPerm="['standard:type:edit']" class="el-icon-edit-outline bt-edit" @click="() => handleEditType(data)" />
+                  <i v-show="data.id && data.show" class="el-icon-edit-outline bt-edit" @click="() => handleEditType(data)" />
-                  <i v-show="data.id && data.show" v-hasPerm="['standard:type:remove']" class="el-icon-delete bt-delete" @click="() => handleDelType(data)" />
+                  <i v-show="data.id && data.show" class="el-icon-delete bt-delete" @click="() => handleDelType(data)" />
                 </span>
               </span>
             </template>
@@ -59,14 +59,12 @@
           <el-col :span="12">
             <el-button-group>
               <el-button
-                v-hasPerm="['standard:dict:add']"
                 type="primary"
                 icon="el-icon-plus"
                 size="mini"
                 @click="handleAdd"
               >新增</el-button>
               <el-button
-                v-hasPerm="['standard:dict:refresh']"
                 type="warning"
                 icon="el-icon-refresh"
                 size="mini"
@@ -146,21 +144,18 @@
                 trigger="click"
               >
                 <el-button
-                  v-hasPerm="['standard:dict:edit']"
                   size="mini"
                   type="text"
                   icon="el-icon-edit-outline"
                   @click="handleEdit(scope.row)"
                 >修改</el-button>
                 <el-button
-                  v-hasPerm="['standard:dict:detail']"
                   size="mini"
                   type="text"
                   icon="el-icon-view"
                   @click="handleDetail(scope.row)"
                 >详情</el-button>
                 <el-button
-                  v-hasPerm="['standard:dict:remove']"
                   size="mini"
                   type="text"
                   icon="el-icon-delete"

src/views/standard/dictcontrast/DictContrastAdd.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['standard:contrast:dict:add']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/standard/dictcontrast/DictContrastEdit.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['standard:contrast:dict:edit']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/standard/dictcontrast/DictContrastList.vue

@@ -18,9 +18,9 @@
               <span class="custom-tree-node" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                 <span><i v-if="node.level === 1" class="iconfont icon-zuzhi tree-folder" />{{ data.name ? node.label + '(' + data.name + ')' : node.label }}</span>
                 <span class="tree-bts">
-                  <i v-show="node.level === 1 && data.show" v-hasPerm="['standard:contrast:add']" class="el-icon-circle-plus-outline bt-add" @click="() => handleAddContrast()" />
+                  <i v-show="node.level === 1 && data.show"  class="el-icon-circle-plus-outline bt-add" @click="() => handleAddContrast()" />
-                  <i v-show="node.level === 4 && data.show" v-hasPerm="['standard:contrast:edit']" class="el-icon-edit-outline bt-edit" @click="() => handleEditContrast(data)" />
+                  <i v-show="node.level === 4 && data.show"  class="el-icon-edit-outline bt-edit" @click="() => handleEditContrast(data)" />
-                  <i v-show="node.level === 4 && data.show" v-hasPerm="['standard:contrast:remove']" class="el-icon-delete bt-delete" @click="() => handleDelContrast(data)" />
+                  <i v-show="node.level === 4 && data.show"  class="el-icon-delete bt-delete" @click="() => handleDelContrast(data)" />
                 </span>
               </span>
             </template>
@@ -59,7 +59,6 @@
           <el-col :span="12">
             <el-button-group>
               <el-button
-                v-hasPerm="['standard:contrast:dict:add']"
                 type="primary"
                 icon="el-icon-plus"
                 size="mini"
@@ -139,21 +138,18 @@
                 trigger="click"
               >
                 <el-button
-                  v-hasPerm="['standard:contrast:dict:edit']"
                   size="mini"
                   type="text"
                   icon="el-icon-edit-outline"
                   @click="handleEdit(scope.row)"
                 >修改</el-button>
                 <el-button
-                  v-hasPerm="['standard:contrast:dict:detail']"
                   size="mini"
                   type="text"
                   icon="el-icon-view"
                   @click="handleDetail(scope.row)"
                 >详情</el-button>
                 <el-button
-                  v-hasPerm="['standard:contrast:dict:remove']"
                   size="mini"
                   type="text"
                   icon="el-icon-delete"

src/views/standard/dictmapping/index.vue

@@ -28,8 +28,8 @@
         <el-card class="box-card" shadow="always">
           <el-row>
             <el-col :span="24">
-              <el-button v-hasPerm="['standard:mapping:auto']" type="primary" size="mini" @click="handleAuto">自动对照</el-button>
+              <el-button type="primary" size="mini" @click="handleAuto">自动对照</el-button>
-              <el-button v-hasPerm="['standard:mapping:manual']" type="primary" size="mini" @click="handleManual">手动对照</el-button>
+              <el-button type="primary" size="mini" @click="handleManual">手动对照</el-button>
             </el-col>
           </el-row>
           <el-row>
@@ -73,7 +73,7 @@
                     <td>{{ data.colCode }}</td>
                     <td>{{ data.colName }}</td>
                     <td>{{ data.contrastGbCode }}</td>
-                    <td><span v-if="data.contrastGbId" v-hasPerm="['standard:mapping:cancel']" style="padding-right: 10px;" @click="handleCancel(data.id)"><i class="el-icon-circle-close" style="color: red" /></span>{{ data.contrastGbName }}</td>
+                    <td><span v-if="data.contrastGbId" style="padding-right: 10px;" @click="handleCancel(data.id)"><i class="el-icon-circle-close" style="color: red" /></span>{{ data.contrastGbName }}</td>
                   </tr>
                 </tbody>
               </table>

src/views/visual/databoard/DataBoardBuild.vue

@@ -23,7 +23,7 @@
           <el-button icon="el-icon-delete" type="text" @click="handleReset">
             重置
           </el-button>
-          <el-button v-hasPerm="['visual:board:build']" icon="el-icon-plus" type="text" @click="handleSubmit">
+          <el-button icon="el-icon-plus" type="text" @click="handleSubmit">
             保存
           </el-button>
           <el-button icon="el-icon-close" type="text" @click="handleCancel">

src/views/visual/databoard/DataBoardList.vue

@@ -15,7 +15,7 @@
     </el-row>
     <el-divider />
     <el-row :gutter="20">
-      <el-col v-hasPerm="['visual:board:add']" :span="6" class="box-card-col">
+      <el-col :span="6" class="box-card-col">
         <el-card :body-style="{ padding: '0px' }" class="box-card-item">
           <div class="box-card-item-add" @click="handleAdd">
             <div class="icon-block">
@@ -33,16 +33,16 @@
               </div>
             </el-image>
             <div class="box-card-item-edit" :style="{display: (item.show ? 'block' : 'none')}">
-              <el-button v-hasPerm="['visual:board:build']" type="primary" @click="handleConfig(item)">编辑</el-button>
+              <el-button  type="primary" @click="handleConfig(item)">编辑</el-button>
             </div>
           </div>
           <div class="box-card-item-footer">
             <div class="box-card-item-footer-text">{{ item.boardName }}</div>
             <div class="clearfix">
-              <i v-hasPerm="['visual:board:edit']" class="el-icon-edit-outline" @click="handleEdit(item)" />
+              <i class="el-icon-edit-outline" @click="handleEdit(item)" />
-              <i v-hasPerm="['visual:board:preview']" class="el-icon-view" @click="handleView(item)" />
+              <i class="el-icon-view" @click="handleView(item)" />
-              <i v-hasPerm="['visual:board:remove']" class="el-icon-delete" @click="handleDelete(item)" />
+              <i class="el-icon-delete" @click="handleDelete(item)" />
-              <i v-hasPerm="['visual:board:copy']" class="el-icon-copy-document" @click="handleCopy(item)" />
+              <i  class="el-icon-copy-document" @click="handleCopy(item)" />
             </div>
           </div>
         </el-card>

src/views/visual/datachart/DataChartBuild.vue

@@ -35,7 +35,7 @@
           <el-button icon="el-icon-delete" type="text" @click="handleReset">
             重置
           </el-button>
-          <el-button v-hasPerm="['visual:chart:build']" icon="el-icon-plus" type="text" @click="handleSubmit">
+          <el-button icon="el-icon-plus" type="text" @click="handleSubmit">
             保存
           </el-button>
           <el-button icon="el-icon-close" type="text" @click="handleCancel">

src/views/visual/datachart/DataChartList.vue

@@ -15,7 +15,7 @@
     </el-row>
     <el-divider />
     <el-row :gutter="20">
-      <el-col v-hasPerm="['visual:chart:add']" class="box-card-col">
+      <el-col class="box-card-col">
         <el-card :body-style="{ padding: '0px' }" class="box-card-item">
           <div class="box-card-item-add" @click="handleAdd">
             <div class="icon-block">
@@ -33,15 +33,15 @@
               </div>
             </el-image>
             <div class="box-card-item-edit" :style="{display: (item.show ? 'block' : 'none')}">
-              <el-button v-hasPerm="['visual:chart:build']" type="primary" @click="handleConfig(item)">编辑</el-button>
+              <el-button type="primary" @click="handleConfig(item)">编辑</el-button>
             </div>
           </div>
           <div class="box-card-item-footer">
             <span class="box-card-item-footer-text">{{ item.chartName }}</span>
             <div class="clearfix">
-              <i v-hasPerm="['visual:chart:edit']" class="el-icon-edit-outline" @click="handleEdit(item)" />
+              <i class="el-icon-edit-outline" @click="handleEdit(item)" />
-              <i v-hasPerm="['visual:chart:remove']" class="el-icon-delete" @click="handleDelete(item)" />
+              <i class="el-icon-delete" @click="handleDelete(item)" />
-              <i v-hasPerm="['visual:chart:copy']" class="el-icon-copy-document" @click="handleCopy(item)" />
+              <i class="el-icon-copy-document" @click="handleCopy(item)" />
             </div>
           </div>
         </el-card>

src/views/visual/datascreen/DataScreenBuild.vue

@@ -22,7 +22,7 @@
           <el-button icon="el-icon-delete" type="text" @click="handleReset">
             重置
           </el-button>
-          <el-button v-hasPerm="['visual:screen:build']" icon="el-icon-plus" type="text" @click="handleSubmit">
+          <el-button icon="el-icon-plus" type="text" @click="handleSubmit">
             保存
           </el-button>
           <el-button icon="el-icon-close" type="text" @click="handleCancel">

src/views/visual/datascreen/DataScreenList.vue

@@ -15,7 +15,7 @@
     </el-row>
     <el-divider />
     <el-row :gutter="20">
-      <el-col v-hasPerm="['visual:screen:add']" :span="6" class="box-card-col">
+      <el-col :span="6" class="box-card-col">
         <el-card :body-style="{ padding: '0px' }" class="box-card-item">
           <div class="box-card-item-add" @click="handleAdd">
             <div class="icon-block">
@@ -33,16 +33,16 @@
               </div>
             </el-image>
             <div class="box-card-item-edit" :style="{display: (item.show ? 'block' : 'none')}">
-              <el-button v-hasPerm="['visual:screen:build']" type="primary" @click="handleConfig(item)">编辑</el-button>
+              <el-button type="primary" @click="handleConfig(item)">编辑</el-button>
             </div>
           </div>
           <div class="box-card-item-footer">
             <div class="box-card-item-footer-text">{{ item.screenName }}</div>
             <div class="clearfix">
-              <i v-hasPerm="['visual:screen:edit']" class="el-icon-edit-outline" @click="handleEdit(item)" />
+              <i class="el-icon-edit-outline" @click="handleEdit(item)" />
-              <i v-hasPerm="['visual:screen:preview']" class="el-icon-view" @click="handleView(item)" />
+              <i class="el-icon-view" @click="handleView(item)" />
-              <i v-hasPerm="['visual:screen:remove']" class="el-icon-delete" @click="handleDelete(item)" />
+              <i class="el-icon-delete" @click="handleDelete(item)" />
-              <i v-hasPerm="['visual:screen:copy']" class="el-icon-copy-document" @click="handleCopy(item)" />
+              <i class="el-icon-copy-document" @click="handleCopy(item)" />
             </div>
           </div>
         </el-card>

src/views/visual/dataset/DataSetAdd.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['visual:chart:add']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>
@@ -37,7 +37,7 @@
         <el-form-item>
           <el-button size="mini" type="primary" @click="formaterSql">Sql格式化</el-button>
           <el-button size="mini" type="primary" @click="analyseSql">Sql解析</el-button>
-          <el-button v-hasPerm="['visual:set:preview']" size="mini" type="primary" @click="dataPreview">数据预览</el-button>
+          <el-button size="mini" type="primary" @click="dataPreview">数据预览</el-button>
         </el-form-item>
         <el-divider content-position="left">数据模型定义</el-divider>
         <el-row style="height: 300px;padding: 0 20px;">

src/views/visual/dataset/DataSetDetail.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['visual:set:preview']" size="mini" icon="el-icon-s-data" round @click="dataPreview">数据预览</el-button>
+        <el-button size="mini" icon="el-icon-s-data" round @click="dataPreview">数据预览</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/visual/dataset/DataSetEdit.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['visual:chart:edit']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>
@@ -37,7 +37,7 @@
         <el-form-item>
           <el-button size="mini" type="primary" @click="formaterSql">Sql格式化</el-button>
           <el-button size="mini" type="primary" @click="analyseSql">Sql解析</el-button>
-          <el-button v-hasPerm="['visual:set:preview']" size="mini" type="primary" @click="dataPreview">数据预览</el-button>
+          <el-button  size="mini" type="primary" @click="dataPreview">数据预览</el-button>
         </el-form-item>
         <el-divider content-position="left">数据模型定义</el-divider>
         <el-row style="height: 300px;padding: 0 20px;">

src/views/visual/dataset/DataSetList.vue

@@ -20,7 +20,6 @@
       <el-col :span="12">
         <el-button-group>
           <el-button
-            v-hasPerm="['visual:set:add']"
             type="primary"
             icon="el-icon-plus"
             size="mini"
@@ -100,21 +99,18 @@
             trigger="click"
           >
             <el-button
-              v-hasPerm="['visual:set:edit']"
               size="mini"
               type="text"
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             >修改</el-button>
             <el-button
-              v-hasPerm="['visual:set:detail']"
               size="mini"
               type="text"
               icon="el-icon-view"
               @click="handleDetail(scope.row)"
             >详情</el-button>
             <el-button
-              v-hasPerm="['visual:set:remove']"
               size="mini"
               type="text"
               icon="el-icon-delete"

src/views/workflow/business/BusinessAdd.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['workflow:business:add']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/workflow/business/BusinessEdit.vue

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ title }}</span>
       <el-button-group style="float: right;">
-        <el-button v-hasPerm="['workflow:business:edit']" size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
+        <el-button size="mini" icon="el-icon-plus" round :loading="loadingOptions.loading" :disabled="loadingOptions.isDisabled" @click="submitForm">{{ loadingOptions.loadingText }}</el-button>
         <el-button size="mini" icon="el-icon-back" round @click="showCard">返回</el-button>
       </el-button-group>
     </div>

src/views/workflow/business/BusinessList.vue

@@ -20,14 +20,12 @@
       <el-col :span="12">
         <el-button-group>
           <el-button
-            v-hasPerm="['workflow:business:add']"
             type="primary"
             icon="el-icon-plus"
             size="mini"
             @click="handleAdd"
           >新增</el-button>
           <el-button
-            v-hasPerm="['workflow:business:refresh']"
             type="warning"
             icon="el-icon-refresh"
             size="mini"
@@ -107,21 +105,18 @@
             trigger="click"
           >
             <el-button
-              v-hasPerm="['workflow:business:edit']"
               size="mini"
               type="text"
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             >修改</el-button>
             <el-button
-              v-hasPerm="['workflow:business:detail']"
               size="mini"
               type="text"
               icon="el-icon-view"
               @click="handleDetail(scope.row)"
             >详情</el-button>
             <el-button
-              v-hasPerm="['workflow:business:remove']"
               size="mini"
               type="text"
               icon="el-icon-delete"

src/views/workflow/definition/DefinitionList.vue

@@ -18,9 +18,9 @@
               <span class="custom-tree-node" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
                 <span><i v-if="node.level === 1" class="iconfont icon-zuzhi tree-folder" />{{ node.label }}</span>
                 <span class="tree-bts">
-                  <i v-show="!data.id && data.show" v-hasPerm="['workflow:definition:type:add']" class="el-icon-circle-plus-outline bt-add" @click="() => handleAddCategory()" />
+                  <i v-show="!data.id && data.show"  class="el-icon-circle-plus-outline bt-add" @click="() => handleAddCategory()" />
-                  <i v-show="data.id && data.show" v-hasPerm="['workflow:definition:type:edit']" class="el-icon-edit-outline bt-edit" @click="() => handleEditCategory(data)" />
+                  <i v-show="data.id && data.show"  class="el-icon-edit-outline bt-edit" @click="() => handleEditCategory(data)" />
-                  <i v-show="data.id && data.show" v-hasPerm="['workflow:definition:type:remove']" class="el-icon-delete bt-delete" @click="() => handleDelCategory(data)" />
+                  <i v-show="data.id && data.show"  class="el-icon-delete bt-delete" @click="() => handleDelCategory(data)" />
                 </span>
               </span>
             </template>
@@ -50,7 +50,6 @@
           <el-col :span="12">
             <el-button-group>
               <el-button
-                v-hasPerm="['workflow:definition:import']"
                 type="primary"
                 icon="el-icon-plus"
                 size="mini"
@@ -130,7 +129,6 @@
                 trigger="click"
               >
                 <el-button
-                  v-hasPerm="['workflow:definition:resource']"
                   size="mini"
                   type="text"
                   icon="el-icon-view"
@@ -138,7 +136,6 @@
                 >流程图</el-button>
                 <el-button
                   v-if="scope.row.suspensionState === 2"
-                  v-hasPerm="['workflow:definition:activate']"
                   size="mini"
                   type="text"
                   icon="el-icon-view"
@@ -146,14 +143,12 @@
                 >激活</el-button>
                 <el-button
                   v-if="scope.row.suspensionState === 1"
-                  v-hasPerm="['workflow:definition:suspend']"
                   size="mini"
                   type="text"
                   icon="el-icon-view"
                   @click="handleSuspend(scope.row)"
                 >挂起</el-button>
                 <el-button
-                  v-hasPerm="['workflow:definition:remove']"
                   size="mini"
                   type="text"
                   icon="el-icon-delete"

src/views/workflow/instance/myinvolved/MyInvolvedInstanceList.vue

@@ -48,7 +48,6 @@
             trigger="click"
           >
             <el-button
-              v-hasPerm="['workflow:instance:track']"
               size="mini"
               type="text"
               icon="el-icon-view"

src/views/workflow/instance/mystarted/MyStartedInstanceList.vue

@@ -48,7 +48,6 @@
             trigger="click"
           >
             <el-button
-              v-hasPerm="['workflow:instance:track']"
               size="mini"
               type="text"
               icon="el-icon-view"

src/views/workflow/instance/running/RunningInstanceList.vue

@@ -48,7 +48,6 @@
             trigger="click"
           >
             <el-button
-              v-hasPerm="['workflow:instance:track']"
               size="mini"
               type="text"
               icon="el-icon-view"
@@ -56,7 +55,6 @@
             >流程追踪</el-button>
             <el-button
               v-if="scope.row.suspensionState === 2"
-              v-hasPerm="['workflow:instance:running:activate']"
               size="mini"
               type="text"
               icon="el-icon-view"
@@ -64,14 +62,12 @@
             >激活</el-button>
             <el-button
               v-if="scope.row.suspensionState === 1"
-              v-hasPerm="['workflow:instance:running:suspend']"
               size="mini"
               type="text"
               icon="el-icon-view"
               @click="handleSuspend(scope.row)"
             >挂起</el-button>
             <el-button
-              v-hasPerm="['workflow:instance:running:remove']"
               size="mini"
               type="text"
               icon="el-icon-delete"

src/views/workflow/task/todo/TaskTodoList.vue

@@ -58,7 +58,6 @@
           >
             <el-button
               v-if="scope.row.assignee === undefined || scope.row.assignee === null || scope.row.assignee === ''"
-              v-hasPerm="['workflow:task:caim']"
               size="mini"
               type="text"
               icon="el-icon-view"
@@ -66,7 +65,6 @@
             >签收</el-button>
             <el-button
               v-if="scope.row.assignee && scope.row.assignee === user.id"
-              v-hasPerm="['workflow:task:unclaim']"
               size="mini"
               type="text"
               icon="el-icon-view"
@@ -74,7 +72,6 @@
             >反签收</el-button>
             <el-button
               v-if="scope.row.assignee && scope.row.assignee === user.id"
-              v-hasPerm="['workflow:task:delegate']"
               size="mini"
               type="text"
               icon="el-icon-view"
@@ -82,7 +79,6 @@
             >委派</el-button>
             <el-button
               v-if="scope.row.assignee && scope.row.assignee === user.id"
-              v-hasPerm="['workflow:task:assignee']"
               size="mini"
               type="text"
               icon="el-icon-view"
@@ -90,7 +86,6 @@
             >转办</el-button>
             <el-button
               v-if="scope.row.assignee && scope.row.assignee === user.id"
-              v-hasPerm="['workflow:task:exam']"
               size="mini"
               type="text"
               icon="el-icon-view"