iZaiZaiA 3 жил өмнө
parent
commit
f4a2ad6bcd

+ 1 - 1
src/config/index.js

@@ -17,7 +17,7 @@ export default {
     statusWhiteList: [],    //http的status默认放行列表
     ossUrl: 'https://bladex-test-info.oss-cn-chengdu.aliyuncs.com', //oss地址
     smsPhone: '',  //测试接受短信验证码的手机号
-    dev_version: '202209231700',    //开发版本号
+    dev_version: '202209231822',    //开发版本号
     prod_host: 'http://47.110.251.215:8090',  //线上
     dev_host: 'http://192.168.4.6', //黄键楠
     //dev_host: 'http://192.168.3.13', //祝炜

+ 156 - 0
src/router/modules/base.js

@@ -51,6 +51,12 @@ export default [
                 name: 'data-query',
                 meta: {title: '资料查询、下载、上报、验签、打印'},
                 component: () => import('~src/views/data-fill/query.vue')
+            },
+            {
+                path: '/data-fill/division',
+                name: 'data-division',
+                meta: {title: '系统分部分项划分'},
+                component: () => import('~src/views/data-fill/division.vue')
             }
         ],
     },
@@ -216,6 +222,156 @@ export default [
             }
         ],
     },
+    {
+        path: '/tentative/material',
+        name: 'tentative-material',
+        redirect: '/tentative/material/approach',
+        meta: {title: '材料管理'},
+        component: Layout,
+        children: [
+            {
+                path: '/tentative/material/approach',
+                name: 'tentative-material-approach',
+                meta: {title: '材料进场'},
+                component: () => import('~src/views/tentative/material/approach.vue')
+            },
+            {
+                path: '/tentative/material/sampling',
+                name: 'tentative-material-sampling',
+                meta: {title: '材料取样'},
+                component: () => import('~src/views/tentative/material/sampling.vue')
+            }
+        ],
+    },
+    {
+        path: '/tentative/detect',
+        name: 'tentative-detect',
+        redirect: '/tentative/detect/approach',
+        meta: {title: '试验检测'},
+        component: Layout,
+        children: [
+            {
+                path: '/tentative/detect/third',
+                name: 'tentative-detect-third',
+                meta: {title: '外委检测'},
+                component: () => import('~src/views/tentative/detect/third.vue')
+            },
+            {
+                path: '/tentative/detect/outside',
+                name: 'tentative-detect-outside',
+                meta: {title: '第三方检测'},
+                component: () => import('~src/views/tentative/detect/outside.vue')
+            },
+            {
+                path: '/tentative/detect/test',
+                name: 'tentative-detect-test',
+                meta: {title: '试验检测'},
+                component: () => import('~src/views/tentative/detect/test.vue')
+            }
+        ],
+    },
+    {
+        path: '/tentative/collect',
+        name: 'tentative-collect',
+        redirect: '/tentative/collect/approach',
+        meta: {title: '汇总管理'},
+        component: Layout,
+        children: [
+            {
+                path: '/tentative/collect/test',
+                name: 'tentative-collect-test',
+                meta: {title: '试验汇总'},
+                component: () => import('~src/views/tentative/collect/test.vue')
+            },
+            {
+                path: '/tentative/collect/monthly',
+                name: 'tentative-collect-monthly',
+                meta: {title: '月报汇总'},
+                component: () => import('~src/views/tentative/collect/monthly.vue')
+            }
+        ],
+    },
+    {
+        path: '/tentative/device',
+        name: 'tentative-device',
+        redirect: '/tentative/device/approach',
+        meta: {title: '设备管理'},
+        component: Layout,
+        children: [
+            {
+                path: '/tentative/device/approach',
+                name: 'tentative-device-approach',
+                meta: {title: '设备进场管理'},
+                component: () => import('~src/views/tentative/device/approach.vue')
+            },
+            {
+                path: '/tentative/device/employ',
+                name: 'tentative-device-employ',
+                meta: {title: '设备使用管理'},
+                component: () => import('~src/views/tentative/device/employ.vue')
+            },
+            {
+                path: '/tentative/device/overhaul',
+                name: 'tentative-device-overhaul',
+                meta: {title: '设备检修管理'},
+                component: () => import('~src/views/tentative/device/overhaul.vue')
+            }
+        ],
+    },
+    {
+        path: '/tentative/parameter',
+        name: 'tentative-parameter',
+        redirect: '/tentative/parameter/container',
+        meta: {title: '参数设置'},
+        component: Layout,
+        children: [
+            {
+                path: '/tentative/parameter/container',
+                name: 'tentative-parameter-container',
+                meta: {title: '试验容器'},
+                component: () => import('~src/views/tentative/parameter/container.vue')
+            },
+            {
+                path: '/tentative/parameter/sieve',
+                name: 'tentative-parameter-sieve',
+                meta: {title: '自定义筛孔类型'},
+                component: () => import('~src/views/tentative/parameter/sieve.vue')
+            },
+            {
+                path: '/tentative/parameter/density',
+                name: 'tentative-parameter-density',
+                meta: {title: '温度及密码参数'},
+                component: () => import('~src/views/tentative/parameter/density.vue')
+            },
+            {
+                path: '/tentative/parameter/compactness',
+                name: 'tentative-parameter-compactness',
+                meta: {title: '压实度评标参数'},
+                component: () => import('~src/views/tentative/parameter/compactness.vue')
+            }
+        ],
+    },
+    {
+        path: '/tentative/laboratory',
+        name: 'tentative-laboratory',
+        redirect: '/tentative/laboratory/container',
+        meta: {title: '参数设置'},
+        component: Layout,
+        children: [
+            {
+                path: '/tentative/laboratory/user',
+                name: 'tentative-laboratory-user',
+                meta: {title: '人员档案'},
+                component: () => import('~src/views/tentative/laboratory/user.vue')
+            },
+            {
+                path: '/tentative/laboratory/print',
+                name: 'tentative-laboratory-print',
+                meta: {title: '打印空表'},
+                component: () => import('~src/views/tentative/laboratory/print.vue')
+            }
+        ],
+    },
     {
         path: '/403',
         name: '403',

+ 1 - 0
src/router/modules/token.js

@@ -3,6 +3,7 @@ export default [
     'home',
     'home-index',
     'home-config',
+    'data-division',
     'other-file-view',
     'other-file-form',
     'schedule-table',

+ 30 - 0
src/views/data-fill/division.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        系统分部分项划分
+    </div>
+</template>
+
+<script setup>
+//import {ref,watch,onMounted} from "vue";
+//import {useRouter, useRoute} from 'vue-router'
+//import {useAppStore} from "~src/store";
+
+//初始变量
+//const router = useRouter()
+//const useRoutes = useRoute()
+//const useAppState = useAppStore()
+//const {getObjValue, getArrValue} = isType()
+
+//全局变量
+//const projectId = ref(useAppState.getProjectId);
+//const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 16 - 1
src/views/data-fill/wbs.vue

@@ -1,7 +1,13 @@
 <template>
     <div class="h-full">
-        <HcCard :scrollbar="false" id-ref="wbs-node-tree-card-target" v-if="wbsTypeTabKey === 'map'">
+        <HcCard id-ref="wbs-node-tree-card-target" v-if="wbsTypeTabKey === 'map'">
             <template #header>
+                <HcTooltip keys="wbs_views_drawings">
+                    <el-button type="primary" hc-btn @click="divisionClick">
+                        <HcIcon name="node-tree" :line="false"/>
+                        <span>划分变更</span>
+                    </el-button>
+                </HcTooltip>
                 <HcTooltip keys="wbs_views_drawings" v-if="isDrawer">
                     <el-button hc-btn :disabled="!nodeDataInfo?.fileUrl" @click="viewsDrawings">
                         <HcIcon name="image"/>
@@ -1151,6 +1157,15 @@ const abolishOneSave = async () => {
     }
 }
 
+
+//划分变更
+const divisionClick = () => {
+    router.push({
+        path: '/data-fill/division'
+    })
+}
+
+
 //左右拖动,改变树形结构宽度
 const leftWidth = ref(382);
 const onmousedown = () => {

+ 30 - 0
src/views/tentative/collect/monthly.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        月报汇总
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/collect/test.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        试验汇总
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/detect/outside.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        第三方检测
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/detect/test.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        试验检测
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/detect/third.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        外委检测
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/device/approach.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        设备进场管理
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/device/employ.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        设备使用管理
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/device/overhaul.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        设备检修管理
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/laboratory/print.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        打印空表
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/laboratory/user.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        人员档案
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/material/approach.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        材料进场
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/material/sampling.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        材料取样
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/parameter/compactness.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        压实度评标参数
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/parameter/container.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        试验容器
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/parameter/density.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        温度及密码参数
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>

+ 30 - 0
src/views/tentative/parameter/sieve.vue

@@ -0,0 +1,30 @@
+<template>
+    <div class="hc-layout-box">
+        自定义筛孔类型
+    </div>
+</template>
+
+<script setup>
+import {ref,watch,onMounted} from "vue";
+import {useRouter, useRoute} from 'vue-router'
+import {useAppStore} from "~src/store";
+
+//初始变量
+const router = useRouter()
+const useRoutes = useRoute()
+const useAppState = useAppStore()
+const {getObjValue, getArrValue} = isType()
+
+//全局变量
+const projectId = ref(useAppState.getProjectId);
+const contractId = ref(useAppState.getContractId);
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+
+<style lang="scss">
+
+</style>