页面更新

ruoyi-ui/src/components/FlowChartComponent/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="FlowChartComponent">
-    <Alert show-icon closable v-if="currentSteps === 1">双击空白区域即可直接新增一个中间节点,双击节点可编辑</Alert>
+    <!-- <Alert show-icon closable v-if="currentSteps === 1">双击空白区域即可直接新增一个中间节点,双击节点可编辑</Alert> -->
     <div class="chartContent">
       <div id="paletteDiv" v-show="currentSteps === 1"></div>
       <div id="goChart" v-show="currentSteps === 1">
@@ -38,15 +38,7 @@
   </div>
 </template>
 <script>
-import '@/utils/go'
-import FlowDesinger from '@/utils/flow-desinger';
-import startNodeInfo from '@/components/startNodeInfo'
-import endNodeInfo from '@/components/endNodeInfo'
-import linkInfo from '@/components/linkInfo'
-import ProcessNodeConfig from '@/components/ProcessNodeConfig'
-import DynamicProcessNodeConfig from '@/components/DynamicProcessNodeConfig'
-import ServiceNodeConfig from '@/components/ServiceNodeConfig'
-import FlowDisplay from '@/utils/flow-display';
+import '@/utils/go'
import FlowDesinger from '@/utils/flow-desinger';
import startNodeInfo from '@/components/startNodeInfo'
import endNodeInfo from '@/components/endNodeInfo'
import linkInfo from '@/components/linkInfo'
import ProcessNodeConfig from '@/components/ProcessNodeConfig'
import DynamicProcessNodeConfig from '@/components/DynamicProcessNodeConfig'
import ServiceNodeConfig from '@/components/ServiceNodeConfig'
import FlowDisplay from '@/utils/flow-display';
 export default {
   components:{
     startNodeInfo, endNodeInfo, linkInfo, ProcessNodeConfig, DynamicProcessNodeConfig, ServiceNodeConfig
@@ -104,7 +96,6 @@ export default {
   },
   methods:{
     init () {
-      console.log(333333)
         if(!Array.isArray(this.data.nodeMsg)){
             let nodeMsg = []
             Object.keys(this.data.nodeMsg).map(item => {
@@ -124,7 +115,6 @@ export default {
 
         this.dataProcessing()
         if(this.currentSteps === 1){
-          console.log(1111)
           // 流程图设计器
           if(!this.myDesigner){
             this.myDesigner= new FlowDesinger('goChart',{
@@ -136,11 +126,11 @@ export default {
             });
 
           }
+
           this.initToolbar = this.myDesigner.initToolbar('paletteDiv',this.data.moduleType)
           this.myDesigner.displayFlow(JSON.parse(JSON.stringify(this.data.guiStyle)));// 在设计面板中显示流程图
           this.data.myDisplay = this.myDesigner.diagram
         }else{
-          console.log(2222)
           if(this.myDisplay){
             this.myDisplay.loadFlow(JSON.parse(JSON.stringify(this.data.guiStyle)))
           }else{
@@ -165,7 +155,6 @@ export default {
     },
     dataProcessing () {  //处理后端返回节点数据和路径数据
       if(this.data.nodeMsg){
-
         this.data.nodeMsg.forEach(item => {
           this.nodeMsg[item.key] = item
           if(item.type === 2){  //结束节点对数据排序,区分执行程序还是抄送人
@@ -521,7 +510,7 @@ export default {
   }
 }
 </script>
-<style lang="scss" >
+<style lang="less" >
 .FlowChartComponent{
   width: 100%;
   height: 100%;

ruoyi-ui/src/components/ParameterConfiguration/index.vue

@@ -460,9 +460,9 @@
           DESCRIPTION: value,
           AD_TABLE_ID: this.data.businessType[0].ID
         }).then(res => {
-          if (res.data.code === 0) {
-            this.row = res.data.data.row.concat([])
-            this.formLists[3].item.props.AutoData = res.data.data.row.reduce((arr, item) => {
+          if (res.code === 0) {
+            this.row = res.data.row.concat([])
+            this.formLists[3].item.props.AutoData = res.data.row.reduce((arr, item) => {
               arr.push({
                 value: item.NAME.val,
                 id: item.ID.val,
@@ -480,9 +480,9 @@
           page: currentPage ? currentPage : 1,
           AD_TABLE_ID: this.data.businessType[0].ID
         }).then(res => {
-          if (res.data.code === 0) {
-            this.row = res.data.data.row.concat([])
-            res.data.data.tabth.forEach(item => {
+          if (res.code === 0) {
+            this.row = res.data.row.concat([])
+            res.data.tabth.forEach(item => {
               if (item.colname === 'DESCRIPTION') {
                 item.isak = true
               }
@@ -492,8 +492,8 @@
             //   item.ID.val = item.NAME.val
             //   return item
             // })
-            this.formLists[3].item.props.data = res.data.data;
-            this.formLists[3].item.props.totalRowCount = res.data.data.totalRowCount;
+            this.formLists[3].item.props.data = res.data;
+            this.formLists[3].item.props.totalRowCount = res.data.totalRowCount;
           }
 
         })

ruoyi-ui/src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
   title: '潜山市云数据中心',
-  urls: `http://192.168.101.10:7090`,
+  urls: `http://192.168.101.10:8090`,
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

ruoyi-ui/src/views/activiti/TemplateManagementNew/index.vue

@@ -217,6 +217,7 @@ export default {
             if(this.readOnly){
               this.currentSteps = 2
               this.noFreshFlag = false
+              this.$refs[this.currentComponent].activated()
             }else{
               this.$refs.component_1.init()
               this.noFreshFlag = false
@@ -468,8 +469,8 @@ export default {
     },
     confirmAndPublish () {  //保存并发布
       this.confirm(true).then(res => {
-        getPublish({id:res.data.data.id}).then((response) => {
-          if(response.data.resultCode === 0){
+        getPublish({id:res.data.id}).then((response) => {
+          if(response.resultCode === 0){
             this.$router.push('/tool/activiti/modeler')
             this.currentChange({
               path:'/tool/activiti/modeler'
@@ -484,7 +485,6 @@ export default {
     this.currentComponent = `component_${this.currentSteps}`
     if(this.$route.params.flag === '1'){
       this.readOnly = true
-      this.currentSteps = 1
       this.noFreshFlag = true
       this.getModuleInfo(this.$route.params.id)
       return