Skip to content

Commit 433b97d

Browse files
sx1989827sx1989827
committed
fix
1 parent ac0c7a9 commit 433b97d

File tree

25 files changed

+809
-37
lines changed

25 files changed

+809
-37
lines changed

‎Client/dist/admin.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Client/dist/console.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Client/dist/public.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Client/dist/share.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Client/web/common/js/helper.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,11 +1755,11 @@ helper.handleTestInterface=function (inter,data,status) {
17551755
return retIndex;
17561756
}
17571757

1758-
helper.runTest=async function (obj,baseUrl,global,test,root,opt) {
1758+
helper.runTest=async function (obj,global,test,root,opt) {
17591759
root.output+="开始运行接口："+obj.name+"<br>"
17601760
var name=obj.name
17611761
var method=obj.method;
1762-
var baseUrl=obj.baseUrl=="defaultUrl"?baseUrl:obj.baseUrl;
1762+
var baseUrl=obj.baseUrl=="defaultUrl"?global.baseUrl:obj.baseUrl;
17631763
var globalVar={};
17641764
global.baseUrls.forEach(function (obj) {
17651765
if(obj.url==baseUrl && obj.env)
@@ -2322,7 +2322,7 @@ helper.runTestCode=async function (code,test,global,opt,root) {
23222322
var text;
23232323
if(type=="1")
23242324
{
2325-
text="(function (opt) {return helper.runTest("+obj.replace(/\r|\n/g,"")+",'"+opt.baseUrl+"',"+"{before:'"+opt.before.replace(/'/g,"\\'").replace(/\r|\n/g,";")+"',after:'"+opt.after.replace(/'/g,"\\'").replace(/\r|\n/g,";")+"',baseUrls:"+JSON.stringify(opt.baseUrls)+"}"+",test,root,opt)})"
2325+
text="(function (opt1) {return helper.runTest("+obj.replace(/\r|\n/g,"")+",opt,test,root,opt1)})"
23262326
}
23272327
else if(type=="2")
23282328
{
@@ -2348,7 +2348,7 @@ helper.runTestCode=async function (code,test,global,opt,root) {
23482348
{
23492349
return;
23502350
}
2351-
text="(function () {return helper.runTestCode('"+testObj.code.replace(/\\\&quot\;/g,"\\\\&quot;").replace(/'/g,"\\'")+"',"+JSON.stringify(testObj)+",global,"+JSON.stringify(opt)+",root)})"
2351+
text="(function () {return helper.runTestCode('"+testObj.code.replace(/\\\&quot\;/g,"\\\\&quot;").replace(/'/g,"\\'")+"',"+JSON.stringify(testObj)+",global,opt,root)})"
23522352
}
23532353
else
23542354
{

‎Client/web/controller/admin/admin.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,14 @@ var vue=new Vue({
3434
net.get("/admin/userstatistics"),
3535
net.get("/admin/projectstatistics"),
3636
net.get("/admin/teamstatistics"),
37-
net.get("/admin/interfacestatistics")
37+
net.get("/admin/interfacestatistics"),
38+
net.get("/admin/setting")
3839
]).then(function (data) {
3940
var obj1=data[0];
4041
var obj2=data[1];
4142
var obj3=data[2];
4243
var obj4=data[3];
44+
var obj5=data[4];
4345
if(obj1.code==200)
4446
{
4547
store.commit("setUserInfo",obj1.data)
@@ -72,6 +74,14 @@ var vue=new Vue({
7274
{
7375
throw obj4.msg;
7476
}
77+
if(obj5.code==200)
78+
{
79+
store.commit("setSettingInfo",obj5.data)
80+
}
81+
else
82+
{
83+
throw obj5.msg;
84+
}
7585
$.stopLoading();
7686
}).catch(function (err) {
7787
$.stopLoading();
@@ -90,7 +100,9 @@ $.ready(function () {
90100
$.startLoading();
91101
})
92102

93-
103+
if (module.hot) {
104+
module.hot.accept();
105+
}
94106

95107

96108

‎Client/web/controller/admin/component/projectAdd.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<el-input size="small" type="textarea" :rows="3" style="width: 80%" name="dis" v-model="obj.dis" placeholder="请输入项目描述"></el-input>
99
</el-form-item>
1010
<el-form-item label="公开" style="text-align: center">
11-
<el-switch v-model="obj.public" on-color="#13ce66" off-color="#ff4949" :on-value="1" :off-value="0"></el-switch>
11+
<el-switch v-model="obj.public" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0"></el-switch>
1212
</el-form-item>
1313
<el-form-item label="所有者" style="text-align: center">
1414
<el-autocomplete size="small" :fetch-suggestions="querySearchAsync.bind(this,0)" style="width: 80%" name="owner" v-model="obj.owner.name" placeholder="请输入所有者名称" @select="sel"></el-autocomplete>

‎Client/web/controller/admin/component/projectEdit.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<el-input size="small" :rows="3" style="width: 80%" name="dis" v-model="obj.dis"></el-input>
99
</el-form-item>
1010
<el-form-item label="公开" style="text-align: center">
11-
<el-switch v-model="obj.public" on-color="#13ce66" off-color="#ff4949" :on-value="1" :off-value="0"></el-switch>
11+
<el-switch v-model="obj.public" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0"></el-switch>
1212
</el-form-item>
1313
</el-form>
1414
<el-row class="dialog-footer" slot="footer">

0 commit comments

Comments
 (0)