马宇豪
2023-08-09 1536c360aad6a5c33dde3c29c7a83cd44c5c5b8a
删除修改
已修改5个文件
已添加1个文件
已删除62个文件
17299 ■■■■■ 文件已修改
src/views/analyse/applyReview/components/reportDialog.vue 591 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/applyReview/components/selectDanger.vue 181 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/applyReview/index.ts 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/applyReview/index.vue 373 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/assessApply/components/reportDialog.vue 612 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/assessApply/components/riskDialog.vue 175 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/assessApply/components/riskUnitDialog.vue 199 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/assessApply/components/selectDanger.vue 181 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/assessApply/index.ts 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/assessApply/index.vue 379 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/evaluate/components/evaluateDialog.vue 1204 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/evaluate/index.ts 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/evaluate/index.vue 452 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/identify/components/identifyDialog.vue 513 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/identify/components/identifyQuery.vue 275 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/identify/index.ts 136 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/identify/index.vue 364 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/plan/components/planDialog.vue 255 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/plan/index.ts 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/plan/index.vue 586 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/riskUnit/components/riskUnitDialog.vue 222 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/riskUnit/index.ts 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/riskUnit/index.vue 373 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/equipment/components/equipmentDialog.vue 236 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/equipment/index.ts 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/equipment/index.vue 345 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/material/components/materialDialog.vue 169 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/material/index.ts 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/material/index.vue 322 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/person/components/personDialog.vue 197 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/person/index.ts 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/person/index.vue 315 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/room/components/roomDialog.vue 200 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/room/index.ts 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/room/index.vue 335 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/unit/components/unitDialog.vue 185 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/unit/index.ts 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/unit/index.vue 358 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/bigScreen/index.vue 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/developing/components/applyDialog.vue 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/developing/components/applyStart.vue 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/developing/components/developDialog.vue 795 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/developing/components/selectDanger.vue 184 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/developing/components/selectEquipment.vue 208 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/developing/components/selectMaterial.vue 210 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/developing/components/selectPerson.vue 218 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/developing/index.vue 424 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/components/applyDialog.vue 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/components/applyStart.vue 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/components/projectDialog.vue 775 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/components/selectDanger.vue 192 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/components/selectEmergency.vue 181 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/components/selectEquipment.vue 247 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/components/selectMaterial.vue 248 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/components/selectPerson.vue 244 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/components/selectRoom.vue 268 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/index.ts 222 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/project/index.vue 401 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/home/dialog.vue 272 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/home/index.ts 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/home/index.vue 144 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/layoutPage/index.vue 182 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/loginPage/component/accountLogin.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/newHome/index.vue 967 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/home/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/role/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/user/component/userDialog.vue 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/user/index.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/analyse/applyReview/components/reportDialog.vue
文件已删除
src/views/analyse/applyReview/components/selectDanger.vue
文件已删除
src/views/analyse/applyReview/index.ts
文件已删除
src/views/analyse/applyReview/index.vue
文件已删除
src/views/analyse/assessApply/components/reportDialog.vue
文件已删除
src/views/analyse/assessApply/components/riskDialog.vue
文件已删除
src/views/analyse/assessApply/components/riskUnitDialog.vue
文件已删除
src/views/analyse/assessApply/components/selectDanger.vue
文件已删除
src/views/analyse/assessApply/index.ts
文件已删除
src/views/analyse/assessApply/index.vue
文件已删除
src/views/analyse/evaluate/components/evaluateDialog.vue
文件已删除
src/views/analyse/evaluate/index.ts
文件已删除
src/views/analyse/evaluate/index.vue
文件已删除
src/views/analyse/identify/components/identifyDialog.vue
文件已删除
src/views/analyse/identify/components/identifyQuery.vue
文件已删除
src/views/analyse/identify/index.ts
文件已删除
src/views/analyse/identify/index.vue
文件已删除
src/views/analyse/plan/components/planDialog.vue
文件已删除
src/views/analyse/plan/index.ts
文件已删除
src/views/analyse/plan/index.vue
文件已删除
src/views/analyse/riskUnit/components/riskUnitDialog.vue
文件已删除
src/views/analyse/riskUnit/index.ts
文件已删除
src/views/analyse/riskUnit/index.vue
文件已删除
src/views/basic/equipment/components/equipmentDialog.vue
文件已删除
src/views/basic/equipment/index.ts
文件已删除
src/views/basic/equipment/index.vue
文件已删除
src/views/basic/material/components/materialDialog.vue
文件已删除
src/views/basic/material/index.ts
文件已删除
src/views/basic/material/index.vue
文件已删除
src/views/basic/person/components/personDialog.vue
文件已删除
src/views/basic/person/index.ts
文件已删除
src/views/basic/person/index.vue
文件已删除
src/views/basic/room/components/roomDialog.vue
文件已删除
src/views/basic/room/index.ts
文件已删除
src/views/basic/room/index.vue
文件已删除
src/views/basic/unit/components/unitDialog.vue
文件已删除
src/views/basic/unit/index.ts
文件已删除
src/views/basic/unit/index.vue
文件已删除
src/views/bigScreen/index.vue
对比新文件
@@ -0,0 +1,39 @@
<template>
    <div class="system-role-container">
      6666666
    </div>
