设备检修管理

package.json

@@ -15,7 +15,7 @@
         "js-base64": "^3.7.2",
         "js-cookie": "^3.0.1",
         "js-md5": "^0.7.3",
-        "js-web-screen-shot": "^1.7.8",
+        "js-web-screen-shot": "^1.7.9",
         "nprogress": "^0.2.0",
         "pinia": "^2.0.23",
         "remixicon": "^2.5.0",

src/App.vue

@@ -9,13 +9,13 @@ import {nextTick, ref, watch} from "vue";
 import {useAppStore} from "~src/store";
 import AppConfig from "~com/AppConfig/index.vue";
 import {setMainColor} from "~src/utils/tools";
+import {getObjValue, ulog} from "vue-utils-plus"
 import config from '~src/config/index';
 import {useOsTheme} from 'vooks'
 
 //初始变量
 const appStore = useAppStore()
 const UserTheme = ref(appStore.getTheme)
-const appColor = ref(appStore.getColor);
 
 //监听
 watch(() => [
@@ -24,32 +24,29 @@ watch(() => [
     appStore.getColor
 ], ([Theme,ThemeVal,ColorVal]) => {
     UserTheme.value = Theme
-    appColor.value = ColorVal
-    setUserTheme(ThemeVal)
+    setUserTheme(ThemeVal, ColorVal)
 })
 
 nextTick(()=> {
-    setUserTheme(appStore.getThemeVal)
-    //设置主色调
-    setMainColor(appColor.value?.color)
-    //打印开发版本号
-    console.log(
-        `%c 客户端 启动成功 %c 当前开发版本 V` + config.dev_version + `%c`,
-        'background:#0081ff; padding: 1px; border-radius: 3px 0 0 3px; color: #fff',
-        'background:#354855; padding: 1px 5px; border-radius: 0 3px 3px 0; color: #fff; font-weight: bold;',
-        'background:transparent'
-    )
+    setUserTheme(appStore.getThemeVal, appStore.getColor)
+    ulog('客户端 启动成功', '当前开发版本 v' + config?.dev_version)
 })
 
 //设置主题
-const setUserTheme = (theme) => {
-    let val = UserTheme.value, colorName = appColor.value?.name || 'green'
+const setUserTheme = (theme, appColor) => {
+    const colorVal = getObjValue(appColor)
+    //设置主色调
+    setMainColor(colorVal?.color)
+    const colorName = colorVal?.name || 'green'
+    //设置主题
+    let val = UserTheme.value
     if (val === 'auto') {
         theme = useOsTheme().value;
     }
     if (theme === '') {
         theme = val;
     }
+    //挂载相关样式
     document.documentElement.setAttribute('class',`${theme} color-${colorName}`)
 }
 </script>

src/components/AppConfig/index.vue

@@ -7,6 +7,7 @@
 <script setup>
 import { ElMessage, ElLoading, ElNotification,ElMessageBox } from 'element-plus'
 import zhCn from 'element-plus/es/locale/lang/zh-cn'
+import {HcLog} from '~uti/tools'
 
 // 将ui的函数挂载在windows对象上
 function registerElTools () {
@@ -14,6 +15,7 @@ function registerElTools () {
     window['$messageBox'] = ElMessageBox;
     window['$message'] = ElMessage;
     window['$notification'] = ElNotification;
+    window['$HcLog'] = HcLog;
 }
 
 registerElTools()

src/layout/index.vue

@@ -104,6 +104,7 @@ onMounted(() => {
     const info = useAppState.getProjectContract || []
     projectContractData(info);
     setIsCollapse(RoutesName.value)
+    useAppState.barMenuName = BarMenuTitle
 })
 
 //监听
@@ -125,6 +126,7 @@ watch(() => [
     isCollapse.value = collapse
     setIsCollapse(RoutesName.value)
     projectContractData(projectContractArr || []);
+    useAppState.barMenuName = RouteTitle ?? ''
 })
 
 //设置折叠

src/plugins/IsButtons.js

@@ -1,4 +1,4 @@
-import {useAppStore} from "~src/store/index";
+import {useAppStore} from "~src/store";
 const useAppState = useAppStore()
 
 //是否显示

src/store/index.js

@@ -32,6 +32,7 @@ export const useAppStore = defineStore('main', {
         fullScreen: getStoreData('fullScreen') || 0, //全屏截图：0关闭，1开启
         isCollapse: getStoreData('isCollapse') || false, //菜单折叠
         isScreenShort: false,
+        barMenuName: '',
     }),
     getters: {
         //主题信息

src/styles/view/login.scss

@@ -171,7 +171,7 @@
             left: 18px;
             font-size: 43px;
             font-weight: 400;
-            color: var(--el-color-primary);
+            color: $green;
         }
         .sign-list {
             position: relative;

src/utils/tools.js

@@ -1,5 +1,6 @@
-import {utilsTo} from "vue-utils-plus"
-const { toColor } = utilsTo()
+import {toColor, clog} from "vue-utils-plus"
+import {useAppStore} from "~src/store";
+const store = useAppStore()
 
 //设置主色调
 export const setMainColor = (color) => {
@@ -24,3 +25,9 @@ export const setMainColor = (color) => {
     const val = toColor('#000000', color , 0.9)
     el.style.setProperty('--el-color-primary-dark-2', val)
 }
+
+//控制台打印
+export const HcLog = (name, tips, data) => {
+    const title = store.barMenuName ?? '';
+    clog(name, tips, data, title)
+}

src/views/home/index.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script setup>
-import {ref,watch} from "vue";
+import {ref, watch} from "vue";
 import {useAppStore} from "~src/store";
 import SearchInput from '~com/home/SearchInput.vue'
 import ImgText3 from "~src/assets/view/text-3.png";

src/views/tentative/device/overhaul.vue

@@ -76,69 +76,40 @@
                             <el-option v-for="item in menus" :label="item.label" :value="item.key"/>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="检测项目">
+                    <el-form-item label="维修/检定日期">
                         <el-date-picker type="date" v-model="addEditFormModel.key2" class="block" value-format="YYYY-MM-DD" :clearable="false"/>
                     </el-form-item>
                 </div>
                 <div class="hc-form-item">
-                    <el-form-item class="flex-1" label="设备编号" style="margin-right: 24px;">
+                    <el-form-item label="设备编号">
                         <el-select v-model="addEditFormModel.key3" block>
                             <el-option label="1" value="1"/>
                             <el-option label="2" value="2"/>
                         </el-select>
                     </el-form-item>
-                    <div class="flex flex-1">
-                        <el-form-item class="flex-1" label="样品名称" style="margin-right: 0;">
-                            <el-select v-model="addEditFormModel.key4" block>
-                                <el-option label="名称1" value="1"/>
-                                <el-option label="名称2" value="2"/>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item class="w-32" no-label style="margin-left: 10px; flex: initial;">
-                            <el-input v-model="addEditFormModel.key5" block/>
-                        </el-form-item>
-                    </div>
-                </div>
-                <div class="hc-form-item">
-                    <el-form-item class="flex-1" label="设备名称" style="margin-right: 24px;">
-                        <el-select v-model="addEditFormModel.key6" block>
+                    <el-form-item label="设备名称">
+                        <el-select v-model="addEditFormModel.ke4" block>
                             <el-option label="名称1" value="1"/>
                             <el-option label="名称2" value="2"/>
                         </el-select>
                     </el-form-item>
-                    <div class="flex flex-1">
-                        <el-form-item class="flex-1" label="样品编号" style="margin-right: 0;">
-                            <el-select v-model="addEditFormModel.ke7" block>
-                                <el-option label="编号1" value="1"/>
-                                <el-option label="编号2" value="2"/>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item class="w-32" no-label style="margin-left: 10px; flex: initial;">
-                            <el-input v-model="addEditFormModel.key8" block/>
-                        </el-form-item>
-                    </div>
                 </div>
                 <div class="hc-form-item">
-                    <el-form-item label="使用日期(起)">
-                        <el-date-picker type="date" v-model="addEditFormModel.key9" class="block" value-format="YYYY-MM-DD" :clearable="false"/>
-                    </el-form-item>
-                    <el-form-item label="使用日期(止)" prop="key10">
-                        <el-date-picker type="date" v-model="addEditFormModel.key10" class="block" value-format="YYYY-MM-DD" :clearable="false"/>
-                    </el-form-item>
-                </div>
-                <div class="flex">
-                    <el-form-item class="flex-1" label="使用人员" style="margin-right: 16px;">
-                        <el-select v-model="addEditFormModel.ke11" block>
-                            <el-option label="人员1" value="1"/>
-                            <el-option label="人员2" value="2"/>
+                    <el-form-item label="维修/检定人">
+                        <el-select v-model="addEditFormModel.key5" block>
+                            <el-option label="1" value="1"/>
+                            <el-option label="2" value="2"/>
                         </el-select>
                     </el-form-item>
-                    <el-form-item class="flex-1" no-label style="margin-left: 5px;">
-                        <el-input v-model="addEditFormModel.key12" block/>
+                    <el-form-item no-label>
+                        <el-input v-model="addEditFormModel.key6" block/>
                     </el-form-item>
                 </div>
+                <el-form-item label="维修/检定内容">
+                    <el-input v-model="addEditFormModel.desc" type="textarea" :autosize="{ minRows: 3}"/>
+                </el-form-item>
                 <el-form-item label="备注">
-                    <el-input v-model="addEditFormModel.desc" type="textarea" placeholder="备注" :autosize="{ minRows: 3}"/>
+                    <el-input v-model="addEditFormModel.desc1" type="textarea" :autosize="{ minRows: 3}"/>
                 </el-form-item>
             </el-form>
         </HcDialog>
@@ -155,7 +126,6 @@
                 <HcTable ref="tableImportRef" :column="tableColumn" :datas="tableImportData" :loading="tableImportLoading" isCheck @selection-change="tableImportSelection"/>
             </div>
         </HcDialog>
-
     </div>
 </template>
 
@@ -180,7 +150,7 @@ watch(() => [
 
 //渲染完成
 onMounted(() => {
-
+    //window?.$HcLog('name','tips','data')
 })
 
 //左侧菜单

vite.config.js

@@ -23,7 +23,7 @@ export default defineConfig({
             '~com': `${resolve(__dirname, './src/components')}`,
             '~api': resolve(__dirname, './src/api/modules'),
             '~sto': resolve(__dirname, './src/store/modules'),
-            '~uti': resolve(__dirname, './src/utils/modules')
+            '~uti': resolve(__dirname, './src/utils')
         }
     },
     plugins: [

yarn.lock

@@ -862,10 +862,10 @@ js-md5@^0.7.3:
   resolved "https://registry.yarnpkg.com/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2"
   integrity sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==
 
-js-web-screen-shot@^1.7.8:
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/js-web-screen-shot/-/js-web-screen-shot-1.7.8.tgz#ff7e97e0c7ddc71a2028db7a337bb2e308f09767"
-  integrity sha512-zb7/lK+VLPk0VrRvpypFhgMK3nL/xAN3EOxKgKTSPEFVr/6xDZ7HG+fizCsmZZGiFT9zA+v/yW5VmGBl31r+5A==
+js-web-screen-shot@^1.7.9:
+  version "1.7.9"
+  resolved "https://registry.yarnpkg.com/js-web-screen-shot/-/js-web-screen-shot-1.7.9.tgz#6116446e87035f969624b10fce9574b6efa4e4b7"
+  integrity sha512-PSzBqx8Svuqic+4QE+fmKCZtG1jLDHf/qn0GEeK2OsJvZjP6aWM6/qSFCDDRYBnJR35kE6a9/zKQPKnQWsnFyg==
   dependencies:
     html2canvas "^1.0.0-rc.7"