Quellcode durchsuchen

改成数字工厂

hfxc226 vor 7 Monaten
Ursprung
Commit
3d58528d9f
49 geänderte Dateien mit 96 neuen und 90 gelöschten Zeilen
  1. 1 1
      README.md
  2. 1 1
      public/index.html
  3. 1 1
      public/tui-calendar/checkJobCalendar.html
  4. 1 1
      public/tui-calendar/checkJobCalendar2.html
  5. 1 1
      public/tui-calendar/example00-basic.html
  6. 1 1
      src/components/tools/Logo.vue
  7. 9 3
      src/components/tools/UserMenu.vue
  8. 1 1
      src/i18n/en.js
  9. 2 2
      src/router/generator-platform-routers.js
  10. 5 5
      src/utils/dict.js
  11. 1 1
      src/utils/domUtil.js
  12. 1 1
      src/views/fill/info/modules/PreviewForm.vue
  13. 2 2
      src/views/fill/task/modules/BaseForm.vue
  14. 1 1
      src/views/project/BaseForm.vue
  15. 1 1
      src/views/repair/application-form/modules/TicketForm copy.vue
  16. 1 1
      src/views/repair/application-form/modules/TicketForm.vue
  17. 1 1
      src/views/sb-position/SbPositionImg.vue
  18. 3 3
      src/views/sb/info/SbInfo.vue
  19. 1 1
      src/views/sb/info/SbInfoC.vue
  20. 1 1
      src/views/sb/info/SbInfoDebug.vue
  21. 1 1
      src/views/sb/info/SbInfoStandard.vue
  22. 1 1
      src/views/sb/info/SbInfoTestRun.vue
  23. 1 1
      src/views/sb/info/SpecialSbInfo2.vue
  24. 3 3
      src/views/sb/info/modules/BaseForm.vue
  25. 1 1
      src/views/sb/info/modules/BaseFormMeasure.vue
  26. 1 1
      src/views/sb/info/modules/BaseFormMeasureInStore.vue
  27. 1 1
      src/views/sb/info/modules/BaseFormMeasureInStoreBak.vue
  28. 1 1
      src/views/sb/info/modules/BaseFormMeasureRelation.vue
  29. 7 7
      src/views/sb/info/modules/BaseFormNew.vue
  30. 7 7
      src/views/sb/info/modules/Detail.vue
  31. 6 6
      src/views/sb/info/modules/DetailC.vue
  32. 1 1
      src/views/sb/info/modules/PrintInSbInfoBatch.vue
  33. 2 2
      src/views/sb/measure/MeasureSbInfo.vue
  34. 2 2
      src/views/sb/measure/modules/BaseForm.vue
  35. 2 2
      src/views/sb/measure/modules/Detail.vue
  36. 2 2
      src/views/sb/measure/modules/MeasureSbInfoSelectModal.vue
  37. 3 3
      src/views/sb/scrap/modules/BaseForm.vue
  38. 2 2
      src/views/sb/scrap/modules/Detail.vue
  39. 2 2
      src/views/sb/scrap/modules/DetailAuditScrap.vue
  40. 1 1
      src/views/sb/scrap/modules/PrintInForm.vue
  41. 1 1
      src/views/sb/storecheckjob/modules/StoreCheckJobTable2.vue
  42. 1 1
      src/views/sb/type/BaseForm.vue
  43. 1 1
      src/views/statisticView/DayStatistics.vue
  44. 1 1
      src/views/statisticView/MonthStatistics.vue
  45. 1 1
      src/views/statisticView/PlatformSystem.vue
  46. 1 1
      src/views/store/outstoreform/modules/TicketForm.vue
  47. 1 1
      src/views/tool/tool/modules/BaseFormMeasure.vue
  48. 4 4
      src/views/workplace/backlog/AssetsWorkplaceBacklog.vue
  49. 2 2
      src/views/workplace/backlog/Workbench.vue

+ 1 - 1
README.md

@@ -1,2 +1,2 @@
-# 时代思康-antd
+# 数字工厂-antd
 

+ 1 - 1
public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>logo.png">
-    <title>时代思康</title>
+    <title>数字工厂</title>
     <style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
     <!-- require cdn assets css -->
     <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>

+ 1 - 1
public/tui-calendar/checkJobCalendar.html

@@ -41,7 +41,7 @@
             </div>
         </div>
         <div class="lnb-footer">
-            © 时代思康.
+            © 数字工厂.
         </div>
     </div>
     <div id="right">

+ 1 - 1
public/tui-calendar/checkJobCalendar2.html

@@ -35,7 +35,7 @@
             </div>
         </div>
         <div class="lnb-footer">
-            © 时代思康.
+            © 数字工厂.
         </div>
     </div>
     <div id="right">

