Merge branch 'master' of ssh://101.201.226.163:50022/ccsens_wiki/vs_test

4 years ago · 07df497430
7 changed files with 112 additions and 31 deletions
--- a/pt_ccsens/财务条.http
+++ b/pt_ccsens/财务条.http
@ -9,14 +9,18 @@
 ### 登录
 # song 1218763410024566784
 # @name login
+<<<<<<< HEAD
+POST {{test_tall}}/users/signin
+=======
 POST {{www_tall}}/users/signin
+>>>>>>> 8bd87036cc6045d79589a59b528e62dd45f65735
 {{type}}

 {
  "client": 1,
  "type": 3,
  "data": {
-    "identifier": "whj",
+    "identifier": "zy11",
    "credential": "123456"
  }
 }
@ -39,7 +43,7 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 }

 ###发起申请
-POST {{localhost}}/finance/apply
+POST {{test}}/finance/apply
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}

@ -50,26 +54,25 @@ Authorization: Bearer {{login.response.body.$.data.token}}
        123
        ],
        "invoiceList": [
-        {
-            "invoiceCode": "014002100112",
-            "invoiceNumber": "86610940",
-            "invoiceTime": 1643075118954,
-            "money": 4190,
-            "remark": "业务招待支出",
-            "taxMoney": 126,
-            "url": "https://alifei04.cfp.cn/creative/vcg/800/new/VCG211363439424.jpg"
-        }
+            {
+                "invoiceCode": "014002100112",
+                "invoiceNumber": "86610940",
+                "invoiceTime": 1643075118954,
+                "money": 4190,
+                "remark": "业务招待支出",
+                "taxMoney": 126,
+                "url": "https://alifei04.cfp.cn/creative/vcg/800/new/VCG211363439424.jpg"
+            }
        ],
        "projectId": 2,
-        "taskDetailId": 3,
+        "taskDetailId": 2,
        "remark": "",
        "department": "视觉传达事业部",
-        "submitName": "黛西",
+        "submitName": "黛西34",
        "money": 4190,
        "typeId": 1,
        "categoryId": 4,
        "rowId": 7
-
    }
 }

--- a/tall/plugin/plugin.http
+++ b/tall/plugin/plugin.http
@ -1,5 +1,5 @@
-@tall = https://www.tall.wiki/gateway/tall/v1.0
-@test = https://test.tall.wiki/gateway/tall/v1.0
+@tall = https://www.tall.wiki/gateway/tall3/v3.0
+@test = https://test.tall.wiki/gateway/tall3/v3.0
@localhost = http://localhost:7030
@type = content-type: application/json;charset=utf-8

@ -18,6 +18,34 @@ POST {{test}}/users/signin
  }
 }

+### 导入插件
+# POST http://127.0.0.1:7220/plugin/import
+POST http://test.tall.wiki/gateway/pluginshop/plugin/import
+Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+title
+------WebKitFormBoundary7MA4YWxkTrZu0gW
+Content-Disposition: form-data; name="param"; filename="插件导入表格.xlsx"
+Content-Type: xlsx
+
+< C:\Users\aBin\Desktop\暴风眼\插件导入表格.xlsx
+
+------WebKitFormBoundary7MA4YWxkTrZu0gW--
+
+
+### 大屏急救各个节点时间统计
+POST {{test}}/screen/getPointTime
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+  "param": {
+      "carId":"3"
+  }
+}
+
+
 #根据任务id查询插件列表(该任务已添加的)
 ###F
 # POST http://localhost:7030/v1.0/plugins/findPluginOfAdded
@ -58,7 +86,7 @@ Authorization: Bearer {{login.response.body.$.data.token}}
  "param": {
    "name":"show_score",
    "description":"展示分数"
-   	
+
  }
 }

@ -90,4 +118,4 @@ Authorization: Bearer {{login.response.body.$.data.token}}
    "roleId":"1365119891782373376",
    "pluginId":"1"
  }
-}
+}
--- a/tall3.http
+++ b/tall3.http
@ -7,8 +7,6 @@
@tall3 = /tall3/v3.0
@tall = /tall/v1.0

-
-
 ### login

 # @name login
--- a/temp.txt
+++ b/temp.txt
@ -43,11 +43,11 @@

 wu:
 http://www.china-cdt.com/dtwz/showfirst/xxgk_jbxx&s=jbxx_zyrsbd&t.html
