feat:新增初始区域、修改窗口关联事项

base-manager-ui/admin/.env

@@ -7,8 +7,6 @@ VUE_APP_USER_KEY=admin.user
 VUE_APP_SETTING_KEY=admin.setting
 VUE_APP_TBAS_KEY=admin.tabs
 VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
-# 顶层区域id
-VUE_APP_topParent=四川省
 #VUE_APP_API_BASE_URL=http://api.iczer.com
 #门户
 VUE_APP_API_portal_URL=http://192.168.0.98:11072
\ No newline at end of file

base-manager-ui/admin/src/assets/css/common.less

@@ -51,4 +51,19 @@
 ::-webkit-scrollbar-track {
   border-radius: 5px;
   background: #fff;
+}
+
+.color_title {
+  margin-left: 15px;
+  position: relative;
+  margin-bottom: 15px;
+  &::before {
+    content: "";
+    width: 4px;
+    height: 20px;
+    position: absolute;
+    top: 1px;
+    left: -16px;
+    background-color: rgba(5, 149, 253, 1);
+  }
 }
\ No newline at end of file

base-manager-ui/admin/src/components/initarea/InitArea.vue

+<template>
+  <div>
+    <a-modal
+      v-model="Visible"
+      title="初始化区域数据"
+      @ok="handleOk"
+      @cancel="handleClose"
+    >
+      <a-form-model
+        :model="form"
+        ref="form"
+        :label-col="{ span: 5 }"
+        :wrapper-col="{ span: 19 }"
+      >
+        <a-form-model-item label="区域名称" prop="name">
+          <a-input placeholder="请输入区域名称" v-model="form.name" />
+        </a-form-model-item>
+        <a-form-model-item label="区域编码" prop="areaCode">
+          <a-input placeholder="请输入区域编码" v-model="form.areaCode" />
+        </a-form-model-item>
+      </a-form-model>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { initArea } from "../../services/basicsetFun";
+export default {
+  props: {
+    visibleInit: {
+      required: true,
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      form: {
+        name: "",
+        areaCode: "",
+      },
+    };
+  },
+  computed: {
+    Visible: {
+      get() {
+        return this.visibleInit;
+      },
+      set(val) {
+        this.$emit("update:visibleInit", val);
+      },
+    },
+  },
+  methods: {
+    async handleOk() {
+      if (this.form.name || this.form.areaCode) {
+        let res = await initArea(this.form);
+        let { code, msg } = res.data;
+        if (code === 1) {
+          this.$message.success(msg);
+          this.handleClose();
+          setTimeout(() => {
+            location.reload();
+          }, 2000);
+        }
+      } else {
+        this.$message.warning("区域名称和区域编码至少填写一样");
+      }
+    },
+    // 关闭对话框
+    handleClose() {
+      this.$refs.form.resetFields();
+      this.Visible = false;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.ant-form-item {
+  display: flex;
+  align-items: center !important;
+  margin-bottom: 15px;
+}
+/deep/.ant-form-explain {
+  position: absolute;
+}
+</style>
\ No newline at end of file

base-manager-ui/admin/src/components/sitetree/index.vue

@@ -17,7 +17,7 @@
 // api
 import {
   getListByParentId,
-  areaList,
+  // areaList,
   //  getSiteList
 } from "@/services/basicsetFun";
 import local from "@/utils/local";
@@ -26,7 +26,6 @@ export default {
     return {
       treeData: [], //树结构
       id: "",
-      topParent: process.env.VUE_APP_topParent,
     };
   },
 
@@ -37,17 +36,9 @@ export default {
   methods: {
     // 获取区域
     async getAreaList() {
-      let res = await areaList({ name: this.topParent });
+      let res = await getListByParentId({ parentId: 0 });
       const { data, code } = res.data;
       if (code === 1) {
-        console.log(data.data);
-
-        data.data = data.data.map((v) => {
-          return {
-            label: v.name,
-            id: v.iid,
-          };
-        });
         this.treeData = data.data;
       }
     },
@@ -63,34 +54,9 @@ export default {
           this.treeData = [...this.treeData];
           resolve();
         });
-        // if (treeNode.dataRef.children) {
-        //   return;
-        // }
       });
-      //   let { id } = treeNode.dataRef;
-      //   // 获取区域站点列表
-      //   getSiteList({ areaID: id }).then((res) => {
-      //     let { code, data } = res.data;
-      //     if (code === 1) {
-      //       console.log(">>", treeNode.dataRef);
-      //       treeNode.dataRef.children = data.data;
-      //       this.treeData = [...this.treeData];
-      //       resolve();
-      //     }
-      //   });
-      //   // 获取子区域
-      //   getListByParentId({
-      //     parentId: treeNode.dataRef.id,
-      //   }).then((res) => {
-      //     const { data } = res.data;
-      //     treeNode.dataRef.children = data.data;
-      //     this.treeData = [...this.treeData];
-      //     resolve();
-      //   });
-      //   console.log("树", this.treeData);
-      // });
     },
-
+    // 选中区域
     onSelect(num, node) {
       if (num && node.selectedNodes.length > 0) {
         let { dataRef } = node.selectedNodes[0].data.props;

base-manager-ui/admin/src/layouts/header/AdminHeader.vue

@@ -32,7 +32,14 @@
           @select="onSelect"
         />
       </div>
-      <div :class="['admin-header-right', headerTheme]">
+      <div :class="['admin-header-right', headerTheme, 'flex', 'aic']">
+        <a-button
+          v-permission="[1]"
+          type="primary"
+          class="mr10"
+          @click="visibleInit = true"
+          >初始化区域数据</a-button
+        >
         <a-tooltip class="header-item" title="返回门户" placement="bottom">
           <a :href="portalUrl + '/#/home/siteArrange'">
             <a-icon type="home" /> 返回门户
@@ -57,6 +64,8 @@
         </a-dropdown> -->
       </div>
     </div>
+    <!-- 初始化区域数据弹窗 -->
+    <InitArea :visibleInit.sync="visibleInit"></InitArea>
   </a-layout-header>
 </template>
 
@@ -65,15 +74,17 @@
 // import HeaderNotice from './HeaderNotice'
 // import HeaderSite from "./HeaderSite";
 // import HeaderAvatar from "./HeaderAvatar";
+import InitArea from "../../components/initarea/InitArea.vue";
 import IMenu from "@/components/menu/menu";
 import { mapState, mapMutations } from "vuex";
 
 export default {
   name: "AdminHeader",
-  components: { IMenu },
+  components: { IMenu, InitArea },
   props: ["collapsed", "menuData"],
   data() {
     return {
+      visibleInit: false,
       langList: [
         { key: "CN", name: "简体中文", alias: "简体" },
         { key: "HK", name: "繁體中文", alias: "繁體" },

base-manager-ui/admin/src/pages/basicset/dept/components/addWindowMatter.vue

 <template>
   <div class="addwindowmatter" :class="{ isShow: Visible }">
     <a-card
-      :title="matterInfo.windowName"
+      :title="windowInfo.windowName"
       :bordered="false"
       :headStyle="{ color: '#0595FD' }"
     >
@@ -45,7 +45,7 @@
             showSizeChanger: true,
             showQuickJumper: true,
             pageSizeOptions: pageSizeOptions,
-            onChange: handleChange,
+            onChange: changePagination,
             onShowSizeChange: showSizeChange,
           }"
           :columns="leftColumns"
@@ -55,55 +55,97 @@
         >
           <template slot="num" slot-scope="text, record, index">
             <span>
-              {{ index + 1 }}
+              {{ (Current - 1) * size + index + 1 }}
             </span>
           </template>
           <!-- 排序 -->
           <template slot="sort" slot-scope="text">
-            <span>{{ text.sort ? text.sort : "--" }}</span>
+            <span v-if="!text.isEdit">{{ text.sort }}</span>
+            <a-input v-else v-model="text.sort"></a-input>
           </template>
           <!-- 是否显示 -->
           <template slot="isShow" slot-scope="text">
-            <y-switch v-model="text.isShow" :disabled="true"></y-switch>
+            <!-- <a-tag v-if="text.isShow" color="green"> 是 </a-tag>
+            <a-tag v-else color="red"> 否 </a-tag> -->
+            <y-switch v-model="text.isShow" :disabled="!text.isEdit"></y-switch>
           </template>
           <template slot="action" slot-scope="text">
-            <a href="javascript:;" class="edit" @click="handleEdit(text)"
-              >编辑</a
-            >
+            <a href="javascript:;" class="edit" @click="handleEdit(text)">{{
+              text.isEdit ? "保存" : "编辑"
+            }}</a>
             <a href="javascript:;" @click="handleDel(+text.id)" class="delete"
               >删除</a
             >
           </template>
         </a-table>
       </div>
-      <!-- 分页 -->
-      <!-- <div class="pagination" v-if="total">
-        <a-pagination
-          v-model="Current"
-          :show-total="(total) => `共 ${total} 条`"
-          :total="total"
-          @change="changePagination"
-          show-less-items
-          show-size-changer
-          show-quick-jumper
-          :pageSizeOptions="pageSizeOptions"
-          @showSizeChange="showSizeChange"
-        />
-      </div> -->
     </a-card>
     <!-- 新增窗口事项 -->
-    <a-modal v-model="visible" :title="modalTile" @cancel="handleClose">
+    <a-modal
+      width="800px"
+      v-model="visible"
+      :title="modalTile"
+      @cancel="handleClose"
+    >
       <template slot="footer">
         <a-button @click="handleReset">重置</a-button>
         <a-button type="primary" @click="handleOk">确定</a-button>
       </template>
-      <a-form-model
+      <!-- <div class="form-isShow">
+        <span>是否显示：</span><y-switch v-model="formData.isShow"></y-switch>
+      </div>
+      <div class="form-isShow">
+        <span>排序：</span>
+        <a-input-number v-model="formData.sort" :min="0" />
+      </div> -->
+      <div class="color_title flex jcb">
+        <span>站点事项列表：</span>
+        <a-input-search
+          style="width: 300px"
+          placeholder="输入事项名称搜索"
+          enter-button="搜索"
+          allowClear
+          @search="onSearchMatter"
+          v-model="matterNameSearch"
+        />
+      </div>
+      <div style="margin-top: 10px">
+        <a-table
+          bordered
+          :loading="matterLoading"
+          :scroll="{ y: 350 }"
+          size="small"
+          :pagination="{
+            showTotal: (total) => `共 ${total} 条`,
+            current: page,
+            total: matterTotal,
+            size: 'small',
+            onChange: changeMatter,
+          }"
+          :columns="matterColumns"
+          :data-source="siteMatterData"
+          :rowKey="(record) => record.id"
+          :row-selection="{
+            type: 'radio',
+            selectedRowKeys: matterKeys,
+            onChange: handleChange,
+          }"
+        >
+          <template slot="num" slot-scope="text, record, index">
+            <span>
+              {{ (page - 1) * 10 + index + 1 }}
+            </span>
+          </template>
+        </a-table>
+      </div>
+      <!-- <a-form-model
         :model="formData"
         :rules="rules"
         ref="formData"
         :label-col="{ span: 4 }"
         :wrapper-col="{ span: 18 }"
       >
+      
         <a-form-model-item label="事项名称" prop="siteMatterId">
           <a-select
             style="width: 354px"
@@ -125,20 +167,10 @@
         <a-form-model-item label="排序" prop="sort">
           <a-input v-model="formData.sort" placeholder="请输入排序" />
         </a-form-model-item>
-        <!-- <a-form-model-item label="所属部门">
-          <a-select
-            default-value="lucy"
-            style="width: 354px"
-            @change="handleChange"
-          >
-            <a-select-option value="jack"> Jack </a-select-option>
-            <a-select-option value="lucy"> Lucy </a-select-option>
-          </a-select>
-        </a-form-model-item> -->
         <a-form-model-item label="是否显示" prop="isShow">
           <y-switch v-model="formData.isShow"></y-switch>
         </a-form-model-item>
-      </a-form-model>
+      </a-form-model> -->
     </a-modal>
   </div>
 </template>
@@ -190,6 +222,23 @@ const leftColumns = [
     },
   },
 ];
+const matterColumns = [
+  {
+    title: "序号",
+    key: "id",
+    width: "10%",
+    scopedSlots: { customRender: "num" },
+  },
+  {
+    title: "部门",
+    dataIndex: "deptName",
+    width: "20%",
+  },
+  {
+    title: "事项名称",
+    dataIndex: "matterName",
+  },
+];
 export default {
   components: {
     YSwitch,
@@ -204,6 +253,7 @@ export default {
   data() {
     return {
       leftColumns,
+      matterColumns,
       visible: false,
       isLoading: false,
       modalTile: "新增窗口事项",
@@ -213,19 +263,25 @@ export default {
       pageSizeOptions: ["10", "30", "50", "100"],
       tableData: [],
       siteMatterData: [], // 站点事项列表
+      matterTotal: 0,
+      page: 1,
+      matterLoading: false,
+      matterKeys: [],
+      matterRows: [],
+      matterNameSearch: "", // 事项名称搜索
       allDel: "", // 批量删除id
-      matterInfo: {},
+      windowInfo: {},
       formData: {
-        siteMatterId: undefined,
+        siteMatterId: "",
         matterName: "",
-        isShow: 1,
-        sort: "",
-      },
-      rules: {
-        siteMatterId: [
-          { required: true, message: "事项不能为空", trigger: "change" },
-        ],
+        isShow: 0,
+        sort: 0,
       },
+      // rules: {
+      //   siteMatterId: [
+      //     { required: true, message: "事项不能为空", trigger: "change" },
+      //   ],
+      // },
     };
   },
   created() {},
@@ -240,22 +296,35 @@ export default {
     },
   },
   methods: {
-    // 获取部门窗口信息
-    getMatterInfo(info) {
-      this.matterInfo = info;
-      this.getSiteMatterData();
+    // 获取窗口信息
+    getDeptInfo(info) {
+      this.windowInfo = info;
+      // this.getSiteMatterData();
       this.getWindowmatterData();
-      console.log(info);
     },
     //   获取站点事项
     async getSiteMatterData() {
+      this.matterLoading = true;
       let res = await getSiteMatterList({
-        page: 1,
-        size: -1,
-        siteId: this.matterInfo.siteId,
+        page: this.page,
+        size: 10,
+        siteId: this.windowInfo.siteId,
+        matterName: `%${this.matterNameSearch}%`,
       });
-      let { data } = res.data.data;
+      let { data, total } = res.data.data;
       this.siteMatterData = data;
+      this.matterTotal = total;
+      this.matterLoading = false;
+    },
+    // 站点事项翻页
+    changeMatter(cur) {
+      this.page = cur;
+      this.getSiteMatterData();
+    },
+    // 站点事项搜索
+    onSearchMatter() {
+      this.page = 1;
+      this.getSiteMatterData();
     },
     // 获取窗口事项列表
     async getWindowmatterData(search = {}) {
@@ -263,7 +332,7 @@ export default {
       let res = await getWindowmatterList({
         page: this.Current,
         size: this.size,
-        windowId: this.matterInfo.windowId,
+        windowId: this.windowInfo.windowId,
         ...search,
       });
       let { total, data } = res.data.data;
@@ -271,6 +340,9 @@ export default {
         this.Current -= 1;
         this.getWindowmatterData();
       }
+      data.forEach((v) => {
+        v.isEdit = false;
+      });
       this.total = total;
       this.tableData = data;
       this.isLoading = false;
@@ -278,9 +350,12 @@ export default {
     // 打开新增窗口
     addWindowMatter() {
       this.modalTile = "新增窗口事项";
-      this.visible = true;
       Object.assign(this.formData, this.$options.data().formData);
       this.formData.id && this.$delete(this.formData, "id");
+      this.page = 1;
+      this.matterNameSearch = "";
+      this.getSiteMatterData();
+      this.visible = true;
     },
     // 搜索
     onSearch(val) {
@@ -299,33 +374,43 @@ export default {
       this.getWindowmatterData();
     },
     // 保存
-    handleOk() {
-      this.$refs.formData.validate(async (valid) => {
-        if (valid) {
-          let res = await saveWindowmatter({
-            ...this.formData,
-            ...this.matterInfo,
-          });
-          let { code, msg } = res.data;
-          if (code === 1) {
-            this.$message.success(msg);
-            this.visible = false;
-            this.$refs.formData.resetFields();
-            this.getWindowmatterData();
-          } else {
-            this.$message.error(msg);
-          }
+    async handleOk() {
+      if (this.matterKeys.length) {
+        let res = await saveWindowmatter({
+          ...this.formData,
+          ...this.windowInfo,
+          siteMatterId: this.matterKeys.join(","),
+          matterName: this.matterRows[0].matterName,
+          deptId: this.matterRows[0].deptId,
+          deptName: this.matterRows[0].deptName,
+        });
+        let { code, msg } = res.data;
+        if (code === 1) {
+          this.$message.success(msg);
+          this.matterKeys = [];
+          this.matterRows = [];
+          this.visible = false;
+          this.getWindowmatterData();
         }
-      });
+      } else {
+        this.$message.warning("请先勾选事项");
+      }
+    },
+    // 重置
+    handleReset() {
+      this.matterKeys = [];
+      this.matterRows = [];
     },
     // 全选
     onSelectChange(data) {
       this.allDel = data.join(",");
     },
     // 事项选择选择
-    handleChange(val, event) {
-      let { text } = event.componentOptions.children[0];
-      this.formData.matterName = text;
+    handleChange(keys, rows) {
+      this.matterKeys = keys;
+      this.matterRows = rows;
+      // let { text } = event.componentOptions.children[0];
+      // this.formData.matterName = text;
     },
     // 事项搜索
     filterOption(input, option) {
@@ -335,13 +420,11 @@ export default {
           .indexOf(input.toLowerCase()) >= 0
       );
     },
-    // 重置
-    handleReset() {
-      this.$refs.formData.resetFields();
-    },
     // 关闭添加窗口
     handleClose() {
-      this.$refs.formData.resetFields();
+      // this.$refs.formData.resetFields();
+      this.matterKeys = [];
+      this.matterRows = [];
       this.visible = false;
     },
     // 返回
@@ -384,10 +467,21 @@ export default {
       }
     },
     // 编辑
-    handleEdit(data) {
-      this.modalTile = "编辑窗口事项";
-      this.formData = { ...data };
-      this.visible = true;
+    async handleEdit(data) {
+      data.isEdit = !data.isEdit;
+      if (!data.isEdit) {
+        let res = await saveWindowmatter(data);
+        let { code, msg } = res.data;
+        if (code === 1) {
+          this.$message.success(msg);
+          this.getWindowmatterData();
+        } else {
+          this.getWindowmatterData();
+        }
+      }
+      // this.modalTile = "编辑窗口事项";
+      // this.formData = { ...data };
+      // this.visible = true;
     },
   },
 };
@@ -434,4 +528,9 @@ export default {
   display: flex;
   align-items: center !important;
 }
+.form-isShow {
+  margin-bottom: 20px;
+  display: flex;
+  align-items: center;
+}
 </style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/dept/department.vue

@@ -197,6 +197,14 @@
               <a-empty v-else :image="simpleImage" />
             </a-form-model-item>
           </a-form-model>
+          <!-- <div style="text-align: right">
+            <a-pagination
+              simple
+              :current="businessPage"
+              :total="businessTotal"
+              @change="changeBusinessPage"
+            />
+          </div> -->
         </a-modal>
       </div>
     </div>
@@ -339,6 +347,8 @@ export default {
       size: 10,
       total: 0,
       pageSizeOptions: ["10", "30", "50", "100"],
+      // businessPage: 1, // 站点业务翻页
+      // businessTotal: 0, // 站点业务总数
       rules: {
         businessIds: [
           { required: false, message: "业务不能为空", trigger: "change" },
@@ -367,9 +377,8 @@ export default {
   },
   methods: {
     handleClick(val) {
+      Object.assign(this.$data, this.$options.data());
       this.siteId = val.id;
-      this.active = undefined;
-      this.deptId = "";
       this.getDeptListData({ siteId: val.id });
       this.getWindowListData({ siteId: val.id });
       this.getBusinessData({ siteId: val.id });
@@ -427,6 +436,11 @@ export default {
         .flat();
       this.business = this.delChildren(this.business);
     },
+    // 关联业务翻页
+    // changeBusinessPage(cur) {
+    //   this.businessPage = cur;
+    //   this.getBusinessData();
+    // },
     // 新增部门
     showModalAdd() {
       if (!this.siteId) {
@@ -481,7 +495,6 @@ export default {
         },
       });
     },
-
     // 窗口列表
     async getWindowListData(obj = {}) {
       this.loading = true;
@@ -500,7 +513,6 @@ export default {
         this.loading = false;
       }
     },
-
     // 新增窗口
     addModal() {
       if (!this.siteId) {
@@ -572,7 +584,6 @@ export default {
       }
       this.visibleWork = true;
     },
-
     // 保存窗口关联业务
     handleWork() {
       this.$refs.formData.validate(async (valid) => {
@@ -606,7 +617,7 @@ export default {
         siteId: data.siteId,
         windowMatterList: data.windowMatterList,
       };
-      this.$refs.addWindowMatter.getMatterInfo(obj);
+      this.$refs.addWindowMatter.getDeptInfo(obj);
     },
   },
 };

base-manager-ui/admin/src/pages/basicset/site/website.vue

@@ -17,7 +17,10 @@
             <div class="site_box">
               <div class="site_message">站点信息</div>
               <div class="btn-box">
-                <a-button type="primary" @click="handleSync(item.id)"
+                <a-button
+                  v-permission="[1]"
+                  type="primary"
+                  @click="handleSync(item.id)"
                   >同步数据</a-button
                 >
                 <a-button type="primary" @click="editSiteInfo(item)"
@@ -80,7 +83,7 @@
                       <span>{{ item.building }}栋</span>
                     </a-col>
                     <a-col :span="8">
-                      <span>总楼数：</span>
+                      <span>总楼层：</span>
                       <span>{{ item.level }}楼</span>
                     </a-col>
                   </a-row>

base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue

@@ -400,6 +400,7 @@ export default {
     },
     // 编辑
     onEdit(row) {
+      console.log(row);
       this.formData = { ...row };
     },
   },

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -139,20 +139,6 @@
           </span>
         </a-table>
       </div>
-      <!-- 分页 -->
-      <!-- <div class="pagination" v-if="total">
-        <a-pagination
-          v-model="page"
-          :show-total="(total) => `共 ${total} 条`"
-          :total="total"
-          show-less-items
-          @change="handlePagination"
-          show-size-changer
-          show-quick-jumper
-          :pageSizeOptions="pageSizeOptions"
-          @showSizeChange="showSizeChange"
-        />
-      </div> -->
     </div>
     <!-- 新增工作人员 -->
     <addpersonnel
@@ -521,8 +507,9 @@ export default {
     }
   }
   .right {
-    padding-top: 10px;
     width: 100%;
+    padding-right: 20px;
+    padding-top: 10px;
     color: #333;
     overflow-y: auto;
     padding-left: 20px;

base-manager-ui/admin/src/services/basicsetApi.js

@@ -27,6 +27,7 @@ module.exports = {
     treeselect: `${BASE_URL}/area/treeselect`,
     save: `${BASE_URL}/area/save`,
     delete: `${BASE_URL}/area/delete`,
+    init: `${BASE_URL}/base/area/genSubAreaByAreaName  `,
   },
   // 站点
   site: {

base-manager-ui/admin/src/services/basicsetFun.js

@@ -3,6 +3,10 @@ import { area, site, model } from "@/services/basicsetApi";
 import { request, METHOD } from "@/utils/request";
 
 // 区域
+// 初始化区域数据
+export async function initArea(data) {
+  return request(area.init, METHOD.POST, data);
+}
 // 获取列表
 export async function areaList(data) {
   return request(area.list, METHOD.POST, data);