</template>
<script lang="ts">
import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
// 定义接口来定义对象的类型
interface TableData {
}
interface TableDataState {
}
export default defineComponent({
    name: 'bigScreen',
    components: {  },
    setup() {
        const roleDialogRef = ref();
        const state = reactive<TableDataState>({
        });
        // 页面加载时
        onMounted(() => {
        });
        return {
            ...toRefs(state)
        };
    }
});
</script>
<style lang="scss" scoped>
</style>
src/views/experiment/developing/components/applyDialog.vue
文件已删除
src/views/experiment/developing/components/applyStart.vue
文件已删除
src/views/experiment/developing/components/developDialog.vue
文件已删除
src/views/experiment/developing/components/selectDanger.vue
文件已删除
src/views/experiment/developing/components/selectEquipment.vue
文件已删除
src/views/experiment/developing/components/selectMaterial.vue
文件已删除
src/views/experiment/developing/components/selectPerson.vue
文件已删除
src/views/experiment/developing/index.vue
文件已删除
src/views/experiment/project/components/applyDialog.vue
文件已删除
src/views/experiment/project/components/applyStart.vue
文件已删除
src/views/experiment/project/components/projectDialog.vue
文件已删除
src/views/experiment/project/components/selectDanger.vue
文件已删除
src/views/experiment/project/components/selectEmergency.vue
文件已删除
src/views/experiment/project/components/selectEquipment.vue
文件已删除
src/views/experiment/project/components/selectMaterial.vue
文件已删除
src/views/experiment/project/components/selectPerson.vue
文件已删除
src/views/experiment/project/components/selectRoom.vue
文件已删除
src/views/experiment/project/index.ts
文件已删除
src/views/experiment/project/index.vue
文件已删除
src/views/home/dialog.vue
文件已删除
src/views/home/index.ts
文件已删除
src/views/home/index.vue
文件已删除
src/views/layoutPage/index.vue
文件已删除
src/views/loginPage/component/accountLogin.vue
@@ -190,6 +190,7 @@
            state.loading.signIn = true;
            // 存储 token 到浏览器缓存
            let res = await useLoginApi().signIn(state.ruleForm);
          console.log(res)
            if (res.data.code === 100) {
                await userInfo.setUserInfos(res.data.data);
                Cookies.set('token', res.data.data.tk);
@@ -230,7 +231,8 @@
        let res = await useMenuApi().getMenuAdmin();
        if (res.data.code === 100) {
          state.menu = JSON.parse(JSON.stringify(res.data.data))
          router.push(state.menu[0].children[0].path);
          console.log(state.menu,'menu')
          router.push(state.menu[0].path);
        } else {
          ElMessage({
            type: 'warning',
@@ -332,6 +334,9 @@
        border-radius: 2px;
        padding: 0 30px;
        border: 1px solid rgba(17,254,238,.4);
        .el-input__inner{
          color: #fff;
        }
        &:focus-within {
            border: 1px solid #11FEEE;
        }
src/views/newHome/index.vue
文件已删除
src/views/system/home/index.vue
@@ -76,7 +76,7 @@
// import { setBackEndControlRefreshRoutes } from "/@/router/backEnd";
// 引入组件
const MenuDialog = defineAsyncComponent(() => import('/@/views/home/dialog.vue'));
const MenuDialog = defineAsyncComponent(() => import('./dialog.vue'));
// 定义变量内容
const stores = useRoutesList();
src/views/system/role/index.vue
@@ -9,12 +9,12 @@
<!--                    </el-icon>-->
<!--                    查询-->
<!--                </el-button>-->
<!--                <el-button size="default" type="success" class="ml10" @click="onOpenDialogRef('新增', '')">-->
<!--                    <el-icon>-->
<!--                        <ele-FolderAdd />-->
<!--                    </el-icon>-->
<!--                    新增角色-->
<!--                </el-button>-->
            <el-button size="default" type="success" class="ml10" @click="onOpenDialogRef('新增', '')">
                <el-icon>
                    <ele-FolderAdd />
                </el-icon>
                新增角色
            </el-button>
            </div>
            <el-table :data="tableData.data" style="width: 100%">
                <el-table-column type="index" label="序号" width="60" />
@@ -101,7 +101,7 @@
                type: 'warning'
            })
                .then(async () => {
                    let res = await useRoleApi().deleteRole({ roleId: row.roleId });
                    let res = await useRoleApi().deleteRole({ roleId: row.id });
                    if (res.data.code === 100) {
                        ElMessage({
                            type: 'success',
src/views/system/user/component/userDialog.vue
@@ -36,43 +36,11 @@
                            <el-input v-model.trim="userForm.phone" placeholder="手机号" clearable></el-input>
                        </el-form-item>
                    </el-col>
                  <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                    <el-form-item label="是否专家" prop="identityStatus">
                      <el-radio-group v-model="userForm.identityStatus">
                        <el-radio :label="0">是</el-radio>
                        <el-radio :label="1">否</el-radio>
                      </el-radio-group>
                    </el-form-item>
                  </el-col>
                  <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="userForm.identityStatus == 0">
                    <el-form-item label="专家类型" prop="identityIds">
                      <el-select v-model="userForm.identityIds" placeholder="专家类型" clearable class="w100" multiple>
                        <el-option v-for="item in expData" :key="item.id" :label="item.identity" :value="item.id"> </el-option>
                      </el-select>
                    </el-form-item>
                  </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                      <el-form-item label="证件类型" prop="idType">
                        <el-select v-model="userForm.idType" placeholder="证件类型" clearable class="w100">
                          <el-option :key="1" label="身份证" :value="1"> </el-option>
                        </el-select>
                      </el-form-item>
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="证件号码" prop="idSerial">
                            <el-input v-model.trim="userForm.idSerial" placeholder="证件号码" clearable></el-input>
                        </el-form-item>
                    </el-col>
                  <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="userForm.identityStatus == 0">
                    <el-form-item label="资质证书" prop="">
                      <el-upload accept="image/*" :action="uploadUrl" :headers="header" method="post" :data="{module: 'accountPath'}" :on-success="handleAvatarSuccess" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='imgLimit' v-model:file-list="fileList" list-type="picture-card" :before-upload="picSize" :on-remove="handleRemove" :before-remove="beforeRemove">
                        <el-icon><Plus /></el-icon>
                        <template #tip>
                          <div class="el-upload__tip">上传jpg/png图片尺寸小于5M,最多可上传1张</div>
                        </template>
                      </el-upload>
                    </el-form-item>
                  </el-col>
                </el-row>
            </el-form>
            <template #footer>
@@ -112,12 +80,8 @@
        roleIds: Array<any>
        depId: number | null;
        phone: string;
        identityStatus:number|null;
        identityIds: Array<any>
        pwd: string;
        idType: number | null;
        idSerial: string;
      qualificationAttId: number | null;
    };
    userFormRules:{},
    departmentData: Array<DeptData>;
@@ -150,11 +114,7 @@
                roleIds: [], // 关联角色
                depId: null, // 部门
                phone: '', // 手机号
                identityStatus: null,
                identityIds: [],
                idType: 1,
                idSerial: '',
              qualificationAttId: null
            },
            userFormRules:{
                name: [{ required: true, message: '请填写用户名', trigger: 'blur' }],
@@ -162,9 +122,6 @@
                roleIds: [{ required: true, message: '请选择用户角色', trigger: 'change' }],
                depId: [{ required: true, message: '请选择部门', trigger: 'change' }],
                phone: [{ required: true, message: '请填写手机号', trigger: 'blur' }],
                identityStatus: [{ required: true, message: '请选择是否为专家', trigger: 'change' }],
                identityIds: [{ required: true, message: '请选择专家类型', trigger: 'change' }],
                idType: [{ required: true, message: '请选择证件类型', trigger: 'blur' }],
                pwd: [{ required: true, message: '请输入账户密码', trigger: 'blur' }],
            },
            departmentData: [], // 部门数据
@@ -197,19 +154,14 @@
                    roleIds: [],
                    depId: null,
                    phone: '',
                    identityStatus: null,
                    identityIds: [],
                    idType: 1,
                    idSerial: '',
                    pwd: '',
                  qualificationAttId: null
                };
            } else {
                state.title = '修改用户';
                state.isAdd = false
                state.userForm = JSON.parse(JSON.stringify(value));
                state.userForm.roleIds = JSON.parse(JSON.stringify(value)).roles.map(i=>i.roleId)
                state.userForm.identityIds = JSON.parse(JSON.stringify(value)).userIdentities.map(i=>i.userIdentityId)
            }
        };
@@ -241,10 +193,6 @@
                      });
                      return
                    }
                    if(state.userForm.identityStatus == 1){
                      state.userForm.identityIds = []
                      state.userForm.qualificationAttId = null
                    }
                    if (state.title === '新增用户') {
                        let res = await userApi().addUser(state.userForm);
                        if (res.data.code === 100) {
@@ -262,8 +210,8 @@
                            });
                        }
                    } else {
                        const {name, realName, roleIds, depId, phone, idType, idSerial, id, identityStatus, identityIds, qualificationAttId} = state.userForm
                        const data = {name, realName, roleIds, depId, phone, idType, idSerial,id, identityStatus, identityIds, qualificationAttId}
                        const {name, realName, roleIds, depId, phone, idSerial, id} = state.userForm
                        const data = {name, realName, roleIds, depId, phone, idSerial,id}
                        let res = await userApi().modUser(data);
                        if (res.data.code === 100) {
                            ElMessage({
@@ -338,44 +286,6 @@
          state.userForm.qualificationAttId = res.data.id
        }
      }
      // const beforeRemove = (file: {}, fileList: []) => {
      //   const result = new Promise((resolve, reject) => {
      //     if(!state.isOverSize){
      //       ElMessageBox.confirm('此操作将删除该图片, 是否继续?', '提示', {
      //         confirmButtonText: '确定',
      //         cancelButtonText: '取消',
      //         type: 'warning'
      //       })
      //           .then(() => {
      //             // console.log(state.workDetail.gbPath,'path')
      //             const list = JSON.parse(JSON.stringify(state.form.workDetail.gbPath))
      //             fileList.map((item,index)=>{
      //               if(item.uid === file.uid){
      //                 fileList.splice(index,1)
      //                 state.form.workDetail.gbPath.splice(index,1)
      //                 // 请求删除接口
      //                 deletePic(false,list[index])
      //               }
      //             })
      //           })
      //           .catch(() => {
      //             reject(false);
      //           });
      //     }else{
      //       const list = JSON.parse(JSON.stringify(state.form.workDetail.gbPath))
      //       fileList.map((item,index)=>{
      //         if(item.uid === file.uid){
      //           fileList.splice(index,1)
      //           state.form.workDetail.gbPath.splice(index,1)
      //           deletePic(true,list[index])
      //         }
      //       })
      //       state.isOverSize = false
      //     }
      //   });
      //   return result;
      // };
        // 页面加载时
        onMounted(() => {
src/views/system/user/index.vue
@@ -36,11 +36,6 @@
                    <span>{{ scope.row.roles.map(obj => obj.roleName).join('、') }}</span>
                  </template>
                </el-table-column>
                <el-table-column prop="idType" label="证件类型">
                  <template #default="scope">
                    <span>{{idTypeList.find(item=>item.id == scope.row.idType)?.name}}</span>
                  </template>
                </el-table-column>
                <el-table-column prop="idSerial" label="证件号码"></el-table-column>
                <el-table-column label="操作" width="100">
                    <template #default="scope">
@@ -102,7 +97,6 @@
            }
        };
    };
    idTypeList: Array<idType>
    depList: [];
    roleList: [];
    expList: [];
@@ -130,12 +124,6 @@
                  }
                }
            },
            idTypeList:[
              {
                id: 1,
                name: '身份证'
              }
            ],
            depList: [],
            roleList: [],
            expList: [],