-1.这块子菜单和上级菜单都做成一样的，不要空白条，也采用白色，参考集团官网
-2.二级菜单如果有子菜单，点击的时候，自动打开二级菜单
-3.三级菜单文字靠右一点，不要和二级菜单对齐了
+1.这块子菜单和上级菜单都做成一样的，不要空白条，也采用白色，参考集团官网                     ✔
+2.二级菜单如果有子菜单，点击的时候，自动打开二级菜单                                     ✔
+3.三级菜单文字靠右一点，不要和二级菜单对齐了                                            ✔
 4.列表页有个跳转路径，jumpUrl,有值，则点击直接新打开页面，跳转到该路径下，否则，跳转到详情页
-5.三级菜单的详情页时，右侧的定位菜单栏需要定位到三级菜单
-6.详情页右侧的定位菜单栏，最后一个菜单文字放大标红，其他菜单鼠标放上去时标红，参考集团官网
+5.三级菜单的详情页时，右侧的定位菜单栏需要定位到三级菜单                                  ✔
+6.详情页右侧的定位菜单栏，最后一个菜单文字放大标红，其他菜单鼠标放上去时标红，参考集团官网      ✔
 7.详情页两个背景图白色部分截掉，否则详情页空白处太多了
 8.列表页，如果查到新闻只有一条，直接展示详情，不展示列表
--- a/大唐/大唐.http
+++ b/大唐/大唐.http
@ -1,9 +1,9 @@
-@dev = http://127.0.0.1:7270/v1.0
-@test = https://test.tall.wiki/datang/v1.0
-@www = http://www.tall.wiki/gateway/yanyuan/v2.0
+@localhost = http://127.0.0.1:7270/v1.0/
+@test = http://test.tall.wiki/datang/v1.0/
+@www = http://www.tall.wiki/gateway/yanyuan/v2.0/
@type = content-type: application/json;charset=utf-8

-###网站轮播图查询
+###查询轮播图
 POST {{test}}/carousel/query
 {{type}}

--- a/文件管理/file/file.http
+++ b/文件管理/file/file.http
@ -2,7 +2,7 @@
@testTall = https://test.tall.wiki/gateway/tall3/v3.0
@localhostTall = http://localhost:7030/v1.0
@testFile = https://test.tall.wiki/filedeal
-@testFile31 = http://192.168.31.13/filedeal
+@testFile101 = http://101.201.226.163/filedeal
@type = content-type: application/json;charset=utf-8
@token = Authorization: Bearer {{login.response.body.$.data.token}}

@ -63,6 +63,7 @@ Content-Type: image/jpeg

 ------WebKitFormBoundary7MA4YWxkTrZu0gW--

+------WebKitFormBoundary7MA4YWxkTrZu0gW--

 ### 文件下载
 GET {{testFile}}/file/download/1385069982416769024
--- a/智慧平车/平车基础版.http
+++ b/智慧平车/平车基础版.http
@ -8,7 +8,7 @@

 ### 登录
 # @name login
-POST {{localhost_tall}}/users/signin
+POST {{www_tall}}/users/signin
 {{type}}

 {
@ -20,6 +20,57 @@ POST {{localhost_tall}}/users/signin
  }
 }

+###给项目添加任务
+POST {{www}}/task/saveTask
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+  "param":{
+    "name": "统计数据",
+    "projectId":"1436146379201454080",
+    "roleIdList": [1436146379708964864],
+    "global": 1
+  }
+}
+
+###给任务添加插件
+POST {{www}}/task/saveTaskPlugin
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+  "param":[{
+    "taskDetailId": "1470653322397753344",
+    "pluginName": "MP-TALL展示详情页c1",
+    "param": "{\"url\":\"https://www.tall.wiki/carbasics/commission\"}"
+  }]
+}
+
+
+###删除项目
+POST {{www_tall}}/project/deleteProject
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+  "param":{
+    "projectId":"1455841340603768832"
+  }
+}
+
+### 导入wbs
+POST http://test.tall.wiki/gateway/carbasics/v4.0/wbs
+Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+title
+------WebKitFormBoundary7MA4YWxkTrZu0gW
+Content-Disposition: form-data; name="param"; filename="v2.0 实验平台EWBS 20210824.xlsx"
+Content-Type: xlsx
+
+< C:\Users\aBin\Desktop\省质控中心.xlsx
+------WebKitFormBoundary7MA4YWxkTrZu0gW--


 //Excel