zhuangyunsheng 3 mesi fa
parent
commit
81635f191a
57 ha cambiato i file con 123 aggiunte e 95 eliminazioni
  1. 2 2
      .env.development
  2. 0 0
      src/api/model/aihazard.js
  3. 0 0
      src/api/model/autospray.js
  4. 44 0
      src/api/model/broadcast.js
  5. 0 0
      src/api/model/car_rinse.js
  6. 0 0
      src/api/model/envdev.js
  7. 0 0
      src/api/model/tcm.js
  8. 17 11
      src/config/route.js
  9. 1 23
      src/router/index.js
  10. 0 0
      src/views/dataMock/aihazard/components/index.js
  11. 3 3
      src/views/dataMock/ugliAi/components/record/detail.vue
  12. 3 3
      src/views/dataMock/ugliAi/components/record/index.vue
  13. 0 0
      src/views/dataMock/aihazard/components/template.vue
  14. 2 2
      src/views/dataMock/ugliAi/detail.vue
  15. 1 1
      src/views/dataMock/ugliAi/index.vue
  16. 0 0
      src/views/dataMock/aihazard/main.js
  17. 0 0
      src/views/dataMock/autospray/components/index.js
  18. 3 3
      src/views/dataMock/spray/components/record/detail.vue
  19. 4 4
      src/views/dataMock/spray/components/record/index.vue
  20. 2 2
      src/views/dataMock/spray/detail.vue
  21. 1 1
      src/views/dataMock/env/index.vue
  22. 0 0
      src/views/dataMock/autospray/main.js
  23. 1 1
      src/views/dataMock/carwash/components/info/detail.vue
  24. 2 2
      src/views/dataMock/carwash/components/info/index.vue
  25. 1 1
      src/views/dataMock/carwash/components/record/detail.vue
  26. 2 2
      src/views/dataMock/carwash/components/record/index.vue
  27. 1 1
      src/views/dataMock/carwash/detail.vue
  28. 1 1
      src/views/dataMock/carwash/index.vue
  29. 1 1
      src/views/dataMock/elevator/components/alarm.vue
  30. 1 1
      src/views/dataMock/elevator/components/attendance.vue
  31. 1 1
      src/views/dataMock/elevator/index.vue
  32. 0 0
      src/views/dataMock/envdev/components/calendar.vue
  33. 0 0
      src/views/dataMock/envdev/components/index.js
  34. 3 3
      src/views/dataMock/env/components/record/detail.vue
  35. 3 3
      src/views/dataMock/env/components/record/index.vue
  36. 0 0
      src/views/dataMock/envdev/components/template.vue
  37. 0 0
      src/views/dataMock/envdev/components/threshold.vue
  38. 2 2
      src/views/dataMock/env/detail.vue
  39. 1 1
      src/views/dataMock/spray/index.vue
  40. 0 0
      src/views/dataMock/envdev/main.js
  41. 0 0
      src/views/dataMock/scc/components/index.js
  42. 1 1
      src/views/dataMock/standard/components/record/detail.vue
  43. 1 1
      src/views/dataMock/standard/components/record/index.vue
  44. 0 0
      src/views/dataMock/scc/components/threshold.vue
  45. 0 0
      src/views/dataMock/scc/detail.vue
  46. 0 0
      src/views/dataMock/scc/index.vue
  47. 0 0
      src/views/dataMock/scc/main.js
  48. 1 1
      src/views/dataMock/tasks/monos.vue
  49. 4 4
      src/views/dataMock/tower/components/alarm.vue
  50. 4 4
      src/views/dataMock/tower/components/attendance.vue
  51. 0 0
      src/views/dataMock/tcm/components/index.js
  52. 3 3
      src/views/dataMock/tower/components/record/detail.vue
  53. 3 3
      src/views/dataMock/tower/components/record/index.vue
  54. 0 0
      src/views/dataMock/tcm/components/template.vue
  55. 2 2
      src/views/dataMock/tower/detail.vue
  56. 1 1
      src/views/dataMock/tower/index.vue
  57. 0 0
      src/views/dataMock/tcm/main.js

+ 2 - 2
.env.development

@@ -8,8 +8,8 @@ VUE_APP_TITLE = EasyDo运营中心
 # VUE_APP_API_BASEURL = http://www.qdeasydo.com/api
 # VUE_APP_OPS_BASEURL = http://www.qdeasydo.com/ops
 VUE_APP_ZEROAPI_BASEURL = http://www.qdeasydo.com
-VUE_APP_API_BASEURL  = http://192.168.101.93:8802
-VUE_APP_OPS_BASEURL = http://192.168.101.93:8804
+VUE_APP_API_BASEURL  = http://192.168.101.93:8805
+VUE_APP_OPS_BASEURL = http://192.168.101.93:8806
 
 # 本地端口
 VUE_APP_PORT = 3200

src/api/model/ugliAi.js → src/api/model/aihazard.js


src/api/model/spray.js → src/api/model/autospray.js


+ 44 - 0
src/api/model/broadcast.js

