Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

shj

2022-07-06 5ecc1f88362a5f3598133259223551195aebf77f

Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

 .env.development

@@ -2,7 +2,7 @@
ENV = 'development'

# 本地环境接口地址
VITE_API_URL = 'http://192.168.0.35:8008'
VITE_API_URL = 'http://192.168.0.76:8009'

# VITE_API_URL = 'http://192.168.0.8:8008'
# VITE_API_URL = 'http://192.168.0.10:8008'

 src/api/contingency/index.ts

对比新文件
@@ -0,0 +1,13 @@
import request from '/@/utils/request';

export function contingencyApi(){
    return{
        getTeamManagementList: (params: object) => {
            return request({
                url: '/emergencyTeam/page/list',
                method: 'post',
                data:params
            })
        }
    }
}

 src/components/userSelections/index.vue

对比新文件
@@ -0,0 +1,278 @@
<template>
  <div class="system-edit-user-container">
    <el-dialog
        title="用户选择"
        v-model="isShowDialog"
        width="1000px"
        draggable
    >
      <el-container class="layout-container-demo" style="height: 500px;overflow: auto;min-width: 960px">
        <el-aside width="200px">
          <el-input v-model="filterText" placeholder="请输入组织机构过滤" />
          <el-tree
            ref="treeRef"
            class="filter-tree"
            :data="data"
            :props="defaultProps"
            default-expand-all
            :filter-node-method="filterNode"
          />
        </el-aside>
        <el-container>
          <el-header style="font-size: 12px">
            <el-form :inline="true" :model="formInline" class="demo-form-inline">
              <el-form-item>
                <el-input size="default" v-model="formInline.name" placeholder="登录名"> </el-input>
              </el-form-item>
              <el-form-item>
                <el-button size="default" type="primary" class="ml10" @click="onSubmit">
                  查询
                </el-button>
                <el-button size="default" class="ml10" @click="submitReset">
                  重置
                </el-button>
              </el-form-item>
            </el-form>
          </el-header>
          <el-main>
            <el-scrollbar>
              <el-table
                  :data="tableData"
                  :header-cell-style="{background:'#f6f7fa',color:'#909399',fontWeight:400}"
                  ref="multipleTableRef"
              >
                <el-table-column prop="date" label="登录名" width="100" show-overflow-tooltip sortable />
                <el-table-column prop="name" label="用户名" width="100" show-overflow-tooltip sortable />
                <el-table-column prop="address" label="所属机构" width="130"  show-overflow-tooltip sortable />
                <el-table-column prop="address" label="所属部门" width="130" show-overflow-tooltip sortable/>
                <el-table-column  label="状态"
                  prop="tag"
                  width="100"
                  :filters="[
                     { text: '正常', value: 'Home' },
                     { text: '不正常', value: 'Office' },
                   ]"
                        :filter-method="filterTag"
                        filter-placement="bottom-end">
                  <template #default="scope">
                    <el-tag
                        :type="scope.row.tag === 'Home' ? '' : 'success'"
                        disable-transitions
                    >{{ scope.row.tag }}</el-tag
                    >
                  </template>
                </el-table-column>
              </el-table>
            </el-scrollbar>
          </el-main>
        </el-container>
      </el-container>

      <template #footer>
                <span class="dialog-footer">
                    <el-button size="default" type="primary"  @click="onCancel">确定</el-button>
          <el-button size="default" @click="onCancel">关闭</el-button>
                </span>
      </template>
    </el-dialog>
  </div>
</template>

<script lang="ts">
import {
  ref,
  defineComponent,
  watch,
  reactive,
} from 'vue';

import type {
  ElTree,
  ElTable,
} from 'element-plus'

