lisy 2 недель назад
Родитель
Сommit
9dbdd20b48

+ 9 - 1
pnpm-lock.yaml

@@ -65,6 +65,9 @@ importers:
       dayjs:
       dayjs:
         specifier: ^1.11.13
         specifier: ^1.11.13
         version: 1.11.19
         version: 1.11.19
+      number-precision:
+        specifier: ^1.6.0
+        version: 1.6.0
       pinia:
       pinia:
         specifier: ^2.0.36
         specifier: ^2.0.36
         version: 2.3.1(typescript@4.9.5)(vue@3.5.26(typescript@4.9.5))
         version: 2.3.1(typescript@4.9.5)(vue@3.5.26(typescript@4.9.5))
@@ -3068,7 +3071,7 @@ packages:
 
 
   glob@7.2.3:
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    deprecated: Glob versions prior to v9 are no longer supported
+    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
 
 
   global@4.4.0:
   global@4.4.0:
     resolution: {integrity: sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==}
     resolution: {integrity: sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==}
@@ -3701,6 +3704,9 @@ packages:
     resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
     resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
     engines: {node: '>=8'}
     engines: {node: '>=8'}
 
 
+  number-precision@1.6.0:
+    resolution: {integrity: sha512-05OLPgbgmnixJw+VvEh18yNPUo3iyp4BEWJcrLu4X9W05KmMifN7Mu5exYvQXqxxeNWhvIF+j3Rij+HmddM/hQ==}
+
   nwsapi@2.2.23:
   nwsapi@2.2.23:
     resolution: {integrity: sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==}
     resolution: {integrity: sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==}
 
 
@@ -9527,6 +9533,8 @@ snapshots:
     dependencies:
     dependencies:
       path-key: 3.1.1
       path-key: 3.1.1
 
 
+  number-precision@1.6.0: {}
+
   nwsapi@2.2.23: {}
   nwsapi@2.2.23: {}
 
 
   object-inspect@1.13.4: {}
   object-inspect@1.13.4: {}

+ 6 - 1
src/pages/plant/processing/index.vue

@@ -1,7 +1,9 @@
 <template>
 <template>
     <z-paging ref="paging" bgColor="#F7F7F7">
     <z-paging ref="paging" bgColor="#F7F7F7">
         <template #top>
         <template #top>
-            <up-navbar title="加工及包装赋码任务" :fixed="false" :isLeftBack="false" :breadcrumb="false"> </up-navbar>
+            <ut-navbar title="加工及包装赋码任务" :fixed="false" :breadcrumb="false">
+                <template #left> </template>
+            </ut-navbar>
         </template>
         </template>
         <view class="base-content pd-20">
         <view class="base-content pd-20">
             <view class="bg-#fff d-flex a-c j-c radius-16 pd2-30-24 mb-20" @click="$u.route({ url: '/plant/processing/processing-index/index' })">
             <view class="bg-#fff d-flex a-c j-c radius-16 pd2-30-24 mb-20" @click="$u.route({ url: '/plant/processing/processing-index/index' })">
@@ -21,6 +23,9 @@
                 <up-icon name="arrow-right"></up-icon>
                 <up-icon name="arrow-right"></up-icon>
             </view>
             </view>
         </view>
         </view>
+        <template #bottom>
+            <ut-tabar activeTab="processing"></ut-tabar>
+        </template>
     </z-paging>
     </z-paging>
 </template>
 </template>
 <script setup lang="ts"></script>
 <script setup lang="ts"></script>

+ 2 - 2
src/plant/processing/processing-index/index.vue

@@ -97,10 +97,10 @@
         <view class="" v-for="item in pt_process_type" :key="item?.value">
         <view class="" v-for="item in pt_process_type" :key="item?.value">
             <view style="border: 1rpx solid" :style="{ backgroundColor: item?.value == basetype ? '#EBF6EE' : '#f7f7f7', borderColor: item?.value == basetype ? '#37A954' : 'transparent' }" class="pr-30 d-flex a-c mb-20 radius-100" @click="handlechose(item.value)">
             <view style="border: 1rpx solid" :style="{ backgroundColor: item?.value == basetype ? '#EBF6EE' : '#f7f7f7', borderColor: item?.value == basetype ? '#37A954' : 'transparent' }" class="pr-30 d-flex a-c mb-20 radius-100" @click="handlechose(item.value)">
                 <view class="radius-50% mg-8 bg-#F0F0F0" v-if="item?.value == '1'">
                 <view class="radius-50% mg-8 bg-#F0F0F0" v-if="item?.value == '1'">
-                    <up-avatar size="90rpx" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/port/processType_plant.png"></up-avatar>
+                    <up-avatar size="90rpx" src="/static/images/plant/processing/processType_initial.png"></up-avatar>
                 </view>
                 </view>
                 <view class="radius-50% mg-8 bg-#F0F0F0" v-if="item?.value == '2'">
                 <view class="radius-50% mg-8 bg-#F0F0F0" v-if="item?.value == '2'">
-                    <up-avatar size="90rpx" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/port/processType_breeding.png"></up-avatar>
+                    <up-avatar size="90rpx" src="/static/images/plant/processing/processType_fresh.png"></up-avatar>
                 </view>
                 </view>
                 <view class="c-#333 f-s-34">
                 <view class="c-#333 f-s-34">
                     {{ item?.label }}
                     {{ item?.label }}

BIN
src/static/images/plant/processing/processType_fresh.png


BIN
src/static/images/plant/processing/processType_initial.png