Merge remote-tracking branch 'origin/master'

3 years ago · ea4df7d486
parent 80865125d9 0d9d5f72a7
commit ea4df7d486
2 changed files with 139 additions and 129 deletions
--- a/src/views/basic/BasicThirdSys.vue
+++ b/src/views/basic/BasicThirdSys.vue
@ -75,7 +75,7 @@
                width="70%"
            >
                <modifyDialog :inputQuery="inputQuery"></modifyDialog>
-                <div style="text-align: center">
+                <div style="text-align: center; margin-top: 10px;">
                    <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
                    >提交
                    </el-button
--- a/src/views/basic/BasicThirdSysModify.vue
+++ b/src/views/basic/BasicThirdSysModify.vue
@ -1,95 +1,100 @@
 <template>
    <div>
-        <el-row :gutter="20" class="el-row" type="flex" align="middle">
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>系统ID:&nbsp;</span>
+        <el-card>
+            <el-row :gutter="20" class="el-row" type="flex" align="middle">
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>系统ID:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 200px"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            :disabled="true"
+                            v-model="inputQuery.thirdId"
+                        ></el-input>
                    </div>
-                    <el-input
-                        style="width: 200px"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        :disabled="true"
-                        v-model="inputQuery.thirdId"
-                    ></el-input>
-                </div>
-            </el-col>
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>系统名称:&nbsp;</span>
+                </el-col>
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>系统名称:&nbsp;</span>
+                        </div>
+                        <el-input
+                            style="width: 200px"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            v-model="inputQuery.thirdName"
+                        ></el-input>
                    </div>
-                    <el-input
-                        style="width: 200px"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.thirdName"
-                    ></el-input>
-                </div>
-            </el-col>
+                </el-col>

-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="10" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>API说明文档:&nbsp;</span>
-                    </div>
-                    <div style="padding-top: 5px">
-                        <a :href="inputQuery.guideUrl" target="_blank">{{ inputQuery.thirdName }}接口说明文档</a>
-                    </div>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="10" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>API说明文档:&nbsp;</span>
+                        </div>
+                        <div style="padding-top: 5px">
+                            <a :href="inputQuery.guideUrl" target="_blank">{{ inputQuery.thirdName }}接口说明文档</a>
+                        </div>


-                </div>
-            </el-col>
-            <el-col :span="4" class="el-col">
-                <div class="text item">
-                    <el-checkbox v-model="inputQuery.enabled">是否启用</el-checkbox>
-                </div>
-            </el-col>
-            <el-col :span="4" class="el-col">
-                <div class="text item">
-                    <el-checkbox v-model="inputQuery.mainSys">是否设为主系统</el-checkbox>
-                </div>
-            </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="18" class="el-col">
-                <div class="text item">
-                    <div class="itemTag" style="width: 200px;">
-                        <span>第三方服务IP地址:&nbsp;</span>
                    </div>
-
-                    <el-input
-                        style="width: 70%; margin-left: -80px;"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.thridUrl"
-                    ></el-input>
-                    <el-button style="margin-left: 5px;" type="primary" @click="testThirdService">测试连通性</el-button>
-                </div>
-            </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="18" class="el-col">
-                <div class="text item">
-                    <div class="itemTag" style="width: 200px;">
-                        <span>第三方系统IP地址:&nbsp;</span>
+                </el-col>
+                <el-col :span="4" class="el-col">
+                    <div class="text item">
+                        <el-checkbox v-model="inputQuery.enabled">是否启用</el-checkbox>
                    </div>