+ 1 - 1
public/tui-calendar/example00-basic.html

@@ -35,7 +35,7 @@
             </div>
         </div>
         <div class="lnb-footer">
-            © 时代思康.
+            © 数字工厂.
         </div>
     </div>
     <div id="right">

+ 1 - 1
src/components/tools/Logo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="logo">
     <router-link :to="{name:'dashboard'}">
-      <img src="~@/assets/logo.png" style="width:150px;height:40px" class="logo" alt="logo">
+<!--      <img src="~@/assets/logo.png" style="width:50px;height:40px" class="logo" alt="logo">-->
       <h1 v-if="showTitle">设备管理系统</h1>
     </router-link>
   </div>

+ 9 - 3
src/components/tools/UserMenu.vue

@@ -27,10 +27,12 @@
         </a-menu>
       </a-dropdown>-->
       <a style="margin-left: 8px;" @click="handleScreen(0)">电量管理</a>
-<!--      <a style="margin-left: 8px;" @click="handleScreen(1)">设备大屏</a>
+      <a style="margin-left: 8px;" @click="handleScreen(1)">设备大屏</a>
       <a style="margin-left: 8px;" @click="handleScreen(2)">详情大屏</a>
       <a style="margin-left: 8px;" @click="handleScreen(3)">维保大屏</a>
-      <a style="margin-left: 8px;" @click="handleScreen(4)">仓库大屏</a>-->
+      <a style="margin-left: 8px;" @click="handleScreen(4)">仓库大屏</a>
+      <a style="margin-left: 8px;" @click="handleScreen(5)">PC聊天</a>
+      <a style="margin-left: 8px;" @click="handleScreen(6)">移动聊天</a>
       <a-dropdown>
         <span class="action ant-dropdown-link user-dropdown-menu">
           <a-avatar class="avatar" size="small" :src="avatar"/>
