From 250776897a2109a35c49e9b364033615e101e7c4 Mon Sep 17 00:00:00 2001
From: lijianzhong <m18328725261@163.com>
Date: Tue, 23 Jan 2024 17:52:02 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=8A=9F=E8=83=BD=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/industry.ts                       | 143 ++++++++++++++++
 src/router/modules/system.js              |  64 +++++--
 src/router/modules/work-trends.js         |  26 +++
 src/router/routes.js                      |   6 +-
 src/views/base-manage/residence/index.vue |   1 -
 src/views/system/log/option/index.vue     |   8 +-
 src/views/system/notify/details.vue       | 187 ---------------------
 src/views/system/notify/index.vue         | 193 ----------------------
 src/views/system/setting/file.vue         |  13 ++
 src/views/system/setting/info.vue         |   9 +
 src/views/system/setting/protocol.vue     |  10 ++
 src/views/system/setting/safe.vue         |   9 +
 src/views/work-trends/index.vue           |   9 +
 13 files changed, 280 insertions(+), 398 deletions(-)
 create mode 100644 src/api/industry.ts
 create mode 100644 src/router/modules/work-trends.js
 delete mode 100644 src/views/system/notify/details.vue
 delete mode 100644 src/views/system/notify/index.vue
 create mode 100644 src/views/system/setting/file.vue
 create mode 100644 src/views/system/setting/info.vue
 create mode 100644 src/views/system/setting/protocol.vue
 create mode 100644 src/views/system/setting/safe.vue
 create mode 100644 src/views/work-trends/index.vue