+                </el-col>
+                <el-col :span="4" class="el-col">
+                    <div class="text item">
+                        <el-checkbox v-model="inputQuery.mainSys">是否设为主系统</el-checkbox>
+                    </div>
+                </el-col>
+            </el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="18" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag" style="width: 200px;">
+                            <span>第三方服务IP地址:&nbsp;</span>
+                        </div>
+
+                        <el-input
+                            style="width: 70%; margin-left: -80px;"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            v-model="inputQuery.thridUrl"
+                        ></el-input>
+                        <el-button style="margin-left: 5px;" type="primary" @click="testThirdService">测试连通性</el-button>
+                    </div>
+                </el-col>
+            </el-row>
+        </el-card>
+
+        <el-card>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="18" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag" style="width: 200px;">
+                            <span>第三方系统IP地址:&nbsp;</span>
+                        </div>
+
+                        <el-input
+                            style="width: 70%;margin-left: -80px;"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            v-model="inputQuery.thirdSysUrl"
+                        ></el-input>
+
+                        <el-button style="margin-left: 5px;" type="primary" @click="testThirdInter">测试连通性</el-button>
+                    </div>
+                </el-col>
+            </el-row>

-                    <el-input
-                        style="width: 70%;margin-left: -80px;"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.thirdSysUrl"
-                    ></el-input>
-
-                    <el-button style="margin-left: 5px;" type="primary" @click="testThirdInter">测试连通性</el-button>
-                </div>
-            </el-col>
-        </el-row>
-        <!--<el-row :gutter="20" class="el-row" type="flex">
+            <!--<el-row :gutter="20" class="el-row" type="flex">
            <el-col :span="18" class="el-col">
                <div class="text item">
                    <div class="itemTag">
@ -113,56 +118,61 @@
                </div>
            </el-col>
        </el-row>-->
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="18" class="el-col">
-                <div class="text item">
-                    <div class="itemTag" style="width: 200px;">
-                        <span>第三方服务接口授权:&nbsp;</span>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="18" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag" style="width: 200px;">
+                            <span>第三方服务接口授权:&nbsp;</span>
+                        </div>
                    </div>
-                </div>
-            </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="18" class="el-col" style="margin-left: 60px;">
-                <div class="text item">
-                    <label>apikey：</label>
-                    <el-input
-                        style="width: 40%; margin-right: 10px; margin-left: 10px;"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.apikey"
-                    ></el-input>
-                    <label>secretkey：</label>
-                    <el-input
-                        style="width: 40%"
-                        size="mini"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.secretkey"
-                    ></el-input>
+                </el-col>
+            </el-row>
+
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="18" class="el-col" style="margin-left: 60px;">
+                    <div class="text item">
+                        <label>apikey：</label>
+                        <el-input
+                            style="width: 40%; margin-right: 10px; margin-left: 10px;"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            v-model="inputQuery.apikey"
+                        ></el-input>
+                        <label>secretkey：</label>
+                        <el-input
+                            style="width: 40%"
+                            size="mini"
+                            splaceholder="请输入内容"
+                            v-model="inputQuery.secretkey"
+                        ></el-input>

-                </div>
-            </el-col>
-        </el-row>
-        <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="24" class="el-col">
-                <div class="text item">
-                    <div class="itemTag">
-                        <span>备注说明:&nbsp;</span>
                    </div>
+                </el-col>
+            </el-row>
+        </el-card>
+
+        <el-card>
+            <el-row :gutter="20" class="el-row" type="flex">
+                <el-col :span="24" class="el-col">
+                    <div class="text item">
+                        <div class="itemTag">
+                            <span>备注说明:&nbsp;</span>
+                        </div>
+
+                        <el-input
+                            style="width: 80%"
+                            type="textarea"
+                            size="mini"
+                            rows="6"
+                            splaceholder="请输入内容"
+                            v-model="inputQuery.remark"
+                            @input="change()"
+                        ></el-input>
+                    </div>
+                </el-col>

-                    <el-input
-                        style="width: 80%"
-                        type="textarea"
-                        size="mini"
-                        rows="6"
-                        splaceholder="请输入内容"
-                        v-model="inputQuery.remark"
-                        @input="change()"
-                    ></el-input>
-                </div>
-            </el-col>
-
-        </el-row>
+            </el-row>
+        </el-card>
    </div>
 </template>