Merge branch 'master-500-dev-xwx' into 'master-500-dev'

第三方系统授权优化



See merge request !977

@@ -133,23 +133,23 @@
             </li>-->
 
             <li class="layui-nav-item" id="systems-select" lay-unselect>
-                <script lay-done="layui.element.render('nav', 'layadmin-systems');" lay-url="{{sessionStorage.getItem('domainName')}}/api-web/manage/ddic/list?ddicCategory=systems"
+                <script lay-done="layui.element.render('nav', 'layadmin-systems');"
+                        lay-url="{{sessionStorage.getItem('domainName')}}/api-web/thirdParty/getList"
                         template
                         type="text/html">
                     <a href="javascript:;" title="第三方系统">
                         <span class="layui-icon layui-icon-slider"></span>
                     </a>
                     <dl class="layui-nav-child">
-                        {{# d.data.sort(function (a, b) { return a.ddicSort > b.ddicSort ? 1 : -1; })}}
                         {{# if(d.data && d.data.length == 0){ }}
                         {{# var sysObj = document.querySelector('#systems-select'); }}
                         {{# sysObj != null ? sysObj.remove() :''; }}
                         {{# } }}
                         {{# layui.each(d.data, function(index, item){ }}
                         <dd style="text-align: left;" lay-filter="layadmin-systems">
-                            <a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.ddicCode}}"
-                               title="{{item.ddicName}}">
-                                <i class="iconfont icon-tree {{ item.ddicDesc }}"/>&nbsp;&nbsp;{{ item.ddicName }}
+                            <a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.detail}}"
+                               title="{{item.name}}">
+                                <i class="iconfont icon-tree {{ item.name }}"/>&nbsp;&nbsp;{{ item.name }}
                             </a>
                         </dd>
                         {{# }); }}

@@ -5,7 +5,7 @@
                 <div class="search-input flex-div-start">
                     <el-tooltip placement="bottom-start">
                         <template #content>名称<br/>编码</template>
-                        <el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="请输入关键字(回车搜索)" class="fault-book-input-text" />
+                        <el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="关键字检索" class="fault-book-input-text" />
                     </el-tooltip>
                     <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList()">查询</el-button>
                 </div>

@@ -109,7 +109,7 @@ export default {
             }else {
                 fileFrom.value.type ='img';
             }
-            return isJPG
+            return true;
         }
         //获取配置列表
         let getDataList = () => {

@@ -4,7 +4,7 @@
             <div class="search-input flex-div-start">
                 <el-tooltip placement="bottom-start">
                     <template #content>第三方系统<br/>请求地址</template>
-                    <el-input :size="$global.elementConfig.size.input" v-model="keyword" placeholder="请输入关键字(回车搜索)" class="fault-book-input-text" />
+                    <el-input :size="$global.elementConfig.size.input" v-model="keyword" placeholder="关键字检索" class="fault-book-input-text" />
                 </el-tooltip>
                 <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDetailList()">查询</el-button>
             </div>

@@ -217,10 +217,10 @@ export default {
             }
             if (row.type == 0){
                 url='/api-web/thirdParty/conf/delete';
-                msg='您确实删除第三方系统吗?'
+                msg='请确认是否删除系统?'
             }else {
                 url='/api-web/thirdParty/auth/delete';
-                msg='您确实删除授权吗?'
+                msg='请确认是否删除授权?'
             }
             proxy.$global.confirm(msg, function () {proxy.$http.get(url, params, function (res) {
                 if (res && res.success){

@@ -98,7 +98,7 @@
              </li>-->
             <li class="layui-nav-item" id="systems-select" lay-unselect>
                 <script lay-done="layui.element.render('nav', 'layadmin-systems');"
-                        lay-url="{{sessionStorage.getItem('domainName')}}/api-web/manage/ddic/list?ddicCategory=systems"
+                        lay-url="{{sessionStorage.getItem('domainName')}}/api-web/thirdParty/getList"
                         template
                         type="text/html">
                     <a href="javascript:;" title="第三方系统">
@@ -111,9 +111,9 @@
                         {{# } }}
                         {{# layui.each(d.data, function(index, item){ }}
                         <dd style="text-align: left;" lay-filter="layadmin-systems">
-                            <a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.ddicCode}}"
-                               title="{{item.ddicName}}">
-                                <i class="iconfont icon-tree {{ item.ddicDesc }}"/>&nbsp;&nbsp;{{ item.ddicName }}
+                            <a href="javascript:;" layadmin-event="openOtherSystem" data-code="{{item.detail}}"
+                               title="{{item.name}}">
+                                <i class="iconfont icon-tree {{ item.name }}"/>&nbsp;&nbsp;{{ item.name }}
                             </a>
                         </dd>
                         {{# }); }}