diff --git a/src/api/industry.ts b/src/api/industry.ts
new file mode 100644
index 0000000..bcf1d2c
--- /dev/null
+++ b/src/api/industry.ts
@@ -0,0 +1,143 @@
+import request from "@/utils/request";
+
+/**
+ * 行业类别列表
+ */
+export function getBaseinclassList(params) {
+    return request({
+        url: `/common/baseinclass/getBaseinclassList`,
+        method: "GET",
+        params: params,
+    });
+}
+
+/**
+ * 行业岗位
+ */
+export function getPostTree(industryId: string) {
+    return request({
+        url: `/admin/Industry/postTree/${industryId}`,
+        method: "GET",
+    });
+}
+
+/**
+ * 新增/编辑-行业岗位
+ */
+export function postAdd(data: object) {
+    return request({
+        url: `/admin/Industry/postAdd`,
+        method: "POST",
+        data
+    });
+}
+
+/**
+ * 删除-行业岗位
+ */
+export function postDetail(data: object) {
+    return request({
+        url: `/admin/Industry/postDetail`,
+        method: "POST",
+        data
+    });
+}
+
+/**
+ * 行业主体清单列表
+ */
+export function inListPage(params: object) {
+    return request({
+        url: `/admin/Industry/inListPage`,
+        method: "GET",
+        params
+    });
+}
+
+/**
+ * 新增/编辑-行业主体清单
+ */
+export function inListAdd(data: object) {
+    return request({
+        url: `/admin/Industry/inListAdd`,
+        method: "POST",
+        data
+    });
+}
+
+/**
+ * 启用/禁用-行业主体清单
+ */
+export function inListDel(data: object) {
+    return request({
+        url: `/admin/Industry/inListDel`,
+        method: "POST",
+        data
+    });
+}
+
+/**
+ * 岗位职责清单列表
+ */
+export function dutyPage(params: object) {
+    return request({
+        url: `/admin/Industry/dutyPage`,
+        method: "GET",
+        params
+    });
+}
+
+/**
+ * 新增-岗位职责清单
+ */
+export function dutyAdd(data: object) {
+    return request({
+        url: `/admin/Industry/dutyAdd`,
+        method: "POST",
+        data
+    });
+}
+
+/**
+ * 删除-岗位职责清单
+ */
+export function dutyDel(data: object) {
+    return request({
+        url: `/admin/Industry/dutyDel`,
+        method: "POST",
+        data
+    });
+}
+
+/**
+ * 岗位履职清单列表
+ */
+export function postListPage(params: object) {
+    return request({
+        url: `/admin/Industry/postListPage`,
+        method: "GET",
+        params
+    });
+}
+
+/**
+ * 新增-岗位履职清单
+ */
+export function postListAdd(data: object) {
+    return request({
+        url: `/admin/Industry/postListAdd`,
+        method: "POST",
+        data
+    });
+}
+
+/**
+ * 启用/禁用-岗位履职清单
+ */
+export function postListDel(data: object) {
+    return request({
+        url: `/admin/Industry/postListDel`,
+        method: "POST",
+        data
+    });
+}
\ No newline at end of file
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
index b7635c9..7193f53 100644
--- a/src/router/modules/system.js
+++ b/src/router/modules/system.js
@@ -9,16 +9,6 @@ export default {
         icon: 'system'
     },
     children: [
-        {
-            path: 'notify',
-            name: 'notifyindex',
-            component: () => import('@/views/system/notify/index.vue'),
-            meta: {
-                icon: 'point',
-                title: '消息通知',
-                breadcrumb: true,
-            }
-        },
         {
             path: 'base',
             name: 'systemroleindex',
@@ -108,11 +98,63 @@ export default {
                     component: () => import('@/views/system/log/option/index.vue'),
                     meta: {
                         icon: 'point',
-                        title: '操作 日志',
+                        title: '操作日志',
                         breadcrumb: true,
                     }
                 }
             ]
+        },
+        {
+            path: 'setting',
+            name: 'setting',
+            redirect: '/system/setting/info',
+            meta: {
+                icon: 'point',
+                title: '系统设置',
+                breadcrumb: true,
+            },
+            children: [
+                {
+                    path: 'info',
+                    name: 'info',
+                    component: () => import('@/views/system/setting/info.vue'),
+                    meta: {
+                        icon: 'point',
+                        title: '基础设置',
+                        breadcrumb: true,
+                    }
+                },
+                {
+                    path: 'safe',
+                    name: 'safe',
+                    component: () => import('@/views/system/setting/safe.vue'),
+                    meta: {
+                        icon: 'point',
+                        title: '安全设置',
+                        breadcrumb: true,
+                    }
+                },
+                {
+                    path: 'protocol',
+                    name: 'protocol',
+                    component: () => import('@/views/system/setting/protocol.vue'),
+                    meta: {
+                        icon: 'point',
+                        title: '协议管理',
+                        breadcrumb: true,
+                    }
+                },
+                {
+                    path: 'file',
+                    name: 'file',
+                    component: () => import('@/views/system/setting/file.vue'),
+                    meta: {
+                        icon: 'point',
+                        title: '文件上传设置',
+                        breadcrumb: true,
+                    }
+                },
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/src/router/modules/work-trends.js b/src/router/modules/work-trends.js
new file mode 100644
index 0000000..d5906c2
--- /dev/null
+++ b/src/router/modules/work-trends.js
@@ -0,0 +1,26 @@
+const Layout = () => import('@/layout/index.vue')
+
+export default {
+    path: '/trends',
+    component: Layout,
+    name: 'trends',
+    redirect: '/trends/index',
+    meta: {
+        auth: "trends",
+        title: '工作动态',
+        icon: 'point',
+        activeMenu: '/work-trends/index'
+    },
+    children: [
+        {
+            path: 'index',
+            name: 'index',
+            component: () => import('@/views/work-trends/index.vue'),
+            meta: {
+                auth: "home.home",
+                title: '工作动态',
+                sidebar: false
+            }
+        },
+    ]
+}
\ No newline at end of file
diff --git a/src/router/routes.js b/src/router/routes.js
index 2cc2d07..40863ff 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -101,10 +101,11 @@ let systemRoutes = [
     }
 ]
 // 建筑单元
-import home from './modules/home'
+import home from './modules/home';
 import emergency from "./modules/emergency";
 import system from "./modules/system";
-import base from './modules/basemanage'
+import base from './modules/basemanage';
+import trends from './modules/work-trends';
 
 // 动态路由（异步路由、导航栏路由）
 let asyncRoutes = [
@@ -118,6 +119,7 @@ let asyncRoutes = [
             home,
             base,
             emergency,
+            trends,
             system,
         ]
     }
diff --git a/src/views/base-manage/residence/index.vue b/src/views/base-manage/residence/index.vue
index 30db32c..e3b51d9 100644
--- a/src/views/base-manage/residence/index.vue
+++ b/src/views/base-manage/residence/index.vue
@@ -38,7 +38,6 @@
       <!-- 表格 -->
       <el-table
         ref="loading"
-        v-loading="tableDataloading"
         :data="tableData"
         header-row-class-name="el-one-header"
         border
diff --git a/src/views/system/log/option/index.vue b/src/views/system/log/option/index.vue
index 5275462..4a72423 100644
--- a/src/views/system/log/option/index.vue
+++ b/src/views/system/log/option/index.vue
@@ -53,17 +53,17 @@
         >
         </el-table-column>
         <el-table-column
-          prop="performname"
+          prop="ipAddress"
           :resizable="true"
           align="center"
           label="IP地址"
         >
         </el-table-column>
-        <el-table-column prop="areaPathName" :resizable="true" label="功能模块">
+        <el-table-column prop="url" :resizable="true" label="请求地址">
         </el-table-column>
-        <el-table-column prop="areaPathName" :resizable="true" label="请求参数">
+        <el-table-column prop="params" :resizable="true" label="请求参数">
         </el-table-column>
-        <el-table-column prop="areaPathName" :resizable="true" label="操作时间">
+        <el-table-column prop="createTime" :resizable="true" label="操作时间">
         </el-table-column>
       </el-table>
       <!-- 分页 -->
diff --git a/src/views/system/notify/details.vue b/src/views/system/notify/details.vue
deleted file mode 100644
index d255ce7..0000000
--- a/src/views/system/notify/details.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-
-<template>
-  <BaseDialog :dialogVisible="props.visible" @close="onclone" :titleName="'新增通知'" width="50%" @onSubmit="handleSubmit"
-    :footerclosed="true" :diafooter="true">
-    <div class="detailForm-content">
-      <el-form ref="ruleFormRef" :model="ruleForm" label-position="right" :rules="rules" label-width="80px">
-        <el-form-item  label="通知标题" prop="title">
-          <el-input v-model="ruleForm.title" type="input" placeholder="请输入通知内容" />
-        </el-form-item>
-        <el-form-item label="通知类型" prop="type">
-          <el-select v-model="ruleForm.type" class="m-1" placeholder="请选择通知类型">
-            <el-option  v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item style="width: 100%" label="通知内容" prop="content">
-          <el-input :rows="5" v-model="ruleForm.content" type="textarea" placeholder="请输入通知内容" />
-        </el-form-item>
-        
-        <el-form-item  style="width: 100%" label="接受对象" prop="object">
-
-          <el-select v-model="ruleForm.object" multiple class="m-2" placeholder="请选择接受对象">
-            <el-option v-for="item in optionsobj" :key="item.value" :label="item.performclassname"
-              :value="item.listperformid" />
-          </el-select>
-        </el-form-item>
-       
-        <el-form-item label="文件" style="width: 100%" class="inline-block">
-          <CustomUpload
-            :listPic="fileList"
-            :OTCType="FileType.EmergencyFile"
-            :uuid="uuid"
-            :userId="userId"
-            :baseUrl="baseUrl"
-            :max="9"
-            @onUpdate="updateFile"
-            :readonly='props.readonly'
-          ></CustomUpload>
-        </el-form-item>
-      </el-form>
-    </div>
-  </BaseDialog>
-</template>
-<script setup lang="ts" >
-import { reactive, ref, onMounted, watch } from "vue";
-import useUserStore from "@/store/modules/user";
-import type { FormInstance, FormRules , ElMessage } from 'element-plus'
-import { getNoticePerformList,addGovNotice } from "@/api/Sys";
-import { getUUID,FileType } from "@/utils/common";
-const baseUrl = ref(import.meta.env.VITE_UPLOAD_IMG_URL);
-const userStore = useUserStore();
-const user = ref(JSON.parse(userStore.userInfo));
-const userId = ref(user.value.userId);
-const uuid = ref(getUUID());
-const props = defineProps({
-  visible: {
-    type: Boolean,
-    default: false,
-  },
-});
-const options = [
-  {
-    value: '1',
-    label: '检查',
-  },
-  {
-    value: '2',
-    label: '任务',
-  },
-  {
-    value: '3',
-    label: '政策',
-  },
-  {
-    value: '4',
-    label: '学习',
-  },
-  {
-    value: '5',
-    label: '预警',
-  },
-  {
-    value: '6',
-    label: '系统',
-  }
-];
-
-const optionsobj = ref([]);
-// 表单
-const ruleFormRef = ref<FormInstance>()
-
-const ruleForm = reactive({
-  type: '',
-  content: '',
-  object: '',
-  title:'',
-})
-
-const rules = reactive<FormRules<typeof ruleForm>>({
-  title: [{ required: true, message: "请输入标题", trigger: 'blur' }],
-  type: [{ required: true, message: "请选择类型", trigger: 'blur' }],
-  content: [{ required: true, message: "请输入内容", trigger: 'blur' }],
-  object: [{ required: true, message: "请选择对象", trigger: 'blur' }],
-})
-
-// 上传文件
-const fileList = ref([]);
-const updateFile = (files: any) => {
-  fileList.value = files;
-};
-
-//获取接收对象
-
-const getCompanyList = () => {
-  let params = {
-    govNoticeId: uuid,
-    userId: userId.value,
-  };
-  getNoticePerformList(params).then((res: any) => {
-    console.log();
-    
-    optionsobj.value = res.data
-  })
-};
-
-const emits = defineEmits(["close"]);
-//提交
-const handleSubmit = () => {
-  
-  if(ruleForm.content&&ruleForm.object.length!=0&&ruleForm.title&&ruleForm.type){
-    let params = {
-    content:ruleForm.content,
-    govNoticeId: uuid.value,
-    listperformids:ruleForm.object,
-    title:ruleForm.title,
-    type:parseInt(ruleForm.type),
-    userId: userId.value,
-  };
-  addGovNotice(params).then((res: any) => {
-    onclone();
-  })
-    }else{
-      ElMessage.error({
-                        message: '请填写必填信息',
-                        type: "error",
-                    });
-    }
-};
-//关闭弹窗
-const onclone = () => {
-  ruleForm.type='',
-  ruleForm.content='',
-  ruleForm.object='',
-  ruleForm.title='',
-  fileList.value = [],
-  emits("close");
-};
-onMounted(() => {
-  getCompanyList()
-});
-watch(
-  () => props.visible,
-  (val) => {
-    console.log(333, val,uuid);
-
-    uuid.value = getUUID()
-    
-    return
-  }
-);
-</script>
-
-<style lang="scss" scoped>
-.detailForm-content {
-  margin-right: 30px;
-}
-
-:deep(.el-form) {
-  display: flex;
-  flex-wrap: wrap;
-  // justify-content: space-around;
-  justify-content: space-between;
-}
-
-:deep(.el-form-item) {
-  width: 47%;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/system/notify/index.vue b/src/views/system/notify/index.vue
deleted file mode 100644
index 7c50036..0000000
--- a/src/views/system/notify/index.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-<template>
-  <div class="percentage-content">
-    <div class="content">
-      <div style="margin-bottom: 16px" class="h-layout space-between h-center">
-        <div>
-          <div class="h-layout">
-            <div class="tool-item" @click="dialogVisible = true">
-              <svg-icon name="add" class="icon" />
-              <span>新增</span>
-            </div>
-            <div class="tool-item" @click="getCompanyList">
-              <svg-icon name="refurbish" class="icon" />
-              <span>刷新</span>
-            </div>
-          </div>
-        </div>
-      </div>
-      <el-table
-        ref="loading"
-        v-loading="tableDataloading"
-        :data="tableData"
-        header-row-class-name="el-one-header"
-        @selection-change="handleSelectionChange"
-        border
-      >
-        <el-table-column
-          align="center"
-          :resizable="true"
-          width="100"
-          label="序列"
-          type="index"
-        >
-          <template #default="scope">
-            {{ scope.$index + 1 + (currentPage - 1) * pageSize }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          :resizable="true"
-          align="center"
-          label="类型"
-          width="200"
-        >
-          <template #default="scope">
-            <span>
-              {{
-                scope.row.type == 1
-                  ? "检查"
-                  : scope.row.type == 2
-                  ? "任务"
-                  : scope.row.type == 3
-                  ? "政策"
-                  : scope.row.type == 4
-                  ? "学习"
-                  : scope.row.type == 5
-                  ? "预警"
-                  : scope.row.type == 6
-                  ? "系统"
-                  : "暂无"
-              }}
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="content"
-          :resizable="true"
-          align="center"
-          label="内容"
-          show-overflow-tooltip
-        >
-        </el-table-column>
-        <el-table-column
-          prop="createTime"
-          :resizable="true"
-          align="center"
-          label="时间"
-          width="150"
-        >
-        </el-table-column>
-        <el-table-column
-          :resizable="true"
-          align="center"
-          label="操作"
-          width="150"
-        >
-          <template #default="scope">
-            <span
-              class="operate"
-              @click="deleteEntNotice(scope.row.govNoticeId)"
-            >
-              <svg-icon name="delete" class="icon"></svg-icon>
-              <span class="func">删除</span>
-            </span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 分页 -->
-      <el-pagination
-        class="pagination"
-        @size-change="getCompanyList"
-        @current-change="getCompanyList"
-        v-model:current-page.sync="currentPage"
-        :page-sizes="[10, 15, 20, 30]"
-        v-model:page-size.sync="pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        background
-      >
-      </el-pagination>
-      <!-- 新增 -->
-      <Adddetails :visible="dialogVisible" @close="onclone" />
-    </div>
-  </div>
-</template>
-
-<script setup lang='ts'>
-import { onMounted, ref } from "vue";
-import { ElMessageBox } from "element-plus";
-import { getGovNoticePage, delGovNotice } from "@/api/Sys";
-// 用户id
-import useUserStore from "@/store/modules/user";
-const userStore = useUserStore();
-const user = ref(JSON.parse(userStore.userInfo));
-const userId = ref(user.value.userId);
-//新增弹窗
-import Adddetails from "./details.vue";
-const dialogVisible = ref(false);
-// 分页
-const currentPage = ref(1);
-const pageSize = ref(10);
-const total = ref(0);
-const search = ref([]);
-
-// 刷新获取数据状态
-const tableDataloading = ref(false);
-const tableData = ref([]);
-//获取列表
-const getCompanyList = () => {
-  tableDataloading.value = true;
-  let params = {
-    userId: userId.value,
-    limit: pageSize.value,
-    page: currentPage.value,
-  };
-  getGovNoticePage(params).then((res: any) => {
-    tableData.value = res.data.list;
-    total.value = res.data.total;
-    tableDataloading.value = false;
-    console.log(tableData.value);
-  });
-};
-// 删除
-const deleteEntNotice = (id) => {
-  ElMessageBox.confirm("是否确认删除?", "提示", {
-    confirmButtonText: "是",
-    cancelButtonText: "否",
-    type: "warning",
-  }).then(() => {
-    delGovNotice(id).then((res: any) => {
-      getCompanyList();
-    });
-  });
-};
-//关闭新增弹窗
-const onclone = () => {
-  dialogVisible.value = false;
-  getCompanyList();
-};
-
-onMounted(() => {
-  getCompanyList();
-});
-</script>
-
-
-
-<style lang="scss" scoped>
-.content {
-  width: 100%;
-  // flex: auto;
-  background: #fff;
-  border-radius: 0.26042vw;
-  box-shadow: 0 0 0.41667vw 0 rgba(8, 33, 85, 0.1);
-  height: 100%;
-  padding: 0.83333vw;
-  overflow-y: auto;
-  overflow-x: hidden !important;
-  -moz-box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -o-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/system/setting/file.vue b/src/views/system/setting/file.vue
new file mode 100644
index 0000000..34c85a8
--- /dev/null
+++ b/src/views/system/setting/file.vue
@@ -0,0 +1,13 @@
+<template>
+  <div></div>
+</template>
+  
+<script lang='ts' setup>
+onMounted(() => {
+  import.meta.env.VITE_IFRAMEURL = 123;
+});
+</script>
+  
+  <style lang="scss" scoped>
+</style>
+  
\ No newline at end of file
diff --git a/src/views/system/setting/info.vue b/src/views/system/setting/info.vue
new file mode 100644
index 0000000..af0787e
--- /dev/null
+++ b/src/views/system/setting/info.vue
@@ -0,0 +1,9 @@
+<template>
+  <div></div>
+</template>
+
+<script lang='ts' setup>
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/system/setting/protocol.vue b/src/views/system/setting/protocol.vue
new file mode 100644
index 0000000..9ce744b
--- /dev/null
+++ b/src/views/system/setting/protocol.vue
@@ -0,0 +1,10 @@
+<template>
+    <div></div>
+  </template>
+  
+  <script lang='ts' setup>
+  </script>
+  
+  <style lang="scss" scoped>
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/system/setting/safe.vue b/src/views/system/setting/safe.vue
new file mode 100644
index 0000000..af0787e
--- /dev/null
+++ b/src/views/system/setting/safe.vue
@@ -0,0 +1,9 @@
+<template>
+  <div></div>
+</template>
+
+<script lang='ts' setup>
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/work-trends/index.vue b/src/views/work-trends/index.vue
new file mode 100644
index 0000000..060515d
--- /dev/null
+++ b/src/views/work-trends/index.vue
@@ -0,0 +1,9 @@
+<template>
+  <div>123</div>
+</template>
+
+<script lang='ts' setup>
+</script>
+
+<style lang="scss" scoped>
+</style>