Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-ui into develop

src/api/risk/draw.js

@@ -29,7 +29,7 @@ export function updateBatch(data) {
 }
 
 export function getFun(url, params) {
-  const Url = '/app-api' + url
+  const Url = '/system' + url
   return request({
     url: Url,
     method: "get",
@@ -37,7 +37,7 @@ export function getFun(url, params) {
   });
 }
 export function postFun(url, data) {
-  const Url = '/app-api' + url
+  const Url = '/system' + url
   return request({
     url: Url,
     method: "post",

src/views/risk/drawCanvas/index.vue

@@ -360,7 +360,7 @@ export default {
         this.copyRoom.copyArr = this.copyRoom.typeData;
         return;
       }
-      getFun("/risk/plan/dict/data/list", {
+      getFun("/dict/data/list/all", {
         dictType: "risk_plan_base_room",
       }).then((res) => {
         this.copyRoom.typeData = res.data;
@@ -474,12 +474,12 @@ export default {
           console.log("err==>>", err);
         });
 
-      getFun("/risk/plan/dict/data/list", {
+      getFun("/dict/data/list/all", {
         dictType: "risk_plan_room_type",
       }).then((res) => {
         this.roomArr = res.data;
       });
-      getFun("/risk/plan/dict/data/list", {
+      getFun("/dict/data/list/all", {
         dictType: "risk_plan_base_room",
       }).then((res) => {
         this.baseArr = res.data;