@@ -0,0 +1,44 @@
+import config from "@/config"
+import http from "@/utils/request"
+
+export default {
+    mounted: {
+        url: `${config.API_URL}/ops/autospray/getMountedList`,
+        name: "安装点查询",
+        get: async function (data = {}) {
+            return await http.post(this.url, data);
+        }
+    },
+
+    record: {
+        name: "预警记录",
+        url: `${config.API_URL}/ops/autospray`,
+        get: async function (data = {}) {
+            return await http.post(`${this.url}/getPage`, data);
+        },
+
+        add: async function (data = {}) {
+            return await http.post(`${this.url}/save`, data);
+        },
+
+        edit: async function (data = {}) {
+            return await http.post(`${this.url}/update`, data);
+        },
+
+        del: async function (data = {}) {
+            return await http.post(`${this.url}/remove`, data);
+        },
+
+        batchDel: async function (data = {}) {
+            return await http.post(`${this.url}/batchRemove`, data);
+        }
+    },
+
+    dataMock: {
+        url: `${config.API_URL}/ops/autospray`,
+        name: "数据模拟-参数/复制",
+        makeData: async function (data = {}) {
+            return await http.post(`${this.url}/makeData`, data);
+        }
+    }
+}

src/api/model/carwash.js → src/api/model/car_rinse.js


src/api/model/env.js → src/api/model/envdev.js


src/api/model/tower.js → src/api/model/tcm.js


+ 17 - 11
src/config/route.js