interface Tree {
  id: number
  label: string
  children?: Tree[]
}
export default defineComponent({
  name: 'userSelections',
  components: {
    // Search,
  },
  setup() {
    const isShowDialog = ref(false)
    // 打开弹窗
    const openDialog = () => {
      isShowDialog.value = true;
    };
    // 关闭弹窗
    const closeDialog = () => {
      isShowDialog.value = false;
    };
    // 取消
    const onCancel = () => {
      closeDialog();
    };


    const filterText = ref('')
    const treeRef = ref<InstanceType<typeof ElTree>>()  //实例化

    const defaultProps = {
      children: 'children',
      label: 'label',
    }

    // 监听搜索关键字改变
    watch(filterText, (val) => {
      treeRef.value!.filter(val)
    })

    // 节点过滤模糊搜索
    const filterNode = (value: string, data: Tree) => {
      if (!value) return true
      return data.label.includes(value)
    }

    // 树形结构内容
    const data: Tree[] = [
      {
        id: 1,
        label: '广汇能源综合物流发展有限责任公司',
        children: [
          {
            id: 4,
            label: '经营班子',
            children: []
          },
        ],
      },
      {
        id: 2,
        label: '生产运行部',
        children: [
          {
            id: 5,
            label: '工艺二班',
          },
          {
            id: 6,
            label: '灌装一班',
          },
        ],
      },
      {
        id: 3,
        label: '设备部',
        children: [
          {
            id: 7,
            label: '仪表班',
          },
          {
            id: 8,
            label: '机修班',
          },
        ],
      },
    ]
    const item = {
      date: '龚赛健',
      name: '龚赛健',
      address: '综合办公室',
      tag: '正常',
    }
    const tableData = ref(Array.from({ length: 5 }).fill(item))

    // 定义表单搜索
    const formInline = reactive({
      name: '',
    })
    // 搜索按钮
    const onSubmit = () => {
      console.log('submit!')
    }

    const multipleTableRef = ref<InstanceType<typeof ElTable>>()
    return {
      openDialog,
      closeDialog,
      isShowDialog,
      onCancel,
      defaultProps,
      filterNode,
      data,
      tableData,
      formInline,
      onSubmit,
      multipleTableRef
    };
  },
});
</script>
<style scoped lang="scss">
.layout-container-demo .el-header {
  position: relative;
  color: var(--el-text-color-primary);
  line-height: 32px;
  --el-header-height: 45px;
}
.layout-container-demo .el-aside {
  padding: 10px;
  border: 1px solid #ebeef5;
  color: var(--el-text-color-primary);
}
::v-deep .el-input--large .el-input__inner {
  height: 32px!important;
  line-height: 32px!important;
}
.layout-container-demo .el-menu {
  border-right: none;
}
.layout-container-demo .el-main {
  padding: 0;
}
.layout-container-demo .toolbar {
  display: inline-flex;
  align-items: center;
  justify-content: center;
  height: 100%;
  right: 20px;
}
.el-input--large{
  //width: 178px;
  height: 32px;
}
.el-tree{
  overflow: auto;
}
::-webkit-scrollbar {
  height: 1px;

}
::-webkit-scrollbar-thumb {
  background-color: transparent;
}
// 鼠标悬浮样式
:hover::-webkit-scrollbar-thumb {
  border-radius: 15px;
  background-color: #d8d9db;
}
::v-deep .el-input__wrapper{
  width: 215px;
}
::v-deep .el-form-item{
  margin-bottom: 0;
}
::v-deep .el-dialog__footer{
  border-top: 1px solid #e8e8e8;
  border-radius: 0 0 4px 4px;
}
::v-deep .el-dialog__header {
  border-bottom: 1px solid #e8e8e8;
  margin-right: 0;
  border-radius: 4px 4px 0 0;
}
</style>

 src/views/contingencyManagement/contingency/component/openEdit.vue

@@ -31,7 +31,7 @@
                  class="input-with-select"
              >
                <template #append>
                  <el-button :icon="Search"/>
                  <el-button :icon="Search" @click="openUser"/>
                </template>
              </el-input>
            </el-form-item>
