页面更新

ruoyi-ui/src/store/modules/permission.js

@@ -34,12 +34,11 @@ const permission = {
     GenerateRoutes({ commit }) {
       return new Promise(resolve => {
         // 向后端请求路由数据
-        getRouters().then(res => {
+        getRouters().then(res => {
           const sdata = JSON.parse(JSON.stringify(res.data))
           const rdata = JSON.parse(JSON.stringify(res.data))
           const sidebarRoutes = filterAsyncRouter(sdata)
           const rewriteRoutes = filterAsyncRouter(rdata, false, true)
-          console.log(sdata,sidebarRoutes,9998888)
           rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
           commit('SET_ROUTES', rewriteRoutes)
           commit('SET_SIDEBAR_ROUTERS', sidebarRoutes)

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

@@ -178,9 +178,9 @@ export default {
   },
   watch:{
     currentSteps (val) {
-      if(this.readOnly){
-        return
-      }
+      // if(this.readOnly){
+      //   return
+      // }
       let componentName = `component_${val}`
       if(Vue.component(componentName) === undefined){
         if(val === 0 ){
@@ -212,17 +212,14 @@ export default {
           this.data = res.data
           this.data.guiStyle = JSON.parse(res.data.guiStyle)
           this.data.moduleId = res.data.id
-
           this.$nextTick(() => {
             if(this.readOnly){
               this.currentSteps = 2
               this.noFreshFlag = false
-              this.$refs[this.currentComponent].activated()
             }else{
               this.$refs.component_1.init()
               this.noFreshFlag = false
             }
-
           })
         }else{
           this.$Modal.fcWarning({

ruoyi-ui/src/views/system/surface/index.vue

@@ -27,7 +27,10 @@
                 :src="JSON.parse(scope.row[scope.column.property])[0].url" alt="">
               <!-- :style="scope.row.list_class" scope.row[scope.column.property] -->
               <span  :style="scope.row.list_class" v-else-if="item.columnName == 'status' " >{{ scope.row[scope.column.property] }}</span>
-              <span  v-else>{{ scope.row[scope.column.property] }}</span>
+              <div v-else>
+                <span v-if="item.fkInfo">{{scope.row[scope.column.property].value}}</span>
+                <span v-else>{{scope.row[scope.column.property]}}</span>
+              </div>
             </template>
           </el-table-column>
         </template>