@@ -92,19 +92,19 @@ const routes = [
         name: "dataMock",
         path: "/dataMock",
         meta: { title: "数据管理与模拟", icon: "majesticons:data-plus-line" },
-        redirect: "/dataMock/ugliAi",
+        redirect: "/dataMock/aihazard",
         children: [
             {
                 name: "ugliAiMock",
-                path: "/dataMock/ugliAi",
+                path: "/dataMock/aihazard",
                 meta: { title: "数据管理与模拟-AI视频危险源识别", icon: "hugeicons:ai-brain-02" },
-                component: "dataMock/ugliAi"
+                component: "dataMock/aihazard"
             },
             {
                 name: "towerMock",
-                path: "/dataMock/tower",
+                path: "/dataMock/tcm",
                 meta: { title: "数据管理与模拟-塔机监测", icon: "mingcute:tower-crane-line" },
-                component: "dataMock/tower"
+                component: "dataMock/tcm"
             },
             {
                 name: "elevatorMock",
@@ -114,27 +114,33 @@ const routes = [
             },
             {
                 name: "standardMock",
-                path: "/dataMock/standard",
+                path: "/dataMock/scc",
                 meta: { title: "数据管理与模拟-标养室监测", icon: "dashicons:dashboard" },
-                component: "dataMock/standard"
+                component: "dataMock/scc"
             },
             {
                 name: "envMock",
-                path: "/dataMock/env",
+                path: "/dataMock/envdev",
                 meta: { title: "数据管理与模拟-环境监测", icon: "fluent:earth-leaf-16-regular" },
-                component: "dataMock/env"
+                component: "dataMock/envdev"
             },
             {
                 name: "sprayMock",
-                path: "/dataMock/spray",
+                path: "/dataMock/autospray",
                 meta: { title: "数据管理与模拟-自动喷淋系统", icon: "covid:vaccine-protection-sanitizer-spray" },
-                component: "dataMock/spray"
+                component: "dataMock/autospray"
             },
             {
                 name: "carwashMock",
                 path: "/dataMock/carwash",
                 meta: { title: "数据管理与模拟-渣土运输管理", icon: "map:car-wash" },
                 component: "dataMock/carwash"
+            },
+            {
+                name: "broadcastMock",
+                path: "/dataMock/broadcast",
+                meta: { title: "数据管理与模拟-智能广播", icon: "bi:broadcast-pin" },
+                component: "dataMock/broadcast"
             }
         ]
     },

+ 1 - 23
src/router/index.js

@@ -28,10 +28,6 @@ const router = createRouter({
 // 判断是否已加载过动态/静态路由
 let isGetRouter = false;
 // FIX 多个API同时401时疯狂弹窗BUG
-let interval = {
-    tower: null,
-    env: null
-}
 
 router.beforeEach(async (to, from, next) => {
 
@@ -51,7 +47,6 @@ router.beforeEach(async (to, from, next) => {
 		isGetRouter = false;
 		if (token) next(from.fullPath);
         else {
-            clearIntervals();
             to.redirectedFrom = from;
             next();
         }
@@ -91,7 +86,6 @@ router.afterEach((to, from) => {
 
 router.onError(error => {
     NProgress.done();
-    clearIntervals();
 	ElNotification.error({
 		title: "路由错误",
 		message: error.message
@@ -138,12 +132,7 @@ router.getGates = async (path, start = 0, gates = []) => {
         const res = await fetchGates(path, start);
         gates = gates.concat(XEUtils.get(res, "datas", []));
         if (XEUtils.get(res, "expands.total", 0) > gates.length) router.getGates(path, start + 100, gates);
-        else {
-            if (["tower", "env"].includes(path) && !interval[path]) {
-                interval[path] = setInterval(() => router.getGates(path), 300 * 1000);
-            }
-            tool.data.set(`${path.toUpperCase()}_GATE`, gates, ["tower", "env"].includes(path) && 300 || 0);
-        }
+        else tool.data.set(`${path.toUpperCase()}_GATE`, gates, 0);
     }
 }
 
@@ -151,15 +140,4 @@ function fetchGates(path, start) {
     return XEUtils.get(api, `${path}.gate`).get({ querys: [{ limit: { start, length: 100 } }], expands: { options: ["ground", "devices"] } });
 }
  
-function clearIntervals() {
-    if (interval.tower) {
-        clearInterval(interval.tower)
-        interval.tower = null;
-    }
-    if (interval.env) {
-        clearInterval(interval.env)
-        interval.env = null;
-    }
-}
-
 export default router

src/views/dataMock/env/components/index.js → src/views/dataMock/aihazard/components/index.js


+ 3 - 3
src/views/dataMock/ugliAi/components/record/detail.vue

@@ -81,7 +81,7 @@ const rules = reactive({
 const mounteds = ref([]);
 const filterMounteds = computed(() => form.value.projectId ? XEUtils.filter(mounteds.value, item => item.projectId == form.value.projectId) : []);
 const fetchMounted = async () => {
-    const res = await API.ugliAi.mounted.get();
+    const res = await API.aihazard.mounted.get();
     mounteds.value = res || [];
     if (props.projectId == 1) form.value.mountedId = XEUtils.get(XEUtils.find(res, item => item.projectId == 1), "id");
 }
@@ -129,7 +129,7 @@ const submit = () => {
             }
 
             isSaving.value = true;
-            API.ugliAi.record[mode.value](data).then(() => {
+            API.aihazard.record[mode.value](data).then(() => {
                 isSaving.value = false;
                 ElMessage.success("操作成功");
                 visible.value = false;
@@ -154,7 +154,7 @@ const removeSuccess = () => {
     }
     
     isDel.value = true;
-    API.ugliAi.record.edit(data);
+    API.aihazard.record.edit(data);
 }
 
 defineExpose({

+ 3 - 3
src/views/dataMock/ugliAi/components/record/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <scTable ref="xGridTable" batchDel :apiObj="$API.ugliAi.record" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns" v-bind="props.options">
+    <scTable ref="xGridTable" batchDel :apiObj="$API.aihazard.record" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns" v-bind="props.options">
         <template #default_imgUrl="{ row }">
             <template v-if="XEUtils.get(XEUtils.toStringJSON(row.features), 'bigImage.image')">
                 <vxe-image style="cursor: pointer;" :src="'/minio' + XEUtils.get(XEUtils.toStringJSON(row.features), 'bigImage.image')" width="40" height="40" :toolbar-config="imageToolbar"></vxe-image>
@@ -49,7 +49,7 @@ const proConfig = reactive({
 const mountedConfig = reactive({
     visible,
     api: {
-        key: "ugliAi.mounted",
+        key: "aihazard.mounted",
         query: {
             projectId: computed(() => formConfig.data.projectId),
             projectIdNot: 1
@@ -167,7 +167,7 @@ const table_del = ({ id }) => {
         confirmButtonText: "确定",
         cancelButtonText: "取消"
     }).then(() => {
-        API.ugliAi.record.del({ id }).then(() => {
+        API.aihazard.record.del({ id }).then(() => {
             ElMessage.success("操作成功");
             refreshTable();
         });

src/views/dataMock/env/components/template.vue → src/views/dataMock/aihazard/components/template.vue


+ 2 - 2
src/views/dataMock/ugliAi/detail.vue

@@ -163,7 +163,7 @@ const mounteds = ref([]);
 const filterTargetM = computed(() => form.value.targetProjectId ? XEUtils.filter(mounteds.value, item => item.projectId == form.value.targetProjectId) : []);
 const filterSourceM = computed(() => form.value.sourceProjectId ? XEUtils.filter(mounteds.value, item => item.projectId == form.value.sourceProjectId) : []);
 const fetchMounted = async () => {
-    const res = await API.ugliAi.mounted.get();
+    const res = await API.aihazard.mounted.get();
     mounteds.value = res || [];
 }
 
@@ -190,7 +190,7 @@ const submit = key => {
             }
 
             isSaving.value = true;
-            API.ugliAi.dataMock[apiKey.value](data).then(() => {
+            API.aihazard.dataMock[apiKey.value](data).then(() => {
                 isSaving.value = false;
                 ElMessage.success("操作成功");
                 visible.value = false;

+ 1 - 1
src/views/dataMock/ugliAi/index.vue

@@ -10,7 +10,7 @@
             <el-tab-pane v-for="(label, key) in workerStates" :key="key" :label="label" :name="key"></el-tab-pane>
         </el-tabs>
 
-        <component ref="componentRef" :is="allcomp[activeName]" m_apiKey="ugliAi" taskType="aihazard" />
+        <component ref="componentRef" :is="allcomp[activeName]" taskType="aihazard" />
 	</el-container>
 
     <mock-detail v-if="dialog" ref="mockRef" @success="refreshState" @closed="dialog = false"></mock-detail>

src/views/dataMock/ugliAi/main.js → src/views/dataMock/aihazard/main.js


src/views/dataMock/spray/components/index.js → src/views/dataMock/autospray/components/index.js


+ 3 - 3
src/views/dataMock/spray/components/record/detail.vue

@@ -34,7 +34,7 @@
 import XEUtils from "xe-utils";
 import API from "@/api";
 import TOOL from "@/utils/tool";
-import { typeDic } from "@/views/dataMock/spray/main";
+import { typeDic } from "@/views/dataMock/autospray/main";
 
 const $emit = defineEmits(["success", "closed"]);
 const props = defineProps({
@@ -68,7 +68,7 @@ const rules = reactive({
 const mounteds = ref([]);
 const filterMounteds = computed(() => form.value.projectId ? XEUtils.filter(mounteds.value, item => item.projectId == form.value.projectId) : []);
 const fetchMounted = async () => {
-    const res = await API.spray.mounted.get();
+    const res = await API.autospray.mounted.get();
     mounteds.value = res || [];
     if (props.projectId == 1) form.value.mountedId = XEUtils.get(XEUtils.find(res, item => item.projectId == 1), "id");
 }
@@ -88,7 +88,7 @@ const submit = () => {
     formRef.value.validate(valid => {
         if (valid) {
             isSaving.value = true;
-            API.spray.record[mode.value](form.value).then(() => {
+            API.autospray.record[mode.value](form.value).then(() => {
                 isSaving.value = false;
                 ElMessage.success("操作成功");
                 visible.value = false;

+ 4 - 4
src/views/dataMock/spray/components/record/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <scTable ref="xGridTable" batchDel :apiObj="$API.spray.record" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns" v-bind="props.options">
+    <scTable ref="xGridTable" batchDel :apiObj="$API.autospray.record" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns" v-bind="props.options">
         <template #default_imgUrl="{ row }">
             <template v-if="XEUtils.get(XEUtils.toStringJSON(row.features), 'bigImage.image')">
                 <vxe-image style="cursor: pointer;" :src="'/minio' + XEUtils.get(XEUtils.toStringJSON(row.features), 'bigImage.image')" width="40" height="40" :toolbar-config="imageToolbar"></vxe-image>
@@ -26,7 +26,7 @@ import API from "@/api";
 import TOOL from "@/utils/tool";
 import { mapFormItemSelect, mapFormItemDatePicker } from "@/components/scTable/helper";
 import { dataSource, objectToArray } from "@/utils/basicDic";
-import { typeDic } from "@/views/dataMock/spray/main";
+import { typeDic } from "@/views/dataMock/autospray/main";
 import recordDetail from "./detail";
 
 const props = defineProps({
@@ -50,7 +50,7 @@ const proConfig = reactive({
 const mountedConfig = reactive({
     visible,
     api: {
-        key: "spray.mounted",
+        key: "autospray.mounted",
         query: {
             projectId: computed(() => formConfig.data.projectId),
             projectIdNot: 1
@@ -157,7 +157,7 @@ const table_del = ({ id }) => {
         confirmButtonText: "确定",
         cancelButtonText: "取消"
     }).then(() => {
-        API.spray.record.del({ id }).then(() => {
+        API.autospray.record.del({ id }).then(() => {
             ElMessage.success("操作成功");
             refreshTable();
         });

+ 2 - 2
src/views/dataMock/spray/detail.vue

@@ -92,7 +92,7 @@ const dataTimeRange = async () => {
 const mounteds = ref([]);
 const filterTargetM = computed(() => form.value.targetProjectId ? XEUtils.filter(mounteds.value, item => item.projectId == form.value.targetProjectId) : []);
 const fetchMounted = async () => {
-    const res = await API.spray.mounted.get();
+    const res = await API.autospray.mounted.get();
     mounteds.value = res || [];
 }
 
@@ -111,7 +111,7 @@ const submit = key => {
             XEUtils.set(data, "targetEndTime", XEUtils.last(form.value.targetTime));
             
             isSaving.value = true;
-            API.spray.dataMock[apiKey.value](data).then(() => {
+            API.autospray.dataMock[apiKey.value](data).then(() => {
                 isSaving.value = false;
                 ElMessage.success("操作成功");
                 visible.value = false;

+ 1 - 1
src/views/dataMock/env/index.vue

@@ -10,7 +10,7 @@
             <el-tab-pane v-for="(label, key) in workerStates" :key="key" :label="label" :name="key"></el-tab-pane>
         </el-tabs>
 
-        <component ref="componentRef" :is="allcomp[activeName]" m_apiKey="env" taskType="envdev" />
+        <component ref="componentRef" :is="allcomp[activeName]" taskType="autospray" />
 	</el-container>
 
     <mock-detail v-if="dialog" ref="mockRef" @success="refreshState" @closed="dialog = false"></mock-detail>

src/views/dataMock/spray/main.js → src/views/dataMock/autospray/main.js


+ 1 - 1
src/views/dataMock/carwash/components/info/detail.vue

@@ -77,7 +77,7 @@ const submit = () => {
     formRef.value.validate(valid => {
         if (valid) {
             isSaving.value = true;
-            API.carwash.carInfo[mode.value](form.value).then(res => {
+            API.car_rinse.carInfo[mode.value](form.value).then(res => {
                 isSaving.value = false;
                 ElMessage.success("操作成功");
                 visible.value = false;

+ 2 - 2
src/views/dataMock/carwash/components/info/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <scTable ref="xGridTable" :apiObj="$API.carwash.carInfo" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns">
+    <scTable ref="xGridTable" :apiObj="$API.car_rinse.carInfo" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns">
         <template #action="{ row }">
             <el-button type="primary" link @click="table_edit(row)">
                 <template #icon><sc-iconify icon="ant-design:edit-outlined"></sc-iconify></template>修改
@@ -104,7 +104,7 @@ const table_del = ({ id }) => {
         confirmButtonText: "确定",
         cancelButtonText: "取消"
     }).then(() => {
-        API.carwash.carInfo.del({ id }).then(() => {
+        API.car_rinse.carInfo.del({ id }).then(() => {
             ElMessage.success("操作成功");
             refreshTable();
         });

+ 1 - 1
src/views/dataMock/carwash/components/record/detail.vue

@@ -159,7 +159,7 @@ const submit = () => {
             !XEUtils.isEmpty(folders) && XEUtils.set(data, "folders", folders);
 
             isSaving.value = true;
-            API.carwash.record[mode.value](data).then(() => {
+            API.car_rinse.record[mode.value](data).then(() => {
                 isSaving.value = false;
                 ElMessage.success("操作成功");
                 visible.value = false;

+ 2 - 2
src/views/dataMock/carwash/components/record/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <scTable ref="xGridTable" batchDel :apiObj="$API.carwash.record" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns" v-bind="props.options">
+    <scTable ref="xGridTable" batchDel :apiObj="$API.car_rinse.record" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns" v-bind="props.options">
         <template #default_imgUrl="{ row, column }">
             <template v-if="XEUtils.get(row, `folders.${column.field}.entities[0].path`)">
                 <vxe-image style="cursor: pointer;" :src="'/api/folder/' + XEUtils.get(row, `folders.${column.field}.entities[0].path`)" width="40" height="40" :toolbar-config="imageToolbar"></vxe-image>
@@ -145,7 +145,7 @@ const table_del = ({ id }) => {
         confirmButtonText: "确定",
         cancelButtonText: "取消"
     }).then(() => {
-        API.carwash.record.del({ id }).then(() => {
+        API.car_rinse.record.del({ id }).then(() => {
             ElMessage.success("操作成功");
             refreshTable();
         });

+ 1 - 1
src/views/dataMock/carwash/detail.vue

@@ -155,7 +155,7 @@ const submit = key => {
             key == "template" && XEUtils.set(data, "targetProjectId", 1);
 
             isSaving.value = true;
-            API.carwash.dataMock[apiKey.value](data).then(() => {
+            API.car_rinse.dataMock[apiKey.value](data).then(() => {
                 isSaving.value = false;
                 ElMessage.success("操作成功");
                 visible.value = false;

+ 1 - 1
src/views/dataMock/carwash/index.vue

@@ -11,7 +11,7 @@
             <el-tab-pane v-for="(label, key) in workerStates" :key="key" :label="label" :name="key"></el-tab-pane>
         </el-tabs>
 
-        <component ref="componentRef" :is="allcomp[activeName]" m_apiKey="carwash" taskType="car_rinse" />
+        <component ref="componentRef" :is="allcomp[activeName]" taskType="car_rinse" />
 	</el-container>
 
     <mock-detail v-if="dialog" ref="mockRef" @success="refreshState" @closed="dialog = false"></mock-detail>

+ 1 - 1
src/views/dataMock/elevator/components/alarm.vue

@@ -15,7 +15,7 @@ import API from "@/api";
 import TOOL from "@/utils/tool";
 import { mapFormItemSelect, mapFormItemDatePicker } from "@/components/scTable/helper";
 import { dataSource, objectToArray } from "@/utils/basicDic";
-import { warningTypeDic } from "@/views/dataMock/tower/main";
+import { warningTypeDic } from "@/views/dataMock/tcm/main";
 
 const proConfig = reactive({
     span: 5,

+ 1 - 1
src/views/dataMock/elevator/components/attendance.vue

@@ -23,7 +23,7 @@ import API from "@/api";
 import TOOL from "@/utils/tool";
 import { mapFormItemSelect, mapFormItemDatePicker } from "@/components/scTable/helper";
 import { dataSource } from "@/utils/basicDic";
-import { folderKeyDic } from "@/views/dataMock/tower/main";
+import { folderKeyDic } from "@/views/dataMock/tcm/main";
 
 const formatCertificate = (row, { field }) => XEUtils.find(XEUtils.get(XEUtils.toStringJSON(XEUtils.get(row, "person.features")), "certificate", []), item => item.type == XEUtils.get(folderKeyDic, field));
 

+ 1 - 1
src/views/dataMock/elevator/index.vue

@@ -16,7 +16,7 @@
             <el-tab-pane label="考勤数据" name="elevator_person"></el-tab-pane>
         </el-tabs>
 
-        <component ref="componentRef" :is="allcomp[activeName]" m_apiKey="elevator" :taskType="taskType" />
+        <component ref="componentRef" :is="allcomp[activeName]" :taskType="taskType" />
 	</el-container>
 
     <mock-detail v-if="dialog" ref="mockRef" @success="refreshState" @closed="dialog = false"></mock-detail>

src/views/dataMock/env/components/calendar.vue → src/views/dataMock/envdev/components/calendar.vue


src/views/dataMock/standard/components/index.js → src/views/dataMock/envdev/components/index.js


+ 3 - 3
src/views/dataMock/env/components/record/detail.vue

@@ -94,7 +94,7 @@
 import XEUtils from "xe-utils";
 import API from "@/api";
 import TOOL from "@/utils/tool";
-import { valueFormatDic, transferPower } from "@/views/dataMock/env/main";
+import { valueFormatDic, transferPower } from "@/views/dataMock/envdev/main";
 
 const $emit = defineEmits(["success", "closed"]);
 const props = defineProps({
@@ -143,7 +143,7 @@ const rules = reactive({
 const mounteds = ref([]);
 const filterMounteds = computed(() => form.value.projectId ? XEUtils.filter(mounteds.value, item => item.projectId == form.value.projectId) : []);
 const fetchMounted = async () => {
-    const res = await API.env.mounted.get();
+    const res = await API.envdev.mounted.get();
     mounteds.value = res || [];
     if (props.projectId == 1) form.value.mountedId = XEUtils.get(XEUtils.find(res, item => item.projectId == 1), "id");
 }
@@ -175,7 +175,7 @@ const submit = () => {
             XEUtils.arrayEach(valueFormatDic, key => XEUtils.set(data, key, XEUtils.multiply(XEUtils.get(form.value, key), 10000)));
 
             isSaving.value = true;
-            API.env.record[mode.value](data).then(() => {
+            API.envdev.record[mode.value](data).then(() => {
                 isSaving.value = false;
                 ElMessage.success("操作成功");
                 visible.value = false;

+ 3 - 3
src/views/dataMock/env/components/record/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <scTable ref="xGridTable" batchDel :apiObj="$API.env.record" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns" v-bind="props.options">
+    <scTable ref="xGridTable" batchDel :apiObj="$API.envdev.record" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns" v-bind="props.options">
         <template #action="{ row }">
             <el-button type="primary" link @click="table_edit(row)">
                 <template #icon><sc-iconify icon="ant-design:edit-outlined"></sc-iconify></template>修改
@@ -43,7 +43,7 @@ const proConfig = reactive({
 const mountedConfig = reactive({
     visible,
     api: {
-        key: "env.mounted",
+        key: "envdev.mounted",
         query: {
             projectId: computed(() => formConfig.data.projectId),
             projectIdNot: 1
@@ -143,7 +143,7 @@ const table_del = ({ id }) => {
         confirmButtonText: "确定",
         cancelButtonText: "取消"
     }).then(() => {
-        API.env.record.del({ id }).then(() => {
+        API.envdev.record.del({ id }).then(() => {
             ElMessage.success("操作成功");
             refreshTable();
         });

src/views/dataMock/tower/components/template.vue → src/views/dataMock/envdev/components/template.vue


src/views/dataMock/env/components/threshold.vue → src/views/dataMock/envdev/components/threshold.vue


+ 2 - 2
src/views/dataMock/env/detail.vue

@@ -186,7 +186,7 @@ const mounteds = ref([]);
 const filterTargetM = computed(() => form.value.targetProjectId ? XEUtils.filter(mounteds.value, item => item.projectId == form.value.targetProjectId) : []);
 const filterSourceM = computed(() => form.value.sourceProjectId ? XEUtils.filter(mounteds.value, item => item.projectId == form.value.sourceProjectId) : []);
 const fetchMounted = async () => {
-    const res = await API.env.mounted.get();
+    const res = await API.envdev.mounted.get();
     mounteds.value = res || [];
 }
 
@@ -221,7 +221,7 @@ const submit = key => {
             }
 
             isSaving.value = true;
-            API.env.dataMock[apiKey.value](data).then(() => {
+            API.envdev.dataMock[apiKey.value](data).then(() => {
                 isSaving.value = false;
                 ElMessage.success("操作成功");
                 visible.value = false;

+ 1 - 1
src/views/dataMock/spray/index.vue

@@ -10,7 +10,7 @@
             <el-tab-pane v-for="(label, key) in workerStates" :key="key" :label="label" :name="key"></el-tab-pane>
         </el-tabs>
 
-        <component ref="componentRef" :is="allcomp[activeName]" m_apiKey="spray" taskType="autospray" />
+        <component ref="componentRef" :is="allcomp[activeName]" taskType="envdev" />
 	</el-container>
 
     <mock-detail v-if="dialog" ref="mockRef" @success="refreshState" @closed="dialog = false"></mock-detail>

src/views/dataMock/env/main.js → src/views/dataMock/envdev/main.js


src/views/dataMock/tower/components/index.js → src/views/dataMock/scc/components/index.js


+ 1 - 1
src/views/dataMock/standard/components/record/detail.vue

@@ -39,7 +39,7 @@
 import XEUtils from "xe-utils";
 import API from "@/api";
 import TOOL from "@/utils/tool";
-import { typeDic, unitDic } from "@/views/dataMock/standard/main";
+import { typeDic, unitDic } from "@/views/dataMock/scc/main";
 
 const $emit = defineEmits(["success", "closed"]);
 const props = defineProps({

+ 1 - 1
src/views/dataMock/standard/components/record/index.vue

@@ -26,7 +26,7 @@ import API from "@/api";
 import TOOL from "@/utils/tool";
 import { mapFormItemSelect, mapFormItemDatePicker } from "@/components/scTable/helper";
 import { dataSource, objectToArray } from "@/utils/basicDic";
-import { typeDic, unitDic } from "@/views/dataMock/standard/main";
+import { typeDic, unitDic } from "@/views/dataMock/scc/main";
 import recordDetail from "./detail";
 
 const props = defineProps({

src/views/dataMock/standard/components/threshold.vue → src/views/dataMock/scc/components/threshold.vue


src/views/dataMock/standard/detail.vue → src/views/dataMock/scc/detail.vue


src/views/dataMock/standard/index.vue → src/views/dataMock/scc/index.vue


src/views/dataMock/standard/main.js → src/views/dataMock/scc/main.js


+ 1 - 1
src/views/dataMock/tasks/monos.vue

@@ -52,7 +52,7 @@ const proConfig = reactive({
 const mountedConfig = reactive({
     visibleMethod: ({ data }) => !(data.isTemp == 1 || data.taskType == "car_rinse"),
     api: {
-        key: computed(() => `${props.m_apiKey || props.taskType}.mounted`),
+        key: computed(() => `${XEUtils.first(props.taskType.split("_"))}.mounted`),
         query: {
             projectId: computed(() => formConfig.data.projectId),
             projectIdNot: 1

+ 4 - 4
src/views/dataMock/tower/components/alarm.vue

@@ -1,5 +1,5 @@
 <template>
-    <scTable ref="xGridTable" batchDel :apiObj="$API.tower.warning" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns">
+    <scTable ref="xGridTable" batchDel :apiObj="$API.tcm.warning" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns">
         <template #action="{ row }">
             <el-button type="primary" link @click="table_del(row)">
                 <template #icon><sc-iconify icon="ant-design:delete-outlined"></sc-iconify></template>删除
@@ -15,7 +15,7 @@ import API from "@/api";
 import TOOL from "@/utils/tool";
 import { mapFormItemSelect, mapFormItemDatePicker } from "@/components/scTable/helper";
 import { dataSource, objectToArray } from "@/utils/basicDic";
-import { warningTypeDic } from "@/views/dataMock/tower/main";
+import { warningTypeDic } from "@/views/dataMock/tcm/main";
 
 const proConfig = reactive({
     span: 5,
@@ -29,7 +29,7 @@ const proConfig = reactive({
 
 const mountedConfig = reactive({
     api: {
-        key: "tower.mounted",
+        key: "tcm.mounted",
         query: {
             projectId: computed(() => formConfig.data.projectId),
             projectIdNot: 1
@@ -119,7 +119,7 @@ const table_del = ({ id }) => {
         confirmButtonText: "确定",
         cancelButtonText: "取消"
     }).then(() => {
-        API.tower.warning.del({ id }).then(() => {
+        API.tcm.warning.del({ id }).then(() => {
             ElMessage.success("操作成功");
             refreshTable();
         });

+ 4 - 4
src/views/dataMock/tower/components/attendance.vue

@@ -1,5 +1,5 @@
 <template>
-    <scTable ref="xGridTable" batchDel :apiObj="$API.tower.attendance" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns">
+    <scTable ref="xGridTable" batchDel :apiObj="$API.tcm.attendance" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns">
         <template #default_imgText="{ row, column }">
             <template v-if="formatCertificate(row, column)">
                 <el-button type="primary" link @click="handlePreview(row, column)">{{ XEUtils.get(formatCertificate(row, column), "certificateNo") }}</el-button>
@@ -23,7 +23,7 @@ import API from "@/api";
 import TOOL from "@/utils/tool";
 import { mapFormItemSelect, mapFormItemDatePicker } from "@/components/scTable/helper";
 import { dataSource } from "@/utils/basicDic";
-import { folderKeyDic } from "@/views/dataMock/tower/main";
+import { folderKeyDic } from "@/views/dataMock/tcm/main";
 
 const formatCertificate = (row, { field }) => XEUtils.find(XEUtils.get(XEUtils.toStringJSON(XEUtils.get(row, "person.features")), "certificate", []), item => item.type == XEUtils.get(folderKeyDic, field));
 
@@ -39,7 +39,7 @@ const proConfig = reactive({
 
 const mountedConfig = reactive({
     api: {
-        key: "tower.mounted",
+        key: "tcm.mounted",
         query: {
             projectId: computed(() => formConfig.data.projectId),
             projectIdNot: 1
@@ -130,7 +130,7 @@ const table_del = ({ id }) => {
         confirmButtonText: "确定",
         cancelButtonText: "取消"
     }).then(() => {
-        API.tower.attendance.del({ id }).then(() => {
+        API.tcm.attendance.del({ id }).then(() => {
             ElMessage.success("操作成功");
             refreshTable();
         });

src/views/dataMock/ugliAi/components/index.js → src/views/dataMock/tcm/components/index.js


+ 3 - 3
src/views/dataMock/tower/components/record/detail.vue

@@ -94,7 +94,7 @@
 import XEUtils from "xe-utils";
 import API from "@/api";
 import TOOL from "@/utils/tool";
-import { valueFormatDic } from "@/views/dataMock/tower/main";
+import { valueFormatDic } from "@/views/dataMock/tcm/main";
 
 const $emit = defineEmits(["success", "closed"]);
 const props = defineProps({
@@ -144,7 +144,7 @@ const rules = reactive({
 const mounteds = ref([]);
 const filterMounteds = computed(() => form.value.projectId ? XEUtils.filter(mounteds.value, item => item.projectId == form.value.projectId) : []);
 const fetchMounted = async () => {
-    const res = await API.tower.mounted.get();
+    const res = await API.tcm.mounted.get();
     mounteds.value = res || [];
     if (props.projectId == 1) form.value.mountedId = XEUtils.get(XEUtils.find(res, item => item.projectId == 1), "id");
 }
@@ -176,7 +176,7 @@ const submit = () => {
             XEUtils.set(data, "features", XEUtils.toJSONString(features));
             
             isSaving.value = true;
-            API.tower.record[mode.value](data).then(() => {
+            API.tcm.record[mode.value](data).then(() => {
                 isSaving.value = false;
                 ElMessage.success("操作成功");
                 visible.value = false;

+ 3 - 3
src/views/dataMock/tower/components/record/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <scTable ref="xGridTable" batchDel :apiObj="$API.tower.record" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns" v-bind="props.options">
+    <scTable ref="xGridTable" batchDel :apiObj="$API.tcm.record" :formConfig="formConfig" :paramsColums="paramsColums" :toolbarConfig="toolbarConfig" :columns="columns" v-bind="props.options">
         <template #action="{ row }">
             <el-button type="primary" link @click="table_edit(row)">
                 <template #icon><sc-iconify icon="ant-design:edit-outlined"></sc-iconify></template>修改
@@ -50,7 +50,7 @@ const proConfig = reactive({
 const mountedConfig = reactive({
     visible,
     api: {
-        key: "tower.mounted",
+        key: "tcm.mounted",
         query: {
             projectId: computed(() => formConfig.data.projectId),
             projectIdNot: 1
@@ -157,7 +157,7 @@ const table_del = ({ id }) => {
         confirmButtonText: "确定",
         cancelButtonText: "取消"
     }).then(() => {
-        API.tower.record.del({ id }).then(() => {
+        API.tcm.record.del({ id }).then(() => {
             ElMessage.success("操作成功");
             refreshTable();
         });

src/views/dataMock/ugliAi/components/template.vue → src/views/dataMock/tcm/components/template.vue


+ 2 - 2
src/views/dataMock/tower/detail.vue

@@ -217,7 +217,7 @@ const mounteds = ref([]);
 const filterTargetM = computed(() => form.value.targetProjectId ? XEUtils.filter(mounteds.value, item => item.projectId == form.value.targetProjectId) : []);
 const filterSourceM = computed(() => form.value.sourceProjectId ? XEUtils.filter(mounteds.value, item => item.projectId == form.value.sourceProjectId) : []);
 const fetchMounted = async () => {
-    const res = await API.tower.mounted.get();
+    const res = await API.tcm.mounted.get();
     mounteds.value = res || [];
 }
 
@@ -262,7 +262,7 @@ const submit = key => {
             }
             
             isSaving.value = true;
-            API.tower.dataMock[apiKey.value][dataSouce.value](data).then(() => {
+            API.tcm.dataMock[apiKey.value][dataSouce.value](data).then(() => {
                 isSaving.value = false;
                 ElMessage.success("操作成功");
                 visible.value = false;

+ 1 - 1
src/views/dataMock/tower/index.vue

@@ -16,7 +16,7 @@
             <el-tab-pane label="考勤数据" name="tcm_person"></el-tab-pane>
         </el-tabs>
 
-        <component ref="componentRef" :is="allcomp[activeName]" m_apiKey="tower" :taskType="taskType" />
+        <component ref="componentRef" :is="allcomp[activeName]" :taskType="taskType" />
 	</el-container>
 
     <mock-detail v-if="dialog" ref="mockRef" @success="refreshState" @closed="dialog = false"></mock-detail>

src/views/dataMock/tower/main.js → src/views/dataMock/tcm/main.js