@@ -89,10 +89,10 @@
                    ref="multipleTableRef"
                    :header-cell-style="{background:'#f6f7fa',color:'#909399'}"
                >
                  <el-table-column prop="jobNumber" label="人员工号" show-overflow-tooltip></el-table-column>
                  <el-table-column prop="personnelName" label="人员名称" show-overflow-tooltip></el-table-column>
                  <el-table-column prop="phone" label="手机号码" show-overflow-tooltip></el-table-column>
                  <el-table-column prop="position" label="职位" show-overflow-tooltip></el-table-column>
                  <el-table-column prop="jobNumber" label="人员工号" show-overflow-tooltip sortable></el-table-column>
                  <el-table-column prop="personnelName" label="人员名称" show-overflow-tooltip sortable></el-table-column>
                  <el-table-column prop="phone" label="手机号码" show-overflow-tooltip sortable></el-table-column>
                  <el-table-column prop="position" label="职位" show-overflow-tooltip sortable></el-table-column>
                  <el-table-column label="操作" width="200" align="center">
                    <template #default="scope">
                      <el-button size="small" type="primary" text="plain" >查看
@@ -116,9 +116,9 @@
                </span>
      </template>
    </el-dialog>
    <userSelections ref="userRef"/>
    <AddEmergencyPersonnel ref="addRef" />
    <EditEmergencyPersonnel ref="editRef" />

  </div>
</template>

@@ -140,6 +140,7 @@
import {
  Search
} from '@element-plus/icons-vue'
import userSelections from "/@/components/userSelections/index.vue"
import AddEmergencyPersonnel from "/@/views/contingencyManagement/contingency/component/addEmergencyPersonnel.vue";
import EditEmergencyPersonnel from "/@/views/contingencyManagement/contingency/component/editEmergencyPersonnel.vue";
// 定义表格数据类型
@@ -193,6 +194,7 @@
export default defineComponent({
  name: 'openEdit',
  components: {
    userSelections,
    AddEmergencyPersonnel,
    EditEmergencyPersonnel
  },
@@ -392,6 +394,12 @@
      ],
    })

    // 打开用户选择弹窗
    const userRef = ref();
    const openUser = () => {
      userRef.value.openDialog();
    };

    const ruleFormRef = ref<FormInstance>()
    // 打开弹窗
    const openDialog = (row: RuleFormRow) => {
@@ -435,6 +443,8 @@
      ruleFormRef,
      tableData,
      multipleTableRef,
      openUser,
      userRef,
      ...toRefs(state),
    };
  },

 src/views/contingencyManagement/contingency/index.vue

@@ -4,10 +4,10 @@
      <div class="system-user-search mb15">
        <el-form :inline="true" :model="formInline" class="demo-form-inline">
          <el-form-item>
            <el-input size="default" v-model="formInline.name" placeholder="队伍名称"> </el-input>
            <el-input size="default" v-model="formInline.teamName" placeholder="队伍名称"> </el-input>
          </el-form-item>
          <el-form-item>
            <el-select size="default" v-model="formInline.level" placeholder="请选择队伍级别">
            <el-select size="default" v-model="formInline.teamType" placeholder="请选择队伍级别">
              <el-option label="公司" value="shanghai"></el-option>
              <el-option label="分厂-车间" value="beijing"></el-option>
              <el-option label="工序-班组等" value="beijing"></el-option>
@@ -60,7 +60,7 @@
        </div>
      </div>
      <el-table
          :data="tableData"
          :data="tableData.data"
          style="width: 100%"
          ref="multipleTableRef"
      >
@@ -68,11 +68,11 @@
            type="selection"
            width="55"
        />
        <el-table-column prop="teamName" label="队伍名称" show-overflow-tooltip></el-table-column>
        <el-table-column prop="teamLevel" label="队伍级别" show-overflow-tooltip></el-table-column>
        <el-table-column prop="teamDescription" label="队伍描述" show-overflow-tooltip></el-table-column>
        <el-table-column prop="teamPhone" label="负责人手机" show-overflow-tooltip></el-table-column>
        <el-table-column prop="attachments" label="相关附件" show-overflow-tooltip></el-table-column>
        <el-table-column prop="teamName" label="队伍名称" show-overflow-tooltip sortable></el-table-column>
        <el-table-column prop="teamLevel" label="队伍级别" show-overflow-tooltip sortable></el-table-column>
        <el-table-column prop="teamDescription" label="队伍描述" show-overflow-tooltip sortable></el-table-column>
        <el-table-column prop="teamPhone" label="负责人手机" show-overflow-tooltip sortable></el-table-column>
        <el-table-column prop="attachments" label="相关附件" show-overflow-tooltip sortable></el-table-column>
        <el-table-column label="操作" width="200" align="center">
          <template #default="scope">
            <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenSee(scope.row)">
@@ -93,20 +93,19 @@
          </template>
        </el-table-column>
      </el-table>
      <div class="pages">
        <el-pagination
            v-model:currentPage="currentPage"
            v-model:page-size="pageSize"
            :page-sizes="[10,20,50,100]"
            :small="small"
            :disabled="disabled"
            :background="background"
            layout="total, sizes, prev, pager, next, jumper"
            :total="400"
            @size-change="handleSizeChange"
            @current-change="handleCurrentChange"
        />
      </div>
      <el-pagination
          @size-change="onHandleSizeChange"
          @current-change="onHandleCurrentChange"
          class="mt15"
          :pager-count="5"
          :page-sizes="[10, 20, 30]"
          v-model:current-page="formInline.pageIndex"
          background
          v-model:page-size="formInline.pageSize"
          layout="total, sizes, prev, pager, next, jumper"
          :total="tableData.total"
      >
      </el-pagination>
    </el-card>
    <OpenSee ref="seeRef" />
    <OpenAdd ref="addRef" />
@@ -117,9 +116,9 @@

<script lang="ts">
import {
  // toRefs,
  toRefs,
  reactive,
  // onMounted,
  onMounted,
  ref,
  defineComponent
} from 'vue';
@@ -141,6 +140,10 @@
import OpenEdit from '/@/views/contingencyManagement/contingency/component/openEdit.vue';
import OpenSee from '/@/views/contingencyManagement/contingency/component/openSee.vue';
import UpData from '/@/views/contingencyManagement/contingency/component/upData.vue';
import {contingencyApi} from "/@/api/contingency";
import {Session} from "/@/utils/storage";
import {initBackEndControlRoutes} from "/@/router/backEnd";


