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

shj

2022-08-09 c64c8f43ec1a3d88feb1f915fd488040b6358e7d

 src/views/contingencyManagement/contingency/index.vue

@@ -7,10 +7,10 @@
            <el-input size="default" v-model="listQuery.searchParams.teamName" placeholder="队伍名称"> </el-input>
          </el-form-item>
          <el-form-item>
            <el-select size="default" v-model="listQuery.searchParams.teamType" placeholder="请选择队伍级别">
              <el-option label="公司" value="shanghai"></el-option>
              <el-option label="分厂-车间" value="beijing"></el-option>
              <el-option label="工序-班组等" value="beijing"></el-option>
            <el-select size="default" v-model="listQuery.searchParams.teamLevel" placeholder="请选择队伍级别">
              <el-option label="公司" value="1"></el-option>
              <el-option label="分厂-车间" value="2"></el-option>
              <el-option label="工序-班组等" value="3"></el-option>
            </el-select>
          </el-form-item>
          <el-form-item>
@@ -41,23 +41,23 @@
            </el-icon>删除
          </el-button>
        </div>
        <div class="button_Right">
          <el-button size="default" @click="upButton">
            <el-icon>
              <Upload />
            </el-icon>
          </el-button>
          <el-button size="default">
            <el-icon>
              <Download />
            </el-icon>
          </el-button>
          <el-button size="default">
            <el-icon>
              <Refresh />
            </el-icon>
          </el-button>
        </div>
<!--        <div class="button_Right">-->
<!--          <el-button size="default" @click="upButton">-->
<!--            <el-icon>-->
<!--              <Upload />-->
<!--            </el-icon>-->
<!--          </el-button>-->
<!--          <el-button size="default">-->
<!--            <el-icon>-->
<!--              <Download />-->
<!--            </el-icon>-->
<!--          </el-button>-->
<!--          <el-button size="default">-->
<!--            <el-icon>-->
<!--              <Refresh />-->
<!--            </el-icon>-->
<!--          </el-button>-->
<!--        </div>-->
      </div>
      <el-table
          :data="tableData"
@@ -70,7 +70,13 @@
            width="55"
        />
        <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="teamLevel" label="队伍级别" show-overflow-tooltip sortable>
          <template #default="scope">
            <span v-if="scope.row.teamLevel == 1">公司</span>
            <span v-if="scope.row.teamLevel == 2">分厂-车间</span>
            <span v-if="scope.row.teamLevel == 3">工序-班组等</span>
          </template>
        </el-table-column>
        <el-table-column prop="teamDesc" label="队伍描述" show-overflow-tooltip sortable></el-table-column>
        <el-table-column prop="principalPhone" label="负责人手机" show-overflow-tooltip sortable></el-table-column>
        <el-table-column prop="attachments" label="相关附件" show-overflow-tooltip sortable></el-table-column>
@@ -131,18 +137,16 @@
import { Plus,
  Edit,
  Delete,
  Upload,
  Download,
  Refresh,
  // Upload,
  // Download,
  // Refresh,
  View,
  EditPen,
} from '@element-plus/icons-vue'
// import OpenAdd from '/@/views/contingencyManagement/contingency/component/openAdd.vue';
// import OpenSee from '/@/views/contingencyManagement/contingency/component/openSee.vue';

import OpenAdd from '../../contingencyManagement/contingency/component/openAdd.vue'
import UpData from '../../contingencyManagement/contingency/component/upData.vue';
import {contingencyApi} from "/@/api/contingency";
import {contingencyApi} from "../../../api/contingencyManagement/contingency";

export default defineComponent({
  name: 'systemUser',
@@ -153,9 +157,9 @@
    Plus,
    Edit,
    Delete,
    Upload,
    Download,
    Refresh,
    // Upload,
    // Download,
    // Refresh,
    UpData,
    contingencyApi
  },
@@ -166,7 +170,7 @@
      pageSize: 10,
      searchParams: {
        teamName: "",
        teamType: "",
        teamLevel: "",
      }
    })
    // 定义表格数据
@@ -190,7 +194,7 @@
    // 重置
    const submitReset = () => {
      listQuery.searchParams.teamName = '';
      listQuery.searchParams.teamType = '';
      listQuery.searchParams.teamLevel = '';
      onSubmit();
    };
    const warning = ref(true);
@@ -202,8 +206,7 @@
      for (let i = 0; i < valId.length; i++) {
        arr.push(valId[i].id);
      }
      deleteAll.value = arr.toString();
      console.log(deleteAll.value);
      deleteAll.value = arr;
      if (val.length == 1) {
        warning.value = false;
        danger.value = false;
@@ -217,14 +220,14 @@
    };

    // 上传
    const upShow=ref()
    const upButton=()=>{
      upShow.value.openDialog()
    }
    // const upShow=ref()
    // const upButton=()=>{
    //   upShow.value.openDialog()
    // }
    // 打开新增应急队伍弹窗
    const addRef = ref();
    const onOpenAdd = () => {
      addRef.value.openDialog('新建应急队伍管理',false);
      addRef.value.openDialog('新建应急队伍管理');
    };
    // 新增后刷新
    const onMyAdd = (e: boolean) => {
@@ -250,7 +253,7 @@
        type: 'warning',
      }).then(() => {
        contingencyApi()
          .deleteEmergencyTeam(data)
          .deleteEmergencyTeam([data])
          .then((res) => {
            if (res.data.code == 200) {
              ElMessage({
@@ -320,8 +323,8 @@
    return {
      listQuery,
      onSubmit,
      upButton,
      upShow,
      // upButton,
      // upShow,
      onOpenAdd,  //新增
      addRef,
      pageIndex,