修改工作台跳转方式-物业管理添加左侧手机展示

operationSupport/src/components/common/alertModal.vue

@@ -94,6 +94,9 @@ export default {
     watch: {},
     methods: {
         close() {
+            if (this.$route.query.showDialog) {
+                this.$router.replace('/workbench/index');
+            }
             this.$store.dispatch('delPopup', this.modal.id);
         },
         // 弹窗重置，执行弹出组件的reset方法

operationSupport/src/main.js

@@ -136,11 +136,6 @@ Vue.prototype.routerLoad = {
 //     }
 // });
 router.beforeEach((to, from, next) => {
-    console.log('====================================');
-    console.log('beforeEach', to);
-    console.log('beforeEach from', from);
-    console.log('beforeEach next', next);
-    console.log('====================================');
     if (to.path !== '/404') {
         // console.log()
         let PermissionsRouter = Vue.prototype.routerLoad.findMen(store.getters.getMenuList, to.fullPath);

operationSupport/src/store/store.js

@@ -6,240 +6,247 @@
  * @Description: In User Settings Edit
  * @FilePath: \vue-manage-system-master\src\store\store.js
  */
-import Vue from "vue";
-import Vuex from "vuex";
+import Vue from 'vue';
+import Vuex from 'vuex';
+import router from '../router';
 
 Vue.use(Vuex);
 
 const store = new Vuex.Store({
-  state: {
-    token: "",
-    collapse: false,//控制面板是否显示
-    tagsList: [],//标签页所显示的内容
-    // 新弹窗
-    modalParams: {},
-    // 权限列表
-    permissionList: [],
-    //菜单列表
-    menuList: [],
-    // 当前登录用户信息
-    cruUserInfo: {},
-    thisDetai: {},
-    //查询是否有未读消息
-    messageNumber: false,
-    //最近消息列表集合
-    messageList: [],
-    //记录消息的状态
-    messageStatus: 2,
-    // 弹窗集合
-    popups: '',
-    theme: 'light',//控制界面的颜色,
-    // 查询的点的坐标
-    searchPointInfo: {},
-    //所有社区下拉
-    areaSelect: [],
-    //所有民族
-    nationArray: [],
-    //所有籍贯
-    nativeArray: [],
-    //公司部门
-    companyArray: [],
-    departmentArray: [],
-    communityArray: [],
-  },
-  getters: {
-    getTheme(state) {
-      return state.theme
-    },
-    getPopups(state) {
-      return state.popups || [];
-    },
-    getToken(state) {
-      return state.token;
-    },
-    getSearchPointInfo(state) {
-      return state.searchPointInfo;
-    },
-    getCollapse(state) {
-      return state.collapse;
-    },
-    getTagsList(state) {
-      return state.tagsList;
-    },
-    getModalParams(state) {
-      return state.modalParams;
-    },
-    // 判断按钮是否有权限
-    hasPermission: (state) => (role) => {
-      if (state.permissionList.size) {
-        return state.permissionList.has(role)
-      } else {
-        return false
-      }
-    },
-    //获取菜单列表
-    getMenuList(state) {
-      return state.menuList;
-    },
-    // 获取当前登录用户信息
-    getCruUserInfo(state) {
-      return state.cruUserInfo;
-    },
-    getThisDetai(state) {
-      return state.thisDetai
-    },
-    getAreaSelect(state) {
-      return state.areaSelect;
-    },
-    getNationArray(state) {
-      return state.nationArray
-    },
-    getNativeArray(state) {
-      return state.nativeArray
-    },
-    getCompanyArray(state) {
-      return state.companyArray
-    },
-    getDepartmentArray(state) {
-      return state.departmentArray
-    },
-    getCommunityArray(state) {
-      return state.communityArray
-    }
-
-  },
-  mutations: {
-    setSearchPointInfo(state, data) {
-      state.searchPointInfo = data;
-    },
-    setPopups(state, data) {
-      state.popups = data;
-    },
-    setToken(state, data) {
-      state.token = data;
-    },
-    setCollapse(state, data) {
-      state.collapse = data;
-    },
-    setTagList(state, data) {
-      state.tagsList = data;
-    },
-    setModalParams(state, data) {
-      state.modalParams = data;
-    },
-    setPermissionList(state, data) {
-      state.permissionList = data;
-    },
-    setMenuList(state, data) {
-      state.menuList = data;
-    },
-    setcCruUserInfo(state, data) {
-      state.cruUserInfo = data;
-    },
-    setThisDetai(state, data) {
-      state.thisDetai = data;
-    },
-    setmessageNumber(state, data) {
-      state.messageNumber = data;
-    },
-    setmessageList(state, data) {
-      state.messageList = data;
-    },
-    setmessageStatus(state, data) {
-      state.messageStatus = data;
-    },
-    setTheme(state, data) {
-      state.theme = data
-    },
-    setAreaSelect(state, data) {
-      state.areaSelect = data
-    },
-    setNationArray(state, data) {
-      state.nationArray = data
-    },
-    setNativeArray(state, data) {
-      state.nativeArray = data
-    },
-    setCompanyArray(state, data) {
-      state.companyArray = data
-    },
-    setDepartmentArray(state, data) {
-      state.departmentArray = data
-    },
-    setCommunityArray(state, data) {
-      state.communityArray = data
-    }
-  },
-  actions: {
-    tags(ctx, data) {
-      ctx.commit("setTagList", data)
-    },
-    /**
-   * @description: 打开弹窗
-   * @param {type} ctx vuex的上下文
-   * @param {object} args {
-   *  id: 唯一标识,必须
-   *  url: 打开的组件url地址，必须
-   *  params: 传递给弹出组件的参数,
-   *  notip: 是否显示*为填项必内容，为true时不显示
-   *  backgroud: 是否强制显示底部透明背景色，默认第二个弹出层时不显示透明底色，为true时一定显示
-   *  full: 是否为全屏展示,true为全屏
-   * }
-   * @return {null} null:
-   */
-    addPopup(ctx, args) {
-      const params = { ...args };
-      const list = ctx.getters.getPopups;
-      params.id = 'modal_' + (+new Date())
-      import(/* webpackChunkName: "[request]" */ `@/views${params.url}`).then((res) => {
-        params.component = res.default;
-        params.show = true;
-        list.push(params);
-        ctx.commit('setPopups', list);
-        // ctx.commit('setalertModalParams', params);
-      }).catch((err) => {
-        if (err.message.indexOf("Loading chunk") == 0) {
-          ELEMENT.Message.info("版本已更新，请刷新页面重试");
-        } else {
-          ELEMENT.Message.info(err.message);
+    state: {
+        token: '',
+        collapse: false, //控制面板是否显示
+        tagsList: [], //标签页所显示的内容
+        // 新弹窗
+        modalParams: {},
+        // 权限列表
+        permissionList: [],
+        //菜单列表
+        menuList: [],
+        // 当前登录用户信息
+        cruUserInfo: {},
+        thisDetai: {},
+        //查询是否有未读消息
+        messageNumber: false,
+        //最近消息列表集合
+        messageList: [],
+        //记录消息的状态
+        messageStatus: 2,
+        // 弹窗集合
+        popups: '',
+        theme: 'light', //控制界面的颜色,
+        // 查询的点的坐标
+        searchPointInfo: {},
+        //所有社区下拉
+        areaSelect: [],
+        //所有民族
+        nationArray: [],
+        //所有籍贯
+        nativeArray: [],
+        //公司部门
+        companyArray: [],
+        departmentArray: [],
+        communityArray: []
+    },
+    getters: {
+        getTheme(state) {
+            return state.theme;
+        },
+        getPopups(state) {
+            return state.popups || [];
+        },
+        getToken(state) {
+            return state.token;
+        },
+        getSearchPointInfo(state) {
+            return state.searchPointInfo;
+        },
+        getCollapse(state) {
+            return state.collapse;
+        },
+        getTagsList(state) {
+            return state.tagsList;
+        },
+        getModalParams(state) {
+            return state.modalParams;
+        },
+        // 判断按钮是否有权限
+        hasPermission: (state) => (role) => {
+            if (state.permissionList.size) {
+                return state.permissionList.has(role);
+            } else {
+                return false;
+            }
+        },
+        //获取菜单列表
+        getMenuList(state) {
+            return state.menuList;
+        },
+        // 获取当前登录用户信息
+        getCruUserInfo(state) {
+            return state.cruUserInfo;
+        },
+        getThisDetai(state) {
+            return state.thisDetai;
+        },
+        getAreaSelect(state) {
+            return state.areaSelect;
+        },
+        getNationArray(state) {
+            return state.nationArray;
+        },
+        getNativeArray(state) {
+            return state.nativeArray;
+        },
+        getCompanyArray(state) {
+            return state.companyArray;
+        },
+        getDepartmentArray(state) {
+            return state.departmentArray;
+        },
+        getCommunityArray(state) {
+            return state.communityArray;
         }
-      });
     },
-    delPopup(ctx, id) {
-      // let id=id;
-      // ctx.commit('setalertModalParams', { show: false});
-      const list = ctx.getters.getPopups;
-      list.every((item, index) => {
-        if (item.id === id) {
-          list.splice(index, 1);
-          ctx.commit('setPopups', list);
-          // 解决弹窗关闭，滚动条没有关闭的情况
-          // const $bar = document.querySelector('.dmp-scroll-bar')
-          // if ($bar) {
-          //   document.body.removeChild(document.querySelector('.dmp-scroll-bar'))
-          // }
-          return false;
+    mutations: {
+        setSearchPointInfo(state, data) {
+            state.searchPointInfo = data;
+        },
+        setPopups(state, data) {
+            state.popups = data;
+        },
+        setToken(state, data) {
+            state.token = data;
+        },
+        setCollapse(state, data) {
+            state.collapse = data;
+        },
+        setTagList(state, data) {
+            state.tagsList = data;
+        },
+        setModalParams(state, data) {
+            state.modalParams = data;
+        },
+        setPermissionList(state, data) {
+            state.permissionList = data;
+        },
+        setMenuList(state, data) {
+            state.menuList = data;
+        },
+        setcCruUserInfo(state, data) {
+            state.cruUserInfo = data;
+        },
+        setThisDetai(state, data) {
+            state.thisDetai = data;
+        },
+        setmessageNumber(state, data) {
+            state.messageNumber = data;
+        },
+        setmessageList(state, data) {
+            state.messageList = data;
+        },
+        setmessageStatus(state, data) {
+            state.messageStatus = data;
+        },
+        setTheme(state, data) {
+            state.theme = data;
+        },
+        setAreaSelect(state, data) {
+            state.areaSelect = data;
+        },
+        setNationArray(state, data) {
+            state.nationArray = data;
+        },
+        setNativeArray(state, data) {
+            state.nativeArray = data;
+        },
+        setCompanyArray(state, data) {
+            state.companyArray = data;
+        },
+        setDepartmentArray(state, data) {
+            state.departmentArray = data;
+        },
+        setCommunityArray(state, data) {
+            state.communityArray = data;
         }
-        return true
-      });
-    },
-    collapse(ctx, data) {
-      ctx.commit("setCollapse", data);
-    },
-    openModal(ctx, args) {
-      const params = { ...args };
-      params.id = 'modal_' + (+new Date())
-      import(/* webpackChunkName: "[request]" */ `@/views${params.url}`).then((res) => {
-        params.component = res.default;
-        params.show = true;
-        ctx.commit('setModalParams', params);
-      }).catch(err => {
-        ELEMENT.Message.error(`${err.message}，请刷新页面重试`);
-      });
     },
-    closeModal(ctx) {
-      ctx.commit('setModalParams', { show: false });
+    actions: {
+        tags(ctx, data) {
+            ctx.commit('setTagList', data);
+        },
+        /**
+         * @description: 打开弹窗
+         * @param {type} ctx vuex的上下文
+         * @param {object} args {
+         *  id: 唯一标识,必须
+         *  url: 打开的组件url地址，必须
+         *  params: 传递给弹出组件的参数,
+         *  notip: 是否显示*为填项必内容，为true时不显示
+         *  backgroud: 是否强制显示底部透明背景色，默认第二个弹出层时不显示透明底色，为true时一定显示
+         *  full: 是否为全屏展示,true为全屏
+         * }
+         * @return {null} null:
+         */
+        addPopup(ctx, args) {
+            console.log('ctx', ctx);
+            console.log('args', args);
+            const params = { ...args };
+            const list = ctx.getters.getPopups;
+            params.id = 'modal_' + +new Date();
+            import(/* webpackChunkName: "[request]" */ `@/views${params.url}`)
+                .then((res) => {
+                    params.component = res.default;
+                    params.show = true;
+                    list.push(params);
+                    ctx.commit('setPopups', list);
+
+                    // ctx.commit('setalertModalParams', params);
+                })
+                .catch((err) => {
+                    if (err.message.indexOf('Loading chunk') == 0) {
+                        ELEMENT.Message.info('版本已更新，请刷新页面重试');
+                    } else {
+                        ELEMENT.Message.info(err.message);
+                    }
+                });
+        },
+        delPopup(ctx, id) {
+            // let id=id;
+            // ctx.commit('setalertModalParams', { show: false});
+            const list = ctx.getters.getPopups;
+            list.every((item, index) => {
+                if (item.id === id) {
+                    list.splice(index, 1);
+                    ctx.commit('setPopups', list);
+                    // 解决弹窗关闭，滚动条没有关闭的情况
+                    // const $bar = document.querySelector('.dmp-scroll-bar')
+                    // if ($bar) {
+                    //   document.body.removeChild(document.querySelector('.dmp-scroll-bar'))
+                    // }
+                    return false;
+                }
+                return true;
+            });
+        },
+        collapse(ctx, data) {
+            ctx.commit('setCollapse', data);
+        },
+        openModal(ctx, args) {
+            const params = { ...args };
+            params.id = 'modal_' + +new Date();
+            import(/* webpackChunkName: "[request]" */ `@/views${params.url}`)
+                .then((res) => {
+                    params.component = res.default;
+                    params.show = true;
+                    ctx.commit('setModalParams', params);
+                })
+                .catch((err) => {
+                    ELEMENT.Message.error(`${err.message}，请刷新页面重试`);
+                });
+        },
+        closeModal(ctx) {
+            ctx.commit('setModalParams', { show: false });
+        }
     }
-  }
-})
+});
 export default store;

operationSupport/src/views/alarmManagement/details.vue

@@ -70,7 +70,7 @@ import envConfig from '@/config';
 import AmapInit from '@/components/common/AmapInit.vue';
 export default {
     components: { AmapInit },
-    name:'alarmManagementDetails',
+    name: 'alarmManagementDetails',
     mixins: [list],
     data() {
         return {
@@ -150,7 +150,9 @@ export default {
                 }
             ],
             selectRow: [],
-            dialogMapVisible: false
+            dialogMapVisible: false,
+            // 跳转的id
+            blankId: ''
         };
     },
     methods: {
@@ -253,6 +255,9 @@ export default {
         };
         // this.getAllScene();
         this.getPage();
+        if (this.$route.query.showDialog && this.$route.query.id) {
+            this.blankId = this.$route.query.id;
+        }
     }
 };
 </script>

operationSupport/src/views/assetManagement/housingManagement/saveEdits.vue

@@ -15,7 +15,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="单元">
-                        <el-select v-model="ruleForm.unitName" placeholder="请选择单元"  class="width100">
+                        <el-select v-model="ruleForm.unitName" placeholder="请选择单元" class="width100">
                             <el-option
                                 v-for="(item, index) in unitList"
                                 :label="item.unitName"
@@ -24,14 +24,14 @@
                             ></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="房屋号" prop="roomNumber"  >
+                    <el-form-item label="房屋号" prop="roomNumber">
                         <el-input v-model="ruleForm.roomNumber"></el-input>
                     </el-form-item>
-                    <el-form-item label="使用面积" >
+                    <el-form-item label="使用面积">
                         <el-input v-model="ruleForm.useArea"></el-input>
                     </el-form-item>
                     <el-form-item label="房屋朝向">
-                        <el-select v-model="ruleForm.orientationOfRoom" placeholder="请选择房屋朝向"  class="width100">
+                        <el-select v-model="ruleForm.orientationOfRoom" placeholder="请选择房屋朝向" class="width100">
                             <el-option label="东" :value="1"></el-option>
                             <el-option label="南" :value="2"></el-option>
                             <el-option label="西" :value="3"></el-option>
@@ -50,7 +50,7 @@
                 </div>
                 <div class="formContent-item">
                     <el-form-item label="楼栋" prop="buildingId">
-                        <el-select v-model="ruleForm.buildingId" placeholder="请选择楼栋"  class="width100">
+                        <el-select v-model="ruleForm.buildingId" placeholder="请选择楼栋" class="width100">
                             <el-option
                                 v-for="(item, index) in buildingList"
                                 :label="item.buildingName"
@@ -60,7 +60,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="楼层" prop="floorNumber">
-                        <el-select v-model="ruleForm.floorNumber" placeholder="请选择楼层"  class="width100">
+                        <el-select v-model="ruleForm.floorNumber" placeholder="请选择楼层" class="width100">
                             <el-option
                                 v-for="(item, index) in floorNumberList"
                                 :label="item.floorNumber"
@@ -70,7 +70,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="房屋类型" prop="buildingType">
-                        <el-select v-model="ruleForm.buildingType" disabled placeholder="请选择房屋类型"  class="width100">
+                        <el-select v-model="ruleForm.buildingType" disabled placeholder="请选择房屋类型" class="width100">
                             <el-option label="住宅" :value="1"></el-option>
                             <el-option label="商用" :value="2"></el-option>
                         </el-select>
@@ -82,7 +82,7 @@
                         <el-input v-model="ruleForm.publicArea"></el-input>
                     </el-form-item>
                     <el-form-item label="装修性质">
-                        <el-select v-model="ruleForm.decorateProperties" placeholder="请选择装修性质"  class="width100">
+                        <el-select v-model="ruleForm.decorateProperties" placeholder="请选择装修性质" class="width100">
                             <el-option label="毛胚" :value="1"></el-option>
                             <el-option label="简单装修" :value="2"></el-option>
                             <el-option label="中等装修" :value="3"></el-option>
@@ -216,6 +216,9 @@ export default {
         },
         cancelSaving() {
             this.$emit('clerOwnerStatus');
+            if (this.$route.query.showDialog) {
+                this.$router.replace('/workbench/index');
+            }
         },
         resetForm(formName) {
             this.$refs[formName].resetFields();
@@ -273,7 +276,7 @@ export default {
     }
 };
 </script>
-<style lang='scss'  scoped>
+<style lang="scss" scoped>
 @import '@assets/css/public-style.scss';
 .main {
     padding: 20px;

operationSupport/src/views/assetManagement/shopManagement/details.vue

@@ -4,7 +4,8 @@
             <h1>房屋号：{{ detailsData.roomNumber }}<span class="titleType">商铺</span></h1>
             <el-button class="right" type="primary" @click="close()">返回</el-button>
             <div class="text">
-                <span>所属社区： {{ detailsData.communityId | matchingVal($store.getters['getCommunityArray']) }}</span> <span>楼栋：{{ detailsData.communityName }}</span>
+                <span>所属社区： {{ detailsData.communityId | matchingVal($store.getters['getCommunityArray']) }}</span>
+                <span>楼栋：{{ detailsData.communityName }}</span>
             </div>
         </div>
         <div class="content">
@@ -377,7 +378,7 @@ export default {
     }
 };
 </script>
-<style lang='scss' scoped >
+<style lang="scss" scoped>
 @import '../style.scss';
 .detailImg {
     width: 200px;
@@ -394,4 +395,4 @@ export default {
         }
     }
 }
-</style>
+</style>

operationSupport/src/views/assetManagement/shopManagement/index.vue

@@ -293,7 +293,7 @@ export default {
         this.communityNameList();
         this.mixins_search('search');
         if (this.$route.query.showDialog) {
-            this.addOrEdit('add');
+            this.addOrEdit('add', 'cancal');
         }
     }
 };

operationSupport/src/views/assetManagement/shopManagement/saveEdits.vue

@@ -171,6 +171,9 @@ export default {
                                 this.$message.success(msg);
                                 this.params.callback();
                                 this.$emit('close');
+                                if (this.$route.query.showDialog) {
+                                    this.$router.replace('/workbench/index');
+                                }
                             } else {
                                 this.$message.error(msg);
                             }
@@ -232,7 +235,7 @@ export default {
     }
 };
 </script>
-<style lang='scss'  scoped>
+<style lang="scss" scoped>
 @import '@assets/css/public-style.scss';
 .main {
     padding: 20px;

operationSupport/src/views/buildingManagement/mixins/initList.js

@@ -1,148 +1,151 @@
 const createContinueData = (type, num) => {
-  //type--类型，num生成的个数
-  let objArr = [];
-  if (type == 'Number') {
-    [...new Array(num).keys()].map((idx) => {
-      let obj = { label: Number(idx) + 1, value: Number(idx) + 1 };
-      objArr.push(obj);
-    });
-  } else {
-    for (let i = 0; i < num; i++) {
-      let letter = String.fromCharCode(65 + i);
-      let obj = { label: letter, value: letter };
-      objArr.push(obj);
+    //type--类型，num生成的个数
+    let objArr = [];
+    if (type == 'Number') {
+        [...new Array(num).keys()].map((idx) => {
+            let obj = { label: Number(idx) + 1, value: Number(idx) + 1 };
+            objArr.push(obj);
+        });
+    } else {
+        for (let i = 0; i < num; i++) {
+            let letter = String.fromCharCode(65 + i);
+            let obj = { label: letter, value: letter };
+            objArr.push(obj);
+        }
     }
-  }
-  return objArr;
+    return objArr;
 };
 const txtI18n = {
-  build: '楼栋',
-  unit: '单元',
-  floor: '楼层',
-  door: '单元户'
+    build: '楼栋',
+    unit: '单元',
+    floor: '楼层',
+    door: '单元户'
 };
 export default {
-  data() {
-    return {
-      floorMsg: `双击可对楼栋、单元名称进行自定义修改\n单击选中楼栋、单元、单元户信息根据选中的楼栋、单元进行展示`,
-      unitMsg: '双击可对楼层、单元户名称进行更改',
-      copyformdata: {},
-      copyrules: {},
-      floorOptions: createContinueData('Number', 20),
-      floorlevelOptions: createContinueData('Number', 50),
-      unitOptions: createContinueData('Number', 20),
-      unithouseOptions: createContinueData('Number', 10),
-      buildingIndex: 0,
-      unitIndex: 0,
-      doorData: [],
-      unitrules: {},
-      inputValue: {
-        build: '',
-        unit: '',
-        floor: '',
-        door: ''
-      },
-    }
-  },
-  computed: {
-    communityArray() {
-      return this.$store.getters['getCommunityArray'];
-    }
-  },
-  methods: {
-    close() {
-      this.$emit('clerOwnerStatus');
+    data() {
+        return {
+            floorMsg: `双击可对楼栋、单元名称进行自定义修改\n单击选中楼栋、单元、单元户信息根据选中的楼栋、单元进行展示`,
+            unitMsg: '双击可对楼层、单元户名称进行更改',
+            copyformdata: {},
+            copyrules: {},
+            floorOptions: createContinueData('Number', 20),
+            floorlevelOptions: createContinueData('Number', 50),
+            unitOptions: createContinueData('Number', 20),
+            unithouseOptions: createContinueData('Number', 10),
+            buildingIndex: 0,
+            unitIndex: 0,
+            doorData: [],
+            unitrules: {},
+            inputValue: {
+                build: '',
+                unit: '',
+                floor: '',
+                door: ''
+            }
+        };
     },
-    toggleUnithOptions(e) {
-      if (e == 1) {
-        this.unithouseOptions = createContinueData('Number', 10)
-      } else {
-        this.unithouseOptions = createContinueData('Number', 60)
-      }
-    },
-    //深拷贝
-    deepClone(obj) {
-      if (typeof obj !== 'object') return;
-      let newObj = obj instanceof Array ? [] : {};
-      for (let key in obj) {
-        if (obj.hasOwnProperty(key)) {
-          newObj[key] = typeof obj[key] === 'object' ? this.deepClone(obj[key]) : obj[key];
+    computed: {
+        communityArray() {
+            return this.$store.getters['getCommunityArray'];
         }
-      }
-      return newObj;
-    },
-    showInput(e) {
-      if (!this.isAdd) {
-        this.$message.error('不可编辑')
-        return
-      }
-      e.target.nextElementSibling.style.display = 'inline-block';
-      e.target.style.display = 'none';
-      e.target.nextElementSibling.firstElementChild.focus();
-    },
-    inputConfirm(e, arr) {
-      const { value, dataset } = e.target;
-      const querySame = () => _.filter(arr, (v) => v.name == value);
-      if (e.target.value.length == 0) {
-        this.$message.error(`${txtI18n[dataset.code]}名称不能为空，请重新命名`);
-        e.target.focus();
-        return;
-      } else if (querySame().length > 1) {
-        this.$message.error(`${txtI18n[dataset.code]}名称重复，请修改`);
-        e.target.focus();
-        return;
-      }
-      e.target.parentElement.style.display = 'none';
-      e.target.parentElement.previousElementSibling.style.display = 'inline-block';
     },
-    clearDoor() {
-      if (!this.doorData.length) return;
-      this.__confirm('是否确认清空单元户？', '清空单元户')
-        .then((v) => {
-          this.doorData = [];
-        })
-        .catch(() => { });
-    },
-    handleClose(code, index, arr) {
-      if (!this.isAdd) {
-        this.$message.error('不可编辑')
-        return
-      }
-      console.log()
-      this.__confirm(`是否删除该${txtI18n[code]}？`, `删除${txtI18n[code]}`)
-        .then((v) => {
-          switch (code) {
-            case 'build':
-              if (this.buildingIndex == index) {
-                this.buildingIndex = 0;
-                this.unitIndex = 0;
-              }
-              break;
-            case 'unit':
-              if (arr.length == 1) {
-                this.$message.error('请直接删除该楼栋');
+    methods: {
+        close() {
+            this.$emit('clerOwnerStatus');
+            if (this.$route.query.showDialog) {
+                this.$router.replace('/workbench/index');
+            }
+        },
+        toggleUnithOptions(e) {
+            if (e == 1) {
+                this.unithouseOptions = createContinueData('Number', 10);
+            } else {
+                this.unithouseOptions = createContinueData('Number', 60);
+            }
+        },
+        //深拷贝
+        deepClone(obj) {
+            if (typeof obj !== 'object') return;
+            let newObj = obj instanceof Array ? [] : {};
+            for (let key in obj) {
+                if (obj.hasOwnProperty(key)) {
+                    newObj[key] = typeof obj[key] === 'object' ? this.deepClone(obj[key]) : obj[key];
+                }
+            }
+            return newObj;
+        },
+        showInput(e) {
+            if (!this.isAdd) {
+                this.$message.error('不可编辑');
                 return;
-              }
-              if (this.unitIndex == index) {
-                this.unitIndex = 0;
-              }
-              break;
-            case 'floor':
-              if (arr.length == 1) {
-                this.$message.error('请直接删除该单元');
+            }
+            e.target.nextElementSibling.style.display = 'inline-block';
+            e.target.style.display = 'none';
+            e.target.nextElementSibling.firstElementChild.focus();
+        },
+        inputConfirm(e, arr) {
+            const { value, dataset } = e.target;
+            const querySame = () => _.filter(arr, (v) => v.name == value);
+            if (e.target.value.length == 0) {
+                this.$message.error(`${txtI18n[dataset.code]}名称不能为空，请重新命名`);
+                e.target.focus();
                 return;
-              }
-              break;
-            case 'door':
-              if (arr.length == 1) {
-                this.$message.error('请直接删除该楼层');
+            } else if (querySame().length > 1) {
+                this.$message.error(`${txtI18n[dataset.code]}名称重复，请修改`);
+                e.target.focus();
                 return;
-              }
-              break;
-          }
-          arr.splice(index, 1);
-        })
-        .catch(() => { });
-    },
-  }
-}
+            }
+            e.target.parentElement.style.display = 'none';
+            e.target.parentElement.previousElementSibling.style.display = 'inline-block';
+        },
+        clearDoor() {
+            if (!this.doorData.length) return;
+            this.__confirm('是否确认清空单元户？', '清空单元户')
+                .then((v) => {
+                    this.doorData = [];
+                })
+                .catch(() => {});
+        },
+        handleClose(code, index, arr) {
+            if (!this.isAdd) {
+                this.$message.error('不可编辑');
+                return;
+            }
+            console.log();
+            this.__confirm(`是否删除该${txtI18n[code]}？`, `删除${txtI18n[code]}`)
+                .then((v) => {
+                    switch (code) {
+                        case 'build':
+                            if (this.buildingIndex == index) {
+                                this.buildingIndex = 0;
+                                this.unitIndex = 0;
+                            }
+                            break;
+                        case 'unit':
+                            if (arr.length == 1) {
+                                this.$message.error('请直接删除该楼栋');
+                                return;
+                            }
+                            if (this.unitIndex == index) {
+                                this.unitIndex = 0;
+                            }
+                            break;
+                        case 'floor':
+                            if (arr.length == 1) {
+                                this.$message.error('请直接删除该单元');
+                                return;
+                            }
+                            break;
+                        case 'door':
+                            if (arr.length == 1) {
+                                this.$message.error('请直接删除该楼层');
+                                return;
+                            }
+                            break;
+                    }
+                    arr.splice(index, 1);
+                })
+                .catch(() => {});
+        }
+    }
+};

operationSupport/src/views/communityManagement/pageJump/AddOrEdit.vue

@@ -277,6 +277,9 @@ export default {
         },
         close() {
             this.$emit('clerOwnerStatus');
+            if (this.$route.query.showDialog) {
+                this.$router.replace('/workbench/index');
+            }
         }
     },
     created() {
@@ -288,7 +291,7 @@ export default {
     }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 @import '@assets/css/public-style.scss';
 .main {
     padding: 20px;

operationSupport/src/views/ownerManagement/stepPage/add.vue

@@ -676,6 +676,6 @@ export default {
     }
 };
 </script>
-<style lang='scss' scoped >
+<style lang="scss" scoped>
 @import '../style.scss';
-</style>
+</style>

operationSupport/src/views/ownerManagement/stepPage/newAdd.vue

@@ -565,6 +565,9 @@ export default {
             itemObj['parkingList'].splice(index, 1);
         },
         closes() {
+            if (this.$route.query.showDialog) {
+                this.$router.replace('/workbench/index');
+            }
             this.$emit('clerOwnerStatus');
         },
         addEdit() {
@@ -623,7 +626,7 @@ export default {
     }
 };
 </script>
-<style lang='scss' scoped >
+<style lang="scss" scoped>
 @import '../style.scss';
 .addHouse {
     cursor: pointer;
@@ -657,4 +660,4 @@ export default {
     height: 32px;
     margin-bottom: 20px;
 }
-</style>
+</style>

operationSupport/src/views/propertyManagement/common/upImage.vue

@@ -68,11 +68,12 @@ export default {
         };
     },
     methods: {
-        clearImageList() {
+        clearImageList(value) {
             console.log('clearImageList');
-            this.imageFileList = [];
-            this.fileList = [];
-            this.imagefileListAll = [];
+            this.imageFileList = value;
+            this.fileList = value;
+            this.imagefileListAll = value;
+            this.$emit('clearImageList', value);
         },
         onExceed(files, fileList) {
             this.$message.warning(`最多可选 ${this.limit}  张图片`);

operationSupport/src/views/propertyManagement/inform.vue

@@ -187,6 +187,7 @@
                                                     @successCBK="imageSuccessCBK"
                                                     @deleteImage="deleteImage"
                                                     @successImageList="successImageList"
+                                                    @clearImageList="clearImageList"
                                                     ref="upImages"
                                                 ></up-image>
                                             </div>
@@ -252,13 +253,21 @@
                                 <GeminiScrollbar class="my-scroll-bar" :autoshow="false">
                                     <div class="dialog-right-content">
                                         <div class="dialog-title">
-                                            <div class="dialog-titles">
+                                            <div class="dialog-titles" v-if="showDetail">
+                                                {{ ruleForm.title ? ruleForm.title : '标题' }}
+                                            </div>
+                                            <div class="dialog-titles" v-else>
                                                 {{ rowDetail.title ? rowDetail.title : '标题' }}
                                             </div>
-                                            <div class="dialog-urgency" v-if="rowDetail.urgentFlag">紧急</div>
+                                            <div v-if="showDetail">
+                                                <div class="dialog-urgency" v-if="ruleForm.exigencyOr == '是'">紧急</div>
+                                            </div>
+                                            <div v-else>
+                                                <div class="dialog-urgency" v-if="rowDetail.urgentFlag">紧急</div>
+                                            </div>
                                             <!-- ruleForm.exigencyOr -->
                                         </div>
-                                        <div class="dialog-right-time" v-if="showDetail">{{ rowDetail.pubDate }}</div>
+                                        <div class="dialog-right-time" v-if="!showDetail">{{ rowDetail.pubDate }}</div>
                                         <div class="dialog-right-time" v-else>{{ new Date() | filterTime }}</div>
                                         <div></div>
                                         <div class="content">
@@ -328,7 +337,6 @@ export default {
             showDetail: true,
             rowDetail: '',
             contentHtml: '',
-            contents: '',
             // 查询的时间
             searchTime: [],
             // 添加弹框信息
@@ -661,19 +669,15 @@ export default {
             this.successImageLists = '';
             if (val) {
                 this.showUploadImage = true;
-                this.rowDetail = '';
-                this.showDetail = true;
-                this.centerDialogVisible = true;
-                if (this.successImageLists.length > 0) {
-                    this.$refs.upImages.clearImageList();
-                }
             } else {
                 this.showUploadImage = false;
-                if (this.contents) {
-                    this.$refs.endit.setContent(this.contents);
-                    this.$refs['ruleForm'].resetFields();
-                }
             }
+            // this.rowDetail = '';
+            // this.showDetail = true;
+            // this.centerDialogVisible = true;
+            // this.$refs.upImages.clearImageList('');
+            // this.$refs.endit.setContent('');
+
             console.log('发布活动类型', val);
         },
         // 清空
@@ -687,10 +691,10 @@ export default {
             this.uploadFileUrl = [];
             this.fileList = [];
             this.ruleForm.exigencyText = true;
-            if (this.contents) {
-                this.$refs.endit.setContent(this.contents);
-                this.$refs['ruleForm'].resetFields();
-            }
+            this.contentHtml = '';
+            this.setContent = '';
+            this.$refs.endit.setContent('');
+            this.$refs['ruleForm'].resetFields();
         },
         /**添加按钮 */
         add() {
@@ -706,12 +710,10 @@ export default {
             this.filePath = '';
             this.uploadFileUrl = [];
             this.fileList = [];
-            if (this.contents) {
-                this.$refs.endit.setContent(this.contents);
-                this.$refs['ruleForm'].resetFields();
-            }
-            if (this.successImageLists.length > 0) {
-                this.$refs.upImages.clearImageList();
+            this.$refs.endit.setContent('');
+            this.$refs['ruleForm'].resetFields();
+            if (this.showUploadImage) {
+                this.$refs.upImages.clearImageList('');
             }
         },
         /**查询按钮*/
@@ -763,7 +765,7 @@ export default {
                             //   pubStatus: "",
                             themePictrue: JSON.stringify(this.successImageLists),
                             userId: this.ruleForm.issueRoom.checkAll
-                                ? this.selectDataHouseTreeData.userID
+                                ? this.selectDataHouseTreeData.userList
                                 : this.selectDataPeopleTreeData.userList,
                             treeData: JSON.stringify([]),
                             title: this.ruleForm.title,
@@ -775,14 +777,23 @@ export default {
                         this.$http.post('/sc-community-web/notice/add', query).then((res) => {
                             if (res.status === 0) {
                                 this.$message.success('发布成功');
+                                this.$refs.endit.setContent('');
+                                this.$refs['ruleForm'].resetFields();
+                                this.successImageList = [];
+
+                                this.clear();
+                                this.$refs['ruleForm'].resetFields();
+                                if (this.showUploadImage) {
+                                    this.$refs.upImages.clearImageList('');
+                                }
                                 this.mixins_search();
                             } else {
-                                this.$message('系统繁忙,请稍后重试');
+                                this.$message('发布失败,请稍后重试');
                                 this.successImageList = [];
                                 this.contentHtml = '';
+                                this.clear();
                             }
                             this.centerDialogVisible = false;
-
                             console.log('点击发布', res);
                         });
                     } else {
@@ -790,18 +801,21 @@ export default {
                     }
                 });
             } else if (type == 'clear') {
+                if (this.$route.query.showDialog) {
+                    this.$router.replace('/workbench/index');
+                }
                 this.centerDialogVisible = false;
                 this.clear();
                 this.$refs['ruleForm'].resetFields();
-                if (this.successImageLists.length > 0) {
-                    this.$refs.upImages.clearImageList();
+                if (this.showUploadImage) {
+                    this.$refs.upImages.clearImageList('');
                 }
             } else {
                 this.centerDialogVisible = false;
                 this.clear();
                 this.$refs['ruleForm'].resetFields();
-                if (this.successImageLists.length > 0) {
-                    this.$refs.upImages.clearImageList();
+                if (this.showUploadImage) {
+                    this.$refs.upImages.clearImageList('');
                 }
             }
         },

operationSupport/src/views/workbench/index.vue

@@ -75,31 +75,31 @@
                 <div class="center-left-text">快速操作</div>
                 <ul>
                     <!-- <li @click="goPath('/communityManagement/pageJump/AddOrEdit')"> -->
-                    <li @click="goPath('/communityManagement', true)">
+                    <li @click="goPathBack('/communityManagement', true)">
                         <div>
                             <img src="../../assets/img/icon_shequ.png" alt="" />
                         </div>
                         <span>添加社区</span>
                     </li>
-                    <li @click="goPath('/buildingManagement', true)">
+                    <li @click="goPathBack('/buildingManagement', true)">
                         <div>
                             <img src="../../assets/img/icon_loudong.png" alt="" />
                         </div>
                         <span>添加楼栋</span>
                     </li>
-                    <li @click="goPath('/housingManagement', true)">
+                    <li @click="goPathBack('/housingManagement', true)">
                         <div>
                             <img src="../../assets/img/icon_fangwu.png" alt="" />
                         </div>
                         <span>添加房屋</span>
                     </li>
-                    <li @click="goPath('/shopManagement', true)">
+                    <li @click="goPathBack('/shopManagement', true)">
                         <div>
                             <img src="../../assets/img/icon_shangpu.png" alt="" />
                         </div>
                         <span>添加商铺</span>
                     </li>
-                    <li @click="goPath('/ownerManagement/index', true)">
+                    <li @click="goPathBack('/ownerManagement/index', true)">
                         <div>
                             <img src="../../assets/img/icon_zhuhu.png" alt="" />
                         </div>
@@ -165,7 +165,7 @@
                     <div @click="goPath('/propertyManagement/inform')">查看更多&nbsp;></div>
                 </div>
                 <ul v-if="informData.length > 0">
-                    <li v-for="(item, index) in informData" :key="index" @click="goPath('/propertyManagement/inform', true, item.id)">
+                    <li v-for="(item, index) in informData" :key="index" @click="goPathBack('/propertyManagement/inform', true, item.id)">
                         <div class="footer-content">
                             <div>[{{ item.title }}]</div>
                             <div v-html="item.content"></div>
@@ -178,11 +178,11 @@
             <div class="footer-left" style="margin-right: 0">
                 <div class="footer-left-text">
                     <div>告警信息</div>
-                    <div @click="goPath('/alarmManagement/details')">查看更多&nbsp;></div>
+                    <div @click="goPath('/alarmManagement/index')">查看更多&nbsp;></div>
                 </div>
                 <div v-if="warnData.length > 0">
                     <ul>
-                        <li @click="goPath('/alarmManagement/details', true)" v-for="(item, index) in warnData" :key="index">
+                        <li @click="goPath('/alarmManagement/details', true, item.id)" v-for="(item, index) in warnData" :key="index">
                             <div class="footer-content">
                                 <div>[{{ item.name }}]</div>
                                 <div>{{ item.alarmContent }}</div>
@@ -216,6 +216,22 @@ export default {
     },
 
     methods: {
+        // 打开新页  跳转的路径
+        goPath(path, showDialog, id) {
+            let routeData = this.$router.resolve({
+                path: path,
+                query: {
+                    showDialog: showDialog,
+                    id: id
+                }
+            });
+            window.open(routeData.href, '_blank');
+        },
+        // 跳转路由页面 返回
+        goPathBack(path, showDialog, id) {
+            this.$router.push({ path, query: { showDialog: showDialog, id: id } });
+        },
+
         // 获取待处理事项
         getPendData() {
             this.$http.get('/sc-community-web/Workbench/pendingMatters').then((res) => {
@@ -257,17 +273,6 @@ export default {
                     this.$message.warning('获取通知信息失败');
                 }
             });
-        },
-        // 跳转的路径
-        goPath(path, showDialog, id) {
-            let routeData = this.$router.resolve({
-                path: path,
-                query: {
-                    showDialog: showDialog,
-                    id: id
-                }
-            });
-            window.open(routeData.href, '_blank');
         }
     }
 };