// 定义表格数据类型
interface User {
@@ -157,19 +160,25 @@

// 定义接口来定义对象的类型
interface TableDataRow {
  // userName: string;
  // userNickname: string;
  // roleSign: string;
  // department: string[];
  // phone: string;
  // email: string;
  // sex: string;
  // password: string;
  // overdueTime: Date;
  // // describe: string;
  // createTime: string;
  // teamName: string;
  // teamLevel: string;
  // teamDescription: string;
  // teamPhone: string;
  // attachments: string;
}

//
interface TableDataState {
  tableData: {
    data: Array<TableDataRow>;
    total: number;
    loading: boolean;
    param: {
      pageIndex: number;
      pageSize: number;
    }
  };
}
export default defineComponent({
  name: 'systemUser',
  components: {
@@ -184,20 +193,33 @@
    Upload,
    Download,
    Refresh,
    UpData
    UpData,
    contingencyApi
  },
  setup() {
    // 定义表单搜索
    const formInline = reactive({
      name: '',
      level: '',
      pageIndex: 1,
      pageSize: 10,
      searchParams: {
      teamName: "",
      teamType: "",
    }
    })
    // 搜索按钮
    const onSubmit = () => {
      console.log('submit!')
    const onSubmit = async () => {
      // let res = await contingencyApi().getTeamManagementList(formInline)
      // if(res.data.code === '200'){
      //   state.tableData.data = res.data.data;
      //   state.tableData.total = state.tableData.data.length;
      // }else{
      //   ElMessage({
      //     type:'warning',
      //     message:res.data.msg
      //   })
      // }
    }
    const seeRef = ref();
    const editRef = ref();

    const multipleTableRef = ref<InstanceType<typeof ElTable>>()
    const multipleSelection = ref<User[]>([])

@@ -207,61 +229,82 @@
      upShow.value.openDialog()
    }
    // 定义表格数据
    const tableData: User[] = [
      {
        teamName: '应急救援组',
        teamLevel: '公司',
        teamDescription: '实施抢险抢险的应急方案和措施实施 ；',
        telephone: '051383830321',
        teamPhone: '13603812900',
        describe: '(1)实施抢险抢险的应急方案和措施实施 ；\n' +
            '(2)负责现场被困人员、受伤人员抢救工作；\n' +
            '(3)在事故有可能扩大进行抢险抢修或救援时，高度注意避免意外伤害；\n' +
            '(4)抢险抢修或救援结束后，对结果进行复查和评估。',
        responsibleDepartment: '仪表班',
        teamLeader: '王磊',
    const state = reactive<TableDataState>({
      tableData: {
        data: [],
        total: 0,
        loading: false,
      },
      {
        teamName: '应急救援组',
        teamLevel: '公司',
        teamDescription: '实施抢险抢险的应急方案和措施实施 ；',
        telephone: '051383830321',
        teamPhone: '13603812900',
        describe: '(1)实施抢险抢险的应急方案和措施实施 ；\n' +
            '(2)负责现场被困人员、受伤人员抢救工作；\n' +
            '(3)在事故有可能扩大进行抢险抢修或救援时，高度注意避免意外伤害；\n' +
            '(4)抢险抢修或救援结束后，对结果进行复查和评估。',
        responsibleDepartment: '仪表班',
        teamLeader: '王磊',
      },
      {
        teamName: '应急救援组',
        teamLevel: '公司',
        teamDescription: '实施抢险抢险的应急方案和措施实施 ；',
        telephone: '051383830321',
        teamPhone: '13603812900',
        describe: '(1)实施抢险抢险的应急方案和措施实施 ；\n' +
            '(2)负责现场被困人员、受伤人员抢救工作；\n' +
            '(3)在事故有可能扩大进行抢险抢修或救援时，高度注意避免意外伤害；\n' +
            '(4)抢险抢修或救援结束后，对结果进行复查和评估。',
        responsibleDepartment: '仪表班',
        teamLeader: '王磊',
      },
      {
        teamName: '应急救援组',
        teamLevel: '公司',
        teamDescription: '实施抢险抢险的应急方案和措施实施 ；',
        telephone: '051383830321',
        teamPhone: '13603812900',
        describe: '(1)实施抢险抢险的应急方案和措施实施 ；\n' +
            '(2)负责现场被困人员、受伤人员抢救工作；\n' +
            '(3)在事故有可能扩大进行抢险抢修或救援时，高度注意避免意外伤害；\n' +
            '(4)抢险抢修或救援结束后，对结果进行复查和评估。',
        responsibleDepartment: '仪表班',
        teamLeader: '王磊',
    })
    // 初始化表格数据
    const initTableData = async () => {
      let res = await contingencyApi().getTeamManagementList(formInline)
      if(res.data.code === '200'){
        state.tableData.data = res.data.data;
        state.tableData.total = state.tableData.data.length;
      }else{
        ElMessage({
          type:'warning',
          message:res.data.msg
        })
      }
    ]
    };
    // const tableData: User[] = [
    //   {
    //     teamName: '应急救援组',
    //     teamLevel: '公司',
    //     teamDescription: '实施抢险抢险的应急方案和措施实施 ；',
    //     telephone: '051383830321',
    //     teamPhone: '13603812900',
    //     describe: '(1)实施抢险抢险的应急方案和措施实施 ；\n' +
    //         '(2)负责现场被困人员、受伤人员抢救工作；\n' +
    //         '(3)在事故有可能扩大进行抢险抢修或救援时，高度注意避免意外伤害；\n' +
    //         '(4)抢险抢修或救援结束后，对结果进行复查和评估。',
    //     responsibleDepartment: '仪表班',
    //     teamLeader: '王磊',
    //   },
    //   {
    //     teamName: '应急救援组',
    //     teamLevel: '公司',
    //     teamDescription: '实施抢险抢险的应急方案和措施实施 ；',
    //     telephone: '051383830321',
    //     teamPhone: '13603812900',
    //     describe: '(1)实施抢险抢险的应急方案和措施实施 ；\n' +
    //         '(2)负责现场被困人员、受伤人员抢救工作；\n' +
    //         '(3)在事故有可能扩大进行抢险抢修或救援时，高度注意避免意外伤害；\n' +
    //         '(4)抢险抢修或救援结束后，对结果进行复查和评估。',
    //     responsibleDepartment: '仪表班',
    //     teamLeader: '王磊',
    //   },
    //   {
    //     teamName: '应急救援组',
    //     teamLevel: '公司',
    //     teamDescription: '实施抢险抢险的应急方案和措施实施 ；',
    //     telephone: '051383830321',
    //     teamPhone: '13603812900',
    //     describe: '(1)实施抢险抢险的应急方案和措施实施 ；\n' +
    //         '(2)负责现场被困人员、受伤人员抢救工作；\n' +
    //         '(3)在事故有可能扩大进行抢险抢修或救援时，高度注意避免意外伤害；\n' +
    //         '(4)抢险抢修或救援结束后，对结果进行复查和评估。',
    //     responsibleDepartment: '仪表班',
    //     teamLeader: '王磊',
    //   },
    //   {
    //     teamName: '应急救援组',
    //     teamLevel: '公司',
    //     teamDescription: '实施抢险抢险的应急方案和措施实施 ；',
    //     telephone: '051383830321',
    //     teamPhone: '13603812900',
    //     describe: '(1)实施抢险抢险的应急方案和措施实施 ；\n' +
    //         '(2)负责现场被困人员、受伤人员抢救工作；\n' +
    //         '(3)在事故有可能扩大进行抢险抢修或救援时，高度注意避免意外伤害；\n' +
    //         '(4)抢险抢修或救援结束后，对结果进行复查和评估。',
    //     responsibleDepartment: '仪表班',
    //     teamLeader: '王磊',
    //   }
    // ]
    //查看用户弹窗
    const seeRef = ref();
    const onOpenSee = (row: TableDataRow) => {
      seeRef.value.openDialog(row);
    };
@@ -271,6 +314,7 @@
      addRef.value.openDialog();
    };
    // 打开修改用户弹窗
    const editRef = ref();
    const onOpenEdit = (row: TableDataRow) => {
      editRef.value.openDialog(row);
    };
@@ -287,22 +331,17 @@
          .catch(() => {});
    };
    // 分页改变
    const currentPage = ref(4);
    const pageSize = ref(10);
    const handleSizeChange = (val: number) => {
      console.log(`${val} items per page`);
    const onHandleSizeChange = (val: number) => {
      formInline.pageSize = val;
    };
    const handleCurrentChange = (val: number) => {
      console.log(`current page: ${val}`);
    const onHandleCurrentChange = (val: number) => {
      formInline.pageIndex = val;
    };
    // const onHandleSizeChange = (val: number) => {
    //   state.tableData.param.pageSize = val;
    // };
    // // 分页改变
    // 页面加载时
    // onMounted(() => {
    //   initTableData();
    // });
    onMounted(() => {
      initTableData();
    });
    return {
      // value,
      // options,
@@ -312,7 +351,7 @@
      multipleTableRef,
      upButton,
      upShow,
      tableData,
      // tableData,
      onOpenSee, //查看
      seeRef,
      onOpenEdit,  //编辑
@@ -320,11 +359,9 @@
      onOpenAdd,  //新增
      addRef,
      onRowDel,
      currentPage,
      pageSize,
      handleSizeChange,
      handleCurrentChange,
      // ...toRefs(state),
      onHandleSizeChange,
      onHandleCurrentChange,
      ...toRefs(state),
    };
  },
});

 yarn.lock

文件太大