@@ -93,11 +95,15 @@ export default {
       if (type === 0) {
         a.href = '/SwitchingRoomBigScreen'
       } else if (type === 1) {
-        a.href = '/InfoBigScreen'
+        a.href = 'https://www.boxim.online/#/home/chat'
       } else if (type === 2) {
         a.href = '/InfoDetailBigScreen'
       } else if (type === 3) {
         a.href = '/RepairBigScreen'
+      } else if (type === 5) {
+        a.href = 'https://www.boxim.online/#/home/chat'
+      } else if (type === 6) {
+        a.href = 'https://www.boxim.online/h5/#/pages/chat/chat'
       } else {
         a.href = '/StoreBigScreen'
       }

+ 1 - 1
src/i18n/en.js

@@ -2,7 +2,7 @@ export const m = {
   // common
   common: {
     language: 'change language',
-    welcome: '时代思康',
+    welcome: '数字工厂',
     login: 'Sign In',
     remember: 'Remember password',
     system_name: 'Equipment management system',

+ 2 - 2
src/router/generator-platform-routers.js

@@ -370,7 +370,7 @@ const constantRouterComponents = {
   'RepairScreen': () => import('@/views/big-screen/RepairScreen'), // 车间大屏
   // 工作台
   'SbInfoWorkplaceBacklog': () => import('@/views/workplace/backlog/SbInfoWorkplaceBacklog'), // 设备工作台
-  'AssetsWorkplaceBacklog': () => import('@/views/workplace/backlog/AssetsWorkplaceBacklog'), // 资产工作台
+  'AssetsWorkplaceBacklog': () => import('@/views/workplace/backlog/AssetsWorkplaceBacklog'), // 设备工作台
   // 自定义管理
   'CustomizeReport': () => import('@/views/customize/report/CustomizeReport'), // 自定义报表
   'CustomFieldTemplate': () => import('@/views/customize/fieldTemplate/CustomFieldTemplate'), // 自定义模板
@@ -433,7 +433,7 @@ const constantRouterComponents = {
   'InventoryList': () => import('@/views/purchase/inventory-list/InventoryList.vue'),
   'PurchaseOrderReportPie': () => import('@/views/purchase/purchase-order-report/PurchaseOrderReportPie.vue'),
   'PurchaseMargePage': () => import('@/views/purchase/purchase-marge-page/PurchaseMargePage.vue'),
-  // 资产闲置
+  // 设备闲置
   'IdleAssets': () => import('@/views/idle-assets/IdleAssets.vue'),
   'IdleAssetsMap': () => import('@/views/idle-assets-map/IdleAssetsMap.vue'),
   'SbPositionImg': () => import('@/views/sb-position/SbPositionImg.vue')

+ 5 - 5
src/utils/dict.js

@@ -105,7 +105,7 @@ DictCache.TYPE = {
   SB_IS_CHILD: 'SB_IS_CHILD', // 自定义类型
   SB_IS_SHOW: 'SB_IS_SHOW', // 自定义类型
   REMOTE_LINE: 'REMOTE_LINE', // 所属线路
-  SB_IS_FINANCING: 'SB_IS_FINANCING', // 是否固定资产
+  SB_IS_FINANCING: 'SB_IS_FINANCING', // 是否固定设备
   PRODUCER_AREA: 'PRODUCER_AREA', // 产地
   PART_LEVEL: 'PART_LEVEL', // 部位等级
   PART_STATUS: 'PART_STATUS', // 部位状态
@@ -128,7 +128,7 @@ DictCache.TYPE = {
   OUT_STORE_FORM_DEPT_CODE: 'OUT_STORE_FORM_DEPT_CODE', // 用友对应的部门code
   SBB: 'SBB', // 用友设备部下面对应的部门code
   DEPT_TYPE_LY: 'DEPT_TYPE_LY', // 龙岩思康新材料有限公司的部门code
-  DEPT_TYPE_SD: 'DEPT_TYPE_SD', // 时代思康新材料有限公司的部门code
+  DEPT_TYPE_SD: 'DEPT_TYPE_SD', // 数字工厂新材料有限公司的部门code
   SB_MEASURE_OTHER_TYPE: 'SB_MEASURE_OTHER_TYPE', // 操作类型
   FEE_FORM_TYPE: 'FEE_FORM_TYPE', // 成本归属
   OUT_STORE_FORM_STATUS: 'OUT_STORE_FORM_STATUS', // 出库状态
@@ -349,7 +349,7 @@ DictCache.TYPE = {
   ADD_SPARE_STATUS: 'ADD_SPARE_STATUS', // 存货推送状态
   SO_TYPE: 'SO_TYPE', // 需求跟踪方式,
   LONG_YAN_PURCHASE_DETAIL_STATUS: 'LONG_YAN_PURCHASE_DETAIL_STATUS',
-  // 资产闲置
+  // 设备闲置
   SB_UNUSED_STATUS: 'SB_UNUSED_STATUS'
 
 }
@@ -679,7 +679,7 @@ DictCache.VALUE = {
     IS_SHOWING: '1' // 显示
   },
   SB_IS_FINANCING: {
-    NOT: '0', // 否,不是固定资产
+    NOT: '0', // 否,不是固定设备
     YES: '1' // 是
   },
   /**
@@ -1864,7 +1864,7 @@ DictCache.COLOR = {
     5: 'success' // 已完结
   },
   /**
-   * 资产闲置
+   * 设备闲置
    */
   SB_UNUSED_STATUS: {
     1: 'processing', // 一审中

+ 1 - 1
src/utils/domUtil.js

@@ -16,4 +16,4 @@ export const setDocumentTitle = function (title) {
   }
 }
 
-export const domTitle = '时代思康'
+export const domTitle = '数字工厂'

+ 1 - 1
src/views/fill/info/modules/PreviewForm.vue

@@ -7,7 +7,7 @@
     @cancel="handleCancel"
   >
     <div style='text-align: center;'>
-      <h1>时代思康巡检记录填报</h1>
+      <h1>数字工厂巡检记录填报</h1>
     </div>
     <a-form :form="form">
       <row-list :col="1">

+ 2 - 2
src/views/fill/task/modules/BaseForm.vue

@@ -65,7 +65,7 @@
             已填报
           </a-radio-button>
         </a-radio-group>
-        <div style="text-align:center;padding-bottom:10px;font-size:32px;">时代思康巡检记录表</div>
+        <div style="text-align:center;padding-bottom:10px;font-size:32px;">数字工厂巡检记录表</div>
         <div v-show="!editor" style="display:flex; justify-content: space-between;">
           <div> 巡检开始时间:{{ model.createdTime }}</div>
           <div> 巡检要求时间:{{ model.requireHour }}小时</div>
@@ -154,7 +154,7 @@
       </div>
     </div>
     <div v-show="type===2">
-      <div style="text-align:center;padding-bottom:10px;font-size:32px;">时代思康仪表任务记录表</div>
+      <div style="text-align:center;padding-bottom:10px;font-size:32px;">数字工厂仪表任务记录表</div>
       <a-table
         :columns="columns"
         :data-source="updatesInfo"

+ 1 - 1
src/views/project/BaseForm.vue

@@ -64,7 +64,7 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="是否固定资产"
+            label="是否固定设备"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >

+ 1 - 1
src/views/repair/application-form/modules/TicketForm copy.vue

@@ -6,7 +6,7 @@
     </div>
     <div id="print-container2">
       <div class="title">
-        <div style="font-size:26px; "><span style="font-size:32px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">时代思康</span><span style="vertical-align: middle;">龙岩思康新材料有限公司</span></div>
+        <div style="font-size:26px; "><span style="font-size:32px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">数字工厂</span><span style="vertical-align: middle;">龙岩思康新材料有限公司</span></div>
         <div style="font-size:12px;font-weight:700; "><span style="font-size:14px;vertical-align: middle;letter-spacing:.1em;">CATL-SICONG</span><span style="vertical-align: middle;transform: scale(0.8);"> LONGYAN SICONG Advanced Materials Technology Limited</span></div>
         <div style="font-weight:700">检维修工作委托单(MSR)</div>
       </div>

+ 1 - 1
src/views/repair/application-form/modules/TicketForm.vue

@@ -9,7 +9,7 @@
     </div>
     <div id="print-container2">
       <div class="title">
-        <div style="font-size:20px; "><span style="font-size:26px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">时代思康</span><span style="vertical-align: middle;">龙岩思康新材料有限公司</span></div>
+        <div style="font-size:20px; "><span style="font-size:26px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">数字工厂</span><span style="vertical-align: middle;">龙岩思康新材料有限公司</span></div>
         <!-- <div style="font-size:12px;font-weight:700; "><span style="font-size:14px;vertical-align: middle;letter-spacing:.1em;">CATL-SICONG</span><span style="vertical-align: middle;transform: scale(0.8);"> LONGYAN SICONG Advanced Materials Technology Limited</span></div> -->
         <div style="font-weight:700">检维修工作委托单(MSR)</div>
       </div>

+ 1 - 1
src/views/sb-position/SbPositionImg.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card :bordered="false" class="card" :title="modalTitle">
-    <h1 style="margin:20px auto; text-align: center"> 资产分布地图 </h1>
+    <h1 style="margin:20px auto; text-align: center"> 设备分布地图 </h1>
     <a-card v-show="visible">
       <a-card-grid v-for="position in treeData" :key="position.id" style="cursor: pointer;width:25%;text-align:center" @click="showChild(position)">
         {{ position.title }}

+ 3 - 3
src/views/sb/info/SbInfo.vue

@@ -41,8 +41,8 @@
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24">
-                    <a-form-item label="资产编号">
-                      <a-input v-model.trim="queryParam.financingNo" placeholder="资产编号" />
+                    <a-form-item label="设备编号">
+                      <a-input v-model.trim="queryParam.financingNo" placeholder="设备编号" />
                     </a-form-item>
                   </a-col>
                   <!--                  <a-col :md="6" :sm="24">
@@ -531,7 +531,7 @@ export default {
           }
         }, */
         /* {
-          title: '资产编号',
+          title: '设备编号',
           dataIndex: 'financingNo',
           width: 120,
           checked: true

+ 1 - 1
src/views/sb/info/SbInfoC.vue

@@ -642,7 +642,7 @@ export default {
           }
         }, */
         /* {
-          title: '资产编号',
+          title: '设备编号',
           dataIndex: 'financingNo',
           width: 120,
           checked: true

+ 1 - 1
src/views/sb/info/SbInfoDebug.vue

@@ -319,7 +319,7 @@ export default {
         },
 
         {
-          title: '资产编号1',
+          title: '设备编号1',
           dataIndex: 'financingNo',
           width: 120,
           checked: true

+ 1 - 1
src/views/sb/info/SbInfoStandard.vue

@@ -332,7 +332,7 @@ export default {
         },
 
         {
-          title: '资产编号1',
+          title: '设备编号1',
           dataIndex: 'financingNo',
           width: 120,
           checked: true

+ 1 - 1
src/views/sb/info/SbInfoTestRun.vue

@@ -329,7 +329,7 @@ export default {
         },
 
         {
-          title: '资产编号1',
+          title: '设备编号1',
           dataIndex: 'financingNo',
           width: 120,
           checked: true

+ 1 - 1
src/views/sb/info/SpecialSbInfo2.vue

@@ -512,7 +512,7 @@ export default {
           }
         }, */
         /* {
-          title: '资产编号',
+          title: '设备编号',
           dataIndex: 'financingNo',
           width: 120,
           checked: true

+ 3 - 3
src/views/sb/info/modules/BaseForm.vue

@@ -72,7 +72,7 @@
       </a-row>
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item label="是否固定资产" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
+          <a-form-item label="是否固定设备" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
             <a-select v-decorator="['isFinancing', { rules: [{required: true, message: '是否显示不能为空'}]}]" placeholder="请选择">
               <a-select-option v-for="(label,value) in isFinancingMap" :key="value" :label="label" :value="parseInt(value)">{{ label }}
               </a-select-option>
@@ -538,7 +538,7 @@
           </a-form-item>
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
-          <a-form-item label="资产编号(财务编码)" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
+          <a-form-item label="设备编号(财务编码)" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
             <a-input v-decorator="['financingNo']" />
           </a-form-item>
         </a-col>
@@ -1352,7 +1352,7 @@ export default {
       const jbdh = getFieldValue('jbdh')
       const positionId = getFieldValue('positionId')
       if (positionId == null) {
-        this.$message.error('请先设置资产位置')
+        this.$message.error('请先设置设备位置')
       }
       this.$refs.pointModal.base({
         id: this.id,

+ 1 - 1
src/views/sb/info/modules/BaseFormMeasure.vue

@@ -16,7 +16,7 @@
     </a-row>
     <div>
       <div class="tables">
-        <div style="text-align:center;padding-bottom:10px;font-size:32px;">时代思康检定表</div>
+        <div style="text-align:center;padding-bottom:10px;font-size:32px;">数字工厂检定表</div>
         <div style="display:flex; justify-content: space-between;">
           <div> 检定人:{{ username }}</div>
         </div>

+ 1 - 1
src/views/sb/info/modules/BaseFormMeasureInStore.vue

@@ -10,7 +10,7 @@
     </a-row>
     <div>
       <div class="tables">
-        <div style="text-align:center;padding-bottom:10px;font-size:32px;">时代思康检定表</div>
+        <div style="text-align:center;padding-bottom:10px;font-size:32px;">数字工厂检定表</div>
         <div style="display:flex; justify-content: space-between;">
           <div> 检定人:{{ username }}</div>
         </div>

+ 1 - 1
src/views/sb/info/modules/BaseFormMeasureInStoreBak.vue

@@ -10,7 +10,7 @@
     </a-row>
     <div>
       <div class="tables">
-        <div style="text-align:center;padding-bottom:10px;font-size:32px;">时代思康检定表</div>
+        <div style="text-align:center;padding-bottom:10px;font-size:32px;">数字工厂检定表</div>
         <div style="display:flex; justify-content: space-between;">
           <div> 检定人:{{ username }}</div>
         </div>

+ 1 - 1
src/views/sb/info/modules/BaseFormMeasureRelation.vue

@@ -136,7 +136,7 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="是否固定资产"
+            label="是否固定设备"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >

+ 7 - 7
src/views/sb/info/modules/BaseFormNew.vue

@@ -68,7 +68,7 @@
             <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
               <a-col :lg="12" :md="24" :sm="24">
                 <a-form-item
-                  label="是否固定资产"
+                  label="是否固定设备"
                   :labelCol="BaseTool.Constant.labelCol"
                   :wrapperCol="BaseTool.Constant.wrapperCol"
                 >
@@ -461,13 +461,13 @@
       <a-form :form="form">
         <div class="base">
           <div class="title">
-            资产编号
+            设备编号
           </div>
           <div class="main">
             <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
               <a-col :lg="12" :md="24" :sm="24">
                 <a-form-item
-                  label="资产编号1"
+                  label="设备编号1"
                   :labelCol="BaseTool.Constant.labelCol"
                   :wrapperCol="BaseTool.Constant.wrapperCol"
                 >
@@ -477,7 +477,7 @@
               </a-col>
               <a-col :lg="12" :md="24" :sm="24">
                 <a-form-item
-                  label="资产编号1"
+                  label="设备编号1"
                   :labelCol="BaseTool.Constant.labelCol"
                   :wrapperCol="BaseTool.Constant.wrapperCol"
                 >
@@ -489,7 +489,7 @@
             <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
               <a-col :lg="12" :md="24" :sm="24">
                 <a-form-item
-                  label="资产编号3"
+                  label="设备编号3"
                   :labelCol="BaseTool.Constant.labelCol"
                   :wrapperCol="BaseTool.Constant.wrapperCol"
                 >
@@ -499,7 +499,7 @@
               </a-col>
               <a-col :lg="12" :md="24" :sm="24">
                 <a-form-item
-                  label="资产编号4"
+                  label="设备编号4"
                   :labelCol="BaseTool.Constant.labelCol"
                   :wrapperCol="BaseTool.Constant.wrapperCol"
                 >
@@ -511,7 +511,7 @@
             <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
               <a-col :lg="12" :md="24" :sm="24">
                 <a-form-item
-                  label="资产编号5"
+                  label="设备编号5"
                   :labelCol="BaseTool.Constant.labelCol"
                   :wrapperCol="BaseTool.Constant.wrapperCol"
                 >

+ 7 - 7
src/views/sb/info/modules/Detail.vue

@@ -140,7 +140,7 @@
               <a-descriptions-item label="设备编号">
                 {{ model.no }}
               </a-descriptions-item>
-              <a-descriptions-item label="资产编号">{{ model.financingNo }}</a-descriptions-item>
+              <a-descriptions-item label="设备编号">{{ model.financingNo }}</a-descriptions-item>
               <a-descriptions-item label="设备位号">
                 {{ model.positionNo }}
               </a-descriptions-item>
@@ -207,13 +207,13 @@
           </a-card>
           <br>
           <!--          <a-card >
-            <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>资产编号</b></div>
+            <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>设备编号</b></div>
             <a-descriptions bordered :column="3">
-              <a-descriptions-item label="资产编号1">{{ model.financingNo }}</a-descriptions-item>
-              <a-descriptions-item label="资产编号2">{{ model.financingNoTwo }}</a-descriptions-item>
-              <a-descriptions-item label="资产编号3">{{ model.financingNoThird }}</a-descriptions-item>
-              <a-descriptions-item label="资产编号4">{{ model.financingNoFour }}</a-descriptions-item>
-              <a-descriptions-item label="资产编号5">{{ model.financingNoFive }}</a-descriptions-item>
+              <a-descriptions-item label="设备编号1">{{ model.financingNo }}</a-descriptions-item>
+              <a-descriptions-item label="设备编号2">{{ model.financingNoTwo }}</a-descriptions-item>
+              <a-descriptions-item label="设备编号3">{{ model.financingNoThird }}</a-descriptions-item>
+              <a-descriptions-item label="设备编号4">{{ model.financingNoFour }}</a-descriptions-item>
+              <a-descriptions-item label="设备编号5">{{ model.financingNoFive }}</a-descriptions-item>
             </a-descriptions>
           </a-card>
           <br>-->

+ 6 - 6
src/views/sb/info/modules/DetailC.vue

@@ -128,13 +128,13 @@
           </a-card>
           <br>
           <a-card >
-            <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>资产编号</b></div>
+            <div style="margin:0; padding:15px 30px; background:#EFEFFB;font-size:16px; color: #1890ff"><b>设备编号</b></div>
             <a-descriptions bordered :column="3">
-              <a-descriptions-item label="资产编号1">{{ model.financingNo }}</a-descriptions-item>
-              <a-descriptions-item label="资产编号2">{{ model.financingNoTwo }}</a-descriptions-item>
-              <a-descriptions-item label="资产编号3">{{ model.financingNoThird }}</a-descriptions-item>
-              <a-descriptions-item label="资产编号4">{{ model.financingNoFour }}</a-descriptions-item>
-              <a-descriptions-item label="资产编号5">{{ model.financingNoFive }}</a-descriptions-item>
+              <a-descriptions-item label="设备编号1">{{ model.financingNo }}</a-descriptions-item>
+              <a-descriptions-item label="设备编号2">{{ model.financingNoTwo }}</a-descriptions-item>
+              <a-descriptions-item label="设备编号3">{{ model.financingNoThird }}</a-descriptions-item>
+              <a-descriptions-item label="设备编号4">{{ model.financingNoFour }}</a-descriptions-item>
+              <a-descriptions-item label="设备编号5">{{ model.financingNoFive }}</a-descriptions-item>
             </a-descriptions>
           </a-card>
           <br>

+ 1 - 1
src/views/sb/info/modules/PrintInSbInfoBatch.vue

@@ -79,7 +79,7 @@
             <td class="text-center">{{ BaseTool.Object.getField(levelMap,record.level) }}</td>
           </tr>
           <tr>
-            <td class="text-center" width="17%">资产编号</td>
+            <td class="text-center" width="17%">设备编号</td>
             <td class="text-center">{{ record.financingNo }}</td>
           </tr>
         </tbody>

+ 2 - 2
src/views/sb/measure/MeasureSbInfo.vue

@@ -344,7 +344,7 @@ export default {
           checked: true
         },
         {
-          title: '是否固定资产',
+          title: '是否固定设备',
           dataIndex: 'isFinancing',
           width: 150,
           checked: true,
@@ -357,7 +357,7 @@ export default {
           }
         },
         {
-          title: '固定资产编号',
+          title: '固定设备编号',
           dataIndex: 'financingNo',
           width: 150,
           checked: true

+ 2 - 2
src/views/sb/measure/modules/BaseForm.vue

@@ -144,7 +144,7 @@
 
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="是否固定资产"
+            label="是否固定设备"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -161,7 +161,7 @@
 
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="固定资产编号"
+            label="固定设备编号"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >

+ 2 - 2
src/views/sb/measure/modules/Detail.vue

@@ -31,8 +31,8 @@
         <detail-list-item term="是否周检查">{{ model.color }}</detail-list-item>
         <detail-list-item term="检定证书编号">{{ model.sbdh }}</detail-list-item>
         <detail-list-item term="预警天数">{{ model.seatNumber }}</detail-list-item>
-        <detail-list-item term="是否固定资产">{{ model.isFinancing }}</detail-list-item>
-        <detail-list-item term="资产编号">{{ model.financingNo }}</detail-list-item>
+        <detail-list-item term="是否固定设备">{{ model.isFinancing }}</detail-list-item>
+        <detail-list-item term="设备编号">{{ model.financingNo }}</detail-list-item>
         <detail-list-item term="管理状态">{{ BaseTool.Object.getField(statusMap,model.status) }}</detail-list-item>
         <detail-list-item term="检定校准记录">{{ model.zbh }}</detail-list-item>
         <detail-list-item term="备注">{{ model.remark }}</detail-list-item>

+ 2 - 2
src/views/sb/measure/modules/MeasureSbInfoSelectModal.vue

@@ -246,7 +246,7 @@ export default {
           checked: true
         },
         {
-          title: '是否固定资产',
+          title: '是否固定设备',
           dataIndex: 'isFinancing',
           width: 150,
           checked: true,
@@ -259,7 +259,7 @@ export default {
           }
         },
         {
-          title: '固定资产编号',
+          title: '固定设备编号',
           dataIndex: 'financingNo',
           width: 150,
           checked: true

+ 3 - 3
src/views/sb/scrap/modules/BaseForm.vue

@@ -246,12 +246,12 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="资产现状说明"
+            label="设备现状说明"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              v-decorator="['remark', {rules: [{required: false, message: '资产现状说明不能为空'}]}]" />
+              v-decorator="['remark', {rules: [{required: false, message: '设备现状说明不能为空'}]}]" />
           </a-form-item>
         </a-col>
       </a-row>
@@ -286,7 +286,7 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="资产图片"
+            label="设备图片"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >

+ 2 - 2
src/views/sb/scrap/modules/Detail.vue

@@ -34,14 +34,14 @@
         <detail-list-item term="财务编码">{{ model.financingNo }}</detail-list-item>
         <detail-list-item term="卡片编号">{{ model.cardNo }}</detail-list-item>
         <detail-list-item term="车牌号">{{ model.cph }}</detail-list-item>
-        <detail-list-item term="资产现状说明">{{ model.remark }}</detail-list-item>
+        <detail-list-item term="设备现状说明">{{ model.remark }}</detail-list-item>
         <detail-list-item term="使用公司">{{ model.useCompanyName }}</detail-list-item>
         <detail-list-item term="使用项目部">{{ model.useProjectName }}</detail-list-item>
         <detail-list-item term="购置日期">{{ model.buyDate }}</detail-list-item>
         <detail-list-item term="投用日期">{{ model.startDate }}</detail-list-item>
         <detail-list-item term="状态"><badge :status="DictCache.COLOR.SB_INFO_STATUS[model.status]" :text="statusMap[model.status]"></badge></detail-list-item>
       </detail-list>
-      <title-divider title="资产图片" width="90px"></title-divider>
+      <title-divider title="设备图片" width="90px"></title-divider>
       <detail-list title="" :col="6">
         <detail-list-item v-show="model.sbFileList!=null && model.sbFileList.length>0">
           <a-upload

+ 2 - 2
src/views/sb/scrap/modules/DetailAuditScrap.vue

@@ -33,14 +33,14 @@
         <detail-list-item term="财务编码">{{ model.financingNo }}</detail-list-item>
         <detail-list-item term="卡片编号">{{ model.cardNo }}</detail-list-item>
         <detail-list-item term="车牌号">{{ model.cph }}</detail-list-item>
-        <detail-list-item term="资产现状说明">{{ model.remark }}</detail-list-item>
+        <detail-list-item term="设备现状说明">{{ model.remark }}</detail-list-item>
         <detail-list-item term="使用公司">{{ model.useCompanyName }}</detail-list-item>
         <detail-list-item term="使用项目部">{{ model.useProjectName }}</detail-list-item>
         <detail-list-item term="购置日期">{{ model.buyDate }}</detail-list-item>
         <detail-list-item term="投用日期">{{ model.startDate }}</detail-list-item>
         <detail-list-item term="状态"><badge :status="DictCache.COLOR.SB_INFO_STATUS[model.status]" :text="statusMap[model.status]"></badge></detail-list-item>
       </detail-list>
-      <title-divider title="资产图片" width="90px"></title-divider>
+      <title-divider title="设备图片" width="90px"></title-divider>
       <detail-list title="" :col="6">
         <detail-list-item v-show="model.sbFileList!=null && model.sbFileList.length>0">
           <a-upload

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
src/views/sb/scrap/modules/PrintInForm.vue


+ 1 - 1
src/views/sb/storecheckjob/modules/StoreCheckJobTable2.vue

@@ -108,7 +108,7 @@ export default {
           dataIndex: 'no'
         },
         {
-          title: '资产编号',
+          title: '设备编号',
           dataIndex: 'financingNo'
         },
         {

+ 1 - 1
src/views/sb/type/BaseForm.vue

@@ -64,7 +64,7 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="是否固定资产"
+            label="是否固定设备"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >

+ 1 - 1
src/views/statisticView/DayStatistics.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="view-container">
-    <div class="title"><span>时代思康用电量日报</span></div>
+    <div class="title"><span>数字工厂用电量日报</span></div>
     <div class="content">
       <div class="history">
         <span class="top-left"></span><span class="top-right"></span><span class="bottom-left"></span><span class="bottom-right"></span>

+ 1 - 1
src/views/statisticView/MonthStatistics.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="view-container">
-    <div class="title"><span>时代思康用电量月报</span></div>
+    <div class="title"><span>数字工厂用电量月报</span></div>
     <div class="content">
       <div class="history">
         <span class="top-left"></span><span class="top-right"></span><span class="bottom-left"></span><span class="bottom-right"></span>

+ 1 - 1
src/views/statisticView/PlatformSystem.vue

@@ -7,7 +7,7 @@
         <div class="opt">标题222</div>
         <div>标题222</div>
       </div>
-      <div class="header-center">时代思康展示平台系统</div>
+      <div class="header-center">数字工厂展示平台系统</div>
       <div class="header-opt">
         <div>标题222</div>
         <div>标题222</div>

+ 1 - 1
src/views/store/outstoreform/modules/TicketForm.vue

@@ -6,7 +6,7 @@
     </div>
     <div id="print-container2">
       <div class="title">
-        <div style="font-size:26px;"><span style="font-size:30px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">时代思康新材料有限公司</span></div>
+        <div style="font-size:26px;"><span style="font-size:30px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">数字工厂新材料有限公司</span></div>
         <div style="font-size:26px;font-weight:700">{{ type? BaseTool.Object.getField(typeMap,model.type):'材料退库' }}</div>
       </div>
       <div style="display:flex;justify-content:space-between; margin: 10px auto;width: 1030px;">

+ 1 - 1
src/views/tool/tool/modules/BaseFormMeasure.vue

@@ -10,7 +10,7 @@
     </a-row>
     <div>
       <div class="tables">
-        <div style="text-align:center;padding-bottom:10px;font-size:32px;">时代思康检定表</div>
+        <div style="text-align:center;padding-bottom:10px;font-size:32px;">数字工厂检定表</div>
         <div style="display:flex; justify-content: space-between;">
           <div> 检定人:{{ username }}</div>
         </div>

+ 4 - 4
src/views/workplace/backlog/AssetsWorkplaceBacklog.vue

@@ -9,7 +9,7 @@
                 <img src="@/assets/bgView/zong.png" width="63px" alt="">
               </div>
               <div>
-                <div>资产总数</div>
+                <div>设备总数</div>
                 <div>
                   <span>5</span>个
                 </div>
@@ -77,7 +77,7 @@
       </a-card>
     </a-col>
     <a-col :span="5">
-      <a-card title="资产地图">
+      <a-card title="设备地图">
         <div class="top-left hover" @click="$router.push('/sb/position/img')">
           <img src="@/assets/bgView/zidi.png" width="100%" height="100%" alt="">
         </div>
@@ -121,7 +121,7 @@
       </a-card>
     </a-col>
     <a-col :span="24">
-      <a-card title="资产类型分布">
+      <a-card title="设备类型分布">
         <div slot="extra">
           <a-radio-group default-value="a" button-style="solid">
             <a-radio-button value="a">
@@ -202,7 +202,7 @@ export default {
         },
         series: [
           {
-            name: '资产总数',
+            name: '设备总数',
             type: 'bar',
             barWidth: 20,
             data: [10, 52, 200, 334, 390, 330, 220, 150, 82, 91, 34, 290],

+ 2 - 2
src/views/workplace/backlog/Workbench.vue

@@ -146,7 +146,7 @@
             <a-icon type="appstore" />&nbsp;筹建管理
           </a-col>
           <a-col :span="6" class="menu btn">
-            <a-icon type="appstore" />&nbsp;资产管理
+            <a-icon type="appstore" />&nbsp;设备管理
           </a-col>
           <a-col :span="6" class="menu btn">
             <a-icon type="appstore" />&nbsp;报表管理
@@ -221,7 +221,7 @@ export default {
           value: 'xinhaoNum'
         },
         {
-          title: '待完善资产编码设备数量',
+          title: '待完善设备编码设备数量',
           value: 'financingNoNum'
         },
         {

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.