Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

main/.env.development

@@ -16,6 +16,6 @@ VITE_APP_UPLOAD_API = '/uploadApis'
 # VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
 # VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
 # 内网接口地址
-VITE_APP_BASE_URL = 'http://192.168.18.74:8080'
+VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
 VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080'
 # VITE_APP_VIST_URL = 'http://192.168.18.99'

sub-government-affairs-service/.env.development

@@ -13,5 +13,5 @@ VITE_APP_UPLOAD_API = '/uploadApis'
 # VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
 
 # 内网接口地址
-VITE_APP_BASE_URL = 'http://192.168.18.74:8080'
+VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
 VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080'

sub-government-affairs-service/src/store/modules/coop.js

@@ -0,0 +1,15 @@
+import { defineStore } from 'pinia';
+import { getEnterList } from '@/apis/businessEntity';
+
+export const useCoop = defineStore('useCoop', {
+  state: () => ({
+    data: {},
+  }),
+  actions: {
+    //订单
+    getData(params) {
+      return Promise.resolve((useCoop().$state.data = params));
+    },
+  },
+  getters: {},
+});

sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBasicInfo.vue

@@ -32,6 +32,7 @@
       <el-col :span="12">
         <el-form-item label="地址">
           <area-select v-model="localForm.addressArr" :disabled="readonly" :label="null" />
+          <!-- <el-cascader v-model="localForm.addressArr" :options="options" @change="handleChange" /> -->
         </el-form-item>
         <el-form-item label="经营产品">
           <el-input v-model="localForm.primaryProduct" placeholder="请输入" />
@@ -72,6 +73,8 @@ import cloneDeep from 'lodash/cloneDeep';
 import { CommonUpload } from '@/apis/index';
 import { ElMessage } from 'element-plus';
 import Attrs from './Attrs.vue';
+import { useCoop } from '../../../../store/modules/coop';
+const localForm = useCoop().$state.data;
 
 const props = defineProps({
   modelValue: {
@@ -79,7 +82,7 @@ const props = defineProps({
     required: true,
     default: () => ({}),
   },
-  readonly: Boolean,
+  // readonly: Boolean,
 });
 
 const ossUrl = 'http://gov-cloud.oss-cn-chengdu.aliyuncs.com/';
@@ -89,16 +92,16 @@ const businessLicenceList = ref([]);
 const emit = defineEmits(['update:modelValue']);
 
 // 建立本地副本，避免直接修改 props
-const localForm = ref({ ...props.modelValue });
+// const localForm = ref({ ...props.modelValue });
 
 // 深度监听本地副本的变化，实时更新父组件
-watch(
+// watch(
-  localForm,
+//   localForm,
-  (newVal) => {
+//   (newVal) => {
-    emit('update:modelValue', { ...newVal });
+//     emit('update:modelValue', { ...newVal });
-  },
+//   },
-  { deep: true }
+//   { deep: true }
-);
+// );
 // watch(
 //   () => props.modelValue,
 //   (newVal) => {
@@ -151,21 +154,21 @@ const handleExceed = () => {
 };
 
 // 初始化时如果有图片，设置预览
-if (localForm.value.cooperativePhoto) {
+if (localForm.cooperativePhoto) {
   cooperativePhotoList.value = [
     {
       name: '合作社照片',
-      url: ossUrl + localForm.value.cooperativePhoto,
+      url: ossUrl + localForm.cooperativePhoto,
       status: 'success',
     },
   ];
 }
 
-if (localForm.value.businessLicence) {
+if (localForm.businessLicence) {
   businessLicenceList.value = [
     {
       name: '营业执照',
-      url: ossUrl + localForm.value.businessLicence,
+      url: ossUrl + localForm.businessLicence,
       status: 'success',
     },
   ];

sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabBusinessInfo.vue

@@ -71,6 +71,8 @@
 import { reactive, watch } from 'vue';
 import { Plus } from '@element-plus/icons-vue';
 import cloneDeep from 'lodash/cloneDeep';
+import { useCoop } from '../../../../store/modules/coop';
+const localForm = useCoop().$state.data;
 
 const props = defineProps({
   modelValue: {
@@ -86,23 +88,23 @@ const props = defineProps({
 const emit = defineEmits(['update:modelValue']);
 
 // 本地副本，存放各表的文件列表
-const localForm = reactive(cloneDeep(props.modelValue));
+// const localForm = reactive(cloneDeep(props.modelValue));
 
 // watch 同步回父组件
-watch(
+// watch(
-  () => localForm,
+//   () => localForm,
-  (val) => {
+//   (val) => {
-    emit('update:modelValue', { ...val });
+//     emit('update:modelValue', { ...val });
-  },
+//   },
-  { deep: true }
+//   { deep: true }
-);
+// );
-watch(
+// watch(
-  () => props.modelValue,
+//   () => props.modelValue,
-  (newVal) => {
+//   (newVal) => {
-    Object.assign(localForm, cloneDeep(newVal));
+//     Object.assign(localForm, cloneDeep(newVal));
-  },
+//   },
-  { deep: true }
+//   { deep: true }
-);
+// );
 
 // 下载模板（可替换为真实下载地址）
 function downloadTemplate(type) {

sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabCreditEvaluation.vue

@@ -28,6 +28,8 @@
 <script setup>
 import { reactive, watch } from 'vue';
 import cloneDeep from 'lodash/cloneDeep';
+import { useCoop } from '../../../../store/modules/coop';
+const localForm = useCoop().$state.data;
 
 const props = defineProps({
   modelValue: {
@@ -40,22 +42,22 @@ const props = defineProps({
 
 const emit = defineEmits(['update:modelValue']);
 
-const localForm = reactive(cloneDeep(props.modelValue));
+// const localForm = reactive(cloneDeep(props.modelValue));
 
-watch(
+// watch(
-  localForm,
+//   localForm,
-  (newVal) => {
+//   (newVal) => {
-    emit('update:modelValue', { ...newVal });
+//     emit('update:modelValue', { ...newVal });
-  },
+//   },
-  { deep: true }
+//   { deep: true }
-);
+// );
-watch(
+// watch(
-  () => props.modelValue,
+//   () => props.modelValue,
-  (newVal) => {
+//   (newVal) => {
-    Object.assign(localForm, cloneDeep(newVal));
+//     Object.assign(localForm, cloneDeep(newVal));
-  },
+//   },
-  { deep: true }
+//   { deep: true }
-);
+// );
 </script>
 <style scoped lang="scss">
 .credit-evaluation {

sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabMember.vue

@@ -105,6 +105,8 @@ import { ref, reactive, watch, onMounted, computed } from 'vue';
 import { CRUD_OPTIONS } from '@/config';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { getMemberList, addMember, updateMember, deleteMembers } from '@/apis/businessEntity';
+import { useCoop } from '../../../../store/modules/coop';
+const defaultFormData = useCoop().$state.data;
 
 const dialogTitle = ref('新增');
 const dialogVisible = ref(false);
@@ -124,31 +126,31 @@ const searchForm = ref({
 });
 const crudData = ref([]);
 // 定义默认表单数据
-const defaultFormData = {
+// const defaultFormData = {
-  id: '',
+//   id: '',
-  entId: '',
+//   entId: '',
-  name: '',
+//   name: '',
-  idType: '101',
+//   idType: '101',
-  idCard: '',
+//   idCard: '',
-  sex: '1',
+//   sex: '1',
-  age: '',
+//   age: '',
-  phone: '',
+//   phone: '',
-  provinceCode: '', // 省
+//   provinceCode: '', // 省
-  cityCode: '', // 市
+//   cityCode: '', // 市
-  countyCode: '', // 区县
+//   countyCode: '', // 区县
-  townCode: '', // 镇
+//   townCode: '', // 镇
-  street: '', // 村
+//   street: '', // 村
-  addressArr: [],
+//   addressArr: [],
-  detailAddress: '',
+//   detailAddress: '',
-  area: '',
+//   area: '',
-  planCrop: '',
+//   planCrop: '',
-  planCropName: '',
+//   planCropName: '',
-  address: '',
+//   address: '',
-  createTime: '',
+//   createTime: '',
-  createUser: '',
+//   createUser: '',
-  updateTime: '',
+//   updateTime: '',
-  updateUser: '',
+//   updateUser: '',
-};
+// };
 // 新增表单数据，使用默认数据初始化
 const formData = ref({ ...defaultFormData });
 const resetForm = () => {
@@ -264,18 +266,18 @@ const handleSave = async () => {
   }
 };
 
-watch(
+// watch(
-  () => formData.value.addressArr,
+//   () => formData.value.addressArr,
-  (newValue) => {
+//   (newValue) => {
-    if (newValue.length <= 3) {
+//     if (newValue.length <= 3) {
-      formData.value.provinceCode = '530000';
+//       formData.value.provinceCode = '530000';
-      formData.value.cityCode = '530900';
+//       formData.value.cityCode = '530900';
-      formData.value.countyCode = newValue[0];
+//       formData.value.countyCode = newValue[0];
-      formData.value.townCode = newValue[1];
+//       formData.value.townCode = newValue[1];
-      formData.value.street = newValue[2];
+//       formData.value.street = newValue[2];
-    }
+//     }
-  }
+//   }
-);
+// );
 const handleAdd = () => {
   isReadonly.value = false; // 设置为可编辑模式
   resetForm();

sub-government-affairs-service/src/views/productOperateMain/coOp/components/TabRegister.vue

@@ -73,6 +73,8 @@
 <script setup>
 import { reactive, watch } from 'vue';
 import cloneDeep from 'lodash/cloneDeep';
+import { useCoop } from '../../../../store/modules/coop';
+const localForm = useCoop().$state.data;
 
 const props = defineProps({
   modelValue: {
@@ -86,23 +88,23 @@ const props = defineProps({
 const emit = defineEmits(['update:modelValue']);
 
 // 创建本地副本（为了避免直接修改 props）
-const localForm = reactive(cloneDeep(props.modelValue));
+// const localForm = reactive(cloneDeep(props.modelValue));
 
 // 监听本地副本的变化，自动回传给父组件
-watch(
+// watch(
-  localForm,
+//   localForm,
-  (newVal) => {
+//   (newVal) => {
-    emit('update:modelValue', { ...newVal });
+//     emit('update:modelValue', { ...newVal });
-  },
+//   },
-  { deep: true }
+//   { deep: true }
-);
+// );
-watch(
+// watch(
-  () => props.modelValue,
+//   () => props.modelValue,
-  (newVal) => {
+//   (newVal) => {
-    Object.assign(localForm, cloneDeep(newVal));
+//     Object.assign(localForm, cloneDeep(newVal));
-  },
+//   },
-  { deep: true }
+//   { deep: true }
-);
+// );
 </script>
 
 <style scoped lang="scss">

sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue

@@ -58,6 +58,9 @@ import TabCreditEvaluation from './components/TabCreditEvaluation.vue';
 import TabMember from './components/TabMember.vue';
 import { getEnterList, getEnterById, addEnter, updateEnter, approvalEnter, deleteEnter } from '@/apis/businessEntity';
 import { cloneDeep } from 'lodash';
+import { useCoop } from '../../../store/modules/coop';
+
+const useCoopData = useCoop();
 
 // 控制弹窗显示
 const visible = ref(false);
@@ -128,6 +131,12 @@ const handleSubmit = async () => {
         getData(); // 刷新表格数据
       }
     } else if (dialogTitle.value === '编辑') {
+      formData.value.provinceCode = formData.value.addressArr[0];
+      formData.value.cityCode = formData.value.addressArr[1];
+      formData.value.countyCode = formData.value.addressArr[2];
+      formData.value.townCode = formData.value.addressArr[3];
+      formData.value.villageCode = formData.value.addressArr[4];
+
       response = await updateEnter(formData.value);
       if (response.code === 200) {
         ElMessage.success('编辑成功');
@@ -336,6 +345,7 @@ function handleTabChange(tab) {
 }
 
 const handleAdd = () => {
+  useCoopData.getData({});
   isReadonly.value = false;
   // resetForm();
   dialogTitle.value = '新增';
@@ -358,6 +368,10 @@ const handleView = async (row) => {
 
 // 编辑详情（可修改）
 const handleEdit = async (row) => {
+  console.log(row);
+  formData.value = row;
+  formData.value.addressArr = [row.provinceCode, row.cityCode, row.countyCode, row.townCode, row.villageCode];
+  useCoopData.getData(formData.value);
   loading.value = true;
   dialogTitle.value = '编辑';
   try {

sub-operation-service/src/apis/brand.js

@@ -39,6 +39,12 @@ export function authList(params) {
     params,
   });
 }
+export function usageList(params) {
+  return request('brand/applicationrecord/pageByGoodsStatus', {
+    method: 'GET',
+    params,
+  });
+}
 export function authDetail(id, params) {
   return request(`brand/brandbase/detail/${id}`, {
     method: 'GET',
@@ -51,6 +57,18 @@ export function getStatisticsData(id, params) {
     params,
   });
 }
+export function brandUsingSystem(params) {
+  return request('brand/brandUsingSystem/viewPage', {
+    method: 'GET',
+    params,
+  });
+}
+export function brandUsingSystemDetail(id, params) {
+  return request(`brand/brandUsingSystem/detail/${id}`, {
+    method: 'GET',
+    params,
+  });
+}
 
 export function saveRecords(data) {
   return request('brand/applicationrecord/save', {

sub-operation-service/src/router/index.js

@@ -502,6 +502,21 @@ export const constantRoutes = [
           },
         ],
       },
+      {
+        path: 'monitor',
+        component: BrandLayout,
+        meta: { title: '使用监管' },
+        name: 'authUse',
+        redirect: '/sub-operation-service/brand/monitor',
+        children: [
+          {
+            path: '',
+            component: () => import('@/views/brand/components/Monitor.vue'),
+            meta: { title: '使用监管', hideInBread: true },
+            name: 'brandMonitor',
+          },
+        ],
+      },
     ],
   },
 

sub-operation-service/src/views/brand/components/Auth.vue

@@ -62,7 +62,7 @@
       <div class="product-list">
         <div v-for="(product, index) in products" :key="product.id" class="product-item" :class="{ 'border-top': index > 0 }">
           <div class="product-info">
-            <img class="product-img" :src="product.goodsUrl" alt="product" />
+            <img class="product-img" :src="product.goodsUrl ? product.goodsUrl.split(',')[0] : ''" alt="product" />
             <div class="product-text">
               <span class="product-name">{{ product.productName }}</span>
               <div class="detail-item">
@@ -99,8 +99,8 @@
               >
                 授权证书
               </el-button>
-              <el-button size="large" class="button" @click="onInspect(product)">溯源报告</el-button>
+              <!--              <el-button size="large" class="button" @click="onInspect(product)">溯源报告</el-button>-->
-              <el-button v-if="product.status == 2" size="large" class="button" type="danger" @click="onRevoke(product)">取消授权</el-button>
+              <!--              <el-button v-if="product.status == 2" size="large" class="button" type="danger" @click="onRevoke(product)">取消授权</el-button>-->
             </div>
           </div>
         </div>

sub-operation-service/src/views/brand/components/BrandSystem.vue

@@ -4,24 +4,17 @@
 
     <!-- 制度列表 -->
     <div class="system-list">
-      <div v-for="(item, index) in filteredList" :key="index" class="system-card" @click="showDetail(item)">
+      <div v-for="(item, index) in systemList" :key="index" class="system-card" @click="showDetail(item)">
         <div class="card-header">
           <div class="card-title">
             <i class="el-icon-document"></i>
             {{ item.title }}
           </div>
-          <div class="card-meta">发布日期： {{ item.effectiveDate }}</div>
+          <div class="card-meta">发布日期： {{ item.createTime ? item.createTime.split(' ')[0] : '' }}</div>
-          <!--          <div class="card-meta">-->
-          <!--            <span>编号：{{ item.code }}</span>-->
-          <!--          </div>-->
         </div>
         <div class="card-content">
-          <p>{{ item.desc }}</p>
+          <p>{{ item.descStr }}</p>
         </div>
-        <!--        <div class="card-footer">-->
-        <!--          <span :class="`status-tag ${item.status === '生效中' ? 'active' : 'inactive'}`">{{ item.status }}</span>-->
-        <!--          <span>生效日期：{{ item.effectiveDate }}</span>-->
-        <!--        </div>-->
       </div>
     </div>
 
@@ -34,7 +27,7 @@
               <h3>{{ currentDetail.title }}</h3>
               <div class="dialog-meta">
                 <!--                <span>编号：{{ currentDetail.code }}</span>-->
-                <span :class="`status-tag ${currentDetail.status === '生效中' ? 'active' : 'inactive'}`">{{ currentDetail.status }}</span>
+                <!--                <span :class="`status-tag ${currentDetail.status === 1 ? 'active' : 'inactive'}`">{{ // currentDetail.status === 1 ? '' }}</span>-->
               </div>
             </div>
             <div class="dialog-actions">
@@ -45,7 +38,16 @@
           </div>
           <div class="dialog-content">
             <!-- 使用Markdown-it渲染的HTML内容 -->
-            <div class="doc-preview" v-html="currentDetail.content"></div>
+            <!--            <div class="doc-preview" v-html="currentDetail.content"></div>-->
+            <div class="doc-preview">
+              <iframe
+                v-if="currentDetail.files && currentDetail.files.length > 0"
+                :src="`https://view.officeapps.live.com/op/embed.aspx?src=${encodeURIComponent(currentDetail.files ? currentDetail.files[0].fileUrl : '')}`"
+                width="100%"
+                height="600px"
+                frameborder="0"
+              ></iframe>
+            </div>
           </div>
           <div class="dialog-footer">
             <div class="footer-info">
@@ -60,8 +62,10 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { ElMessage, ElButton } from 'element-plus';
+import { brandUsingSystem } from '@/apis/brand.js';
+import { brandUsingSystemDetail } from '../../../apis/brand.js';
 
 // 筛选类型
 const filterTypes = [
@@ -84,76 +88,7 @@ const systemList = ref([
     title: '《耿马县蔬菜公共品牌申请管理制度》',
     code: 'BRM-2023-001',
     desc: '包含品牌标识、使用规范、VI应用等内容的最新版本',
-    content: `\`<div style="font-family: 'Microsoft YaHei', sans-serif; line-height: 1; color: #333; max-width: 800px; margin: 0 auto; padding: 20px;">
+    content: '',
-  <div style="text-align: center; font-size: 22px; font-weight: bold; color: #2a5885; border-bottom: 2px solid #2a5885; padding-bottom: 10px;">
-    耿马县蔬菜公共品牌申请管理制度
-  </div>
-
-  <div style="font-size: 18px; font-weight: bold; margin: 5px 0 15px 0; color: #2a5885; border-bottom: 1px solid #eee; padding-bottom: 5px;">
-    第一章 总则
-  </div>
-
-  <div style="">
-    <span style="font-weight: bold; margin-right: 5px; color: #d35400;">第一条</span>
-    为规范"耿马蔬菜"（或其他确定的公共品牌名称）公共品牌的使用与管理，维护品牌形象，提升耿马县蔬菜产品的市场竞争力和附加值，促进蔬菜产业高质量发展，特制定本制度。
-  </div>
-
-  <div style="">
-    <span style="font-weight: bold; margin-right: 5px; color: #d35400;">第二条</span>
-    本制度所称"耿马蔬菜"公共品牌（以下简称"公共品牌"），是指经耿马县人民政府授权，由耿马县农业农村局（或其他指定主管部门）统一注册、管理和监督，代表耿马县特定区域、特定品质蔬菜产品的区域性公用品牌标识。
-  </div>
-
-  <div style="">
-    <span style="font-weight: bold; margin-right: 5px; color: #d35400;">第三条</span>
-    本制度适用于在耿马县行政区域内从事蔬菜生产、加工、经营，自愿申请使用公共品牌的企业、农民专业合作社、家庭农场等主体（以下简称"申请人"）。
-  </div>
-
-  <div style="">
-    <span style="font-weight: bold; margin-right: 5px; color: #d35400;">第四条</span>
-    耿马县农业农村局是公共品牌的主管部门，负责品牌的注册、推广、授权、监督、管理和违规处理。设立或授权专门的管理机构（以下简称"品牌管理机构"）具体执行日常管理工作。
-  </div>
-
-  <div style="font-size: 18px; font-weight: bold; color: #2a5885; border-bottom: 1px solid #eee; padding-bottom: 5px;">
-    第二章 申请条件
-  </div>
-
-  <div style="">
-    <span style="font-weight: bold; margin-right: 5px; color: #d35400;">第五条</span>
-    申请使用公共品牌的申请人，应同时具备以下基本条件：
-    <div style="margin-left: 20px; margin-top: 10px;">
-      <div style="font-weight: bold; color: #2980b9;">主体合法：</div>
-      <div style="margin-left: 10px;">在耿马县依法注册登记，具有独立法人资格或规范的经营主体资格，经营状况正常。</div>
-
-      <div style="font-weight: bold; margin-top: 8px; color: #2980b9;">基地在耿马：</div>
-      <div style="margin-left: 10px;">生产加工基地主要位于耿马县行政区域内。</div>
-
-      <div style="font-weight: bold; margin-top: 8px; color: #2980b9;">质量达标：</div>
-      <div style="margin-left: 10px;">
-        <ul style="margin-top: 5px; padding-left: 20px;">
-          <li>产品符合国家、行业及地方相关蔬菜产品质量安全标准</li>
-          <li>建立并有效运行产品质量安全追溯体系</li>
-          <li>鼓励通过绿色食品、有机农产品或良好农业规范（GAP）等认证</li>
-        </ul>
-      </div>
-
-      <div style="font-weight: bold; margin-top: 8px; color: #2980b9;">规模与标准：</div>
-      <div style="margin-left: 10px;">具有一定规模的生产基地，生产过程执行耿马县制定的蔬菜标准化生产技术规程。</div>
-
-      <div style="font-weight: bold; margin-top: 8px; color: #2980b9;">信誉良好：</div>
-      <div style="margin-left: 10px;">近两年内无重大产品质量安全、环境污染、诚信经营等方面的不良记录和行政处罚。</div>
-    </div>
-  </div>
-
-  <!-- 后续章节保持相同格式 -->
-  <div style="font-size: 18px; font-weight: bold; color: #2a5885; border-bottom: 1px solid #eee; padding-bottom: 5px;">
-    第六章 附则
-  </div>
-
-  <div style="">
-    <span style="font-weight: bold; margin-right: 5px; color: #d35400;">第十五条</span>
-    本制度自发布之日起施行。根据实施情况可适时修订。
-  </div>
-</div>\``,
     type: 'management',
     file: 'BRM-2023-001.docx',
     version: '2.0',
@@ -165,21 +100,26 @@ const systemList = ref([
 ]);
 
 // 过滤列表
-const filteredList = computed(() => {
+// const filteredList = computed(() => {
-  return systemList.value.filter((item) => {
+//   return systemList.value.filter((item) => {
-    const matchSearch =
+//     const matchSearch =
-      item.title.toLowerCase().includes(searchQuery.value.toLowerCase()) ||
+//       item.title.toLowerCase().includes(searchQuery.value.toLowerCase()) ||
-      item.desc.toLowerCase().includes(searchQuery.value.toLowerCase()) ||
+//       item.desc.toLowerCase().includes(searchQuery.value.toLowerCase()) ||
-      item.code.toLowerCase().includes(searchQuery.value.toLowerCase());
+//       item.code.toLowerCase().includes(searchQuery.value.toLowerCase());
-    const matchFilter = filterType.value ? item.type === filterType.value : true;
+//     const matchFilter = filterType.value ? item.type === filterType.value : true;
-    return matchSearch && matchFilter;
+//     return matchSearch && matchFilter;
-  });
+//   });
-});
+// });
 
 // 显示详情
 const showDetail = (item) => {
-  currentDetail.value = item;
+  brandUsingSystemDetail(item.id).then((res) => {
-  showDialog.value = true;
+    if (res.code === 200) {
+      currentDetail.value = res.data;
+    }
+    showDialog.value = true;
+  });
+  // currentDetail.value = item;
 };
 
 // 隐藏详情
@@ -187,6 +127,18 @@ const hideDetail = () => {
   showDialog.value = false;
 };
 
+onMounted(() => {
+  getDocList();
+});
+
+const getDocList = () => {
+  brandUsingSystem().then((res) => {
+    if (res.code === 200) {
+      systemList.value = res.data.records;
+      console.log(res);
+    }
+  });
+};
 // 下载文档
 const downloadDoc = (item) => {
   ElMessage.success({
@@ -439,8 +391,6 @@ $color-danger: #ff4949;
   white-space: pre-wrap;
   line-height: 1.5;
   background: #ffffff;
-  padding: 20px;
-  border-radius: 8px;
   border: 1px solid $color-border;
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
   font-family: 'Microsoft Yahei', SimSun, sans-serif;
@@ -541,7 +491,6 @@ $color-danger: #ff4949;
 // 修改弹窗内容样式
 .doc-preview {
   line-height: 1.4; // 减小行高
-  padding: 12px 16px; // 减少内边距
 
   h1,
   h2,

sub-operation-service/src/views/brand/components/Monitor.vue

@@ -2,7 +2,7 @@
   <div class="usage-monitor">
     <!-- 顶部 TabPane，居中显示 -->
 
-    <el-tabs v-model="activeTab" class="tabs-wrapper">
+    <el-tabs v-model="activeTab" class="tabs-wrapper" @tab-change="changeStatus">
       <el-tab-pane label="在售中" name="onSale" />
       <el-tab-pane label="未上架" name="offShelf" />
       <el-tab-pane label="已失效" name="expired" />
@@ -10,15 +10,20 @@
 
     <!-- 列表内容 -->
     <div class="list-wrapper">
-      <div v-for="(p, idx) in filteredProducts" :key="p.id" class="list-item" :class="{ 'has-border': idx > 0 }">
+      <div v-for="(p, idx) in products" :key="p.id" class="list-item" :class="{ 'has-border': idx > 0 }">
         <!-- 商品图 -->
-        <img class="item-img" :src="p.img" alt="商品图" />
+        <img class="item-img" :src="p.goodsUrl ? p.goodsUrl.split(',')[0] : ''" alt="商品图" />
-
         <!-- 名称 + 月售/库存 -->
         <div class="item-info">
-          <div class="item-name">{{ p.name }}</div>
+          <div class="item-name">{{ p.apiGoodInfoVoDTO ? p.apiGoodInfoVoDTO.goodName : '' }}</div>
-          <div class="item-stats">月售 {{ p.monthlySales }} · 库存 {{ p.stock }}</div>
+          <div class="item-stats">
-          <div class="item-price">¥ {{ p.price }} /kg</div>
+            <span>总销售{{ p.apiGoodInfoVoDTO ? p.apiGoodInfoVoDTO.salesVolume : '' }}</span>
+            <span style="margin-left: 10px">库存 {{ p.apiGoodInfoVoDTO ? p.apiGoodInfoVoDTO.netWeight[0].goodStock : '' }}</span>
+          </div>
+          <div class="item-price">
+            ¥ {{ p.apiGoodInfoVoDTO ? p.apiGoodInfoVoDTO.netWeight[0].goodPrice : '' }} /
+            {{ p.apiGoodInfoVoDTO ? p.apiGoodInfoVoDTO.netWeight[0].unit : '' }}
+          </div>
         </div>
 
         <div class="item-buttom">
@@ -26,8 +31,8 @@
             {{ tabLabels[activeTab] }}
           </div>
           <div class="item-actions">
-            <el-button size="large" class="button" @click="onInspect(p.id)">抽查</el-button>
+            <el-button size="large" class="button" @click="onInspect(p)">抽查</el-button>
-            <el-button size="large" class="button" type="danger" @click="onRevoke(p)">取消授权</el-button>
+            <el-button v-if="activeTab !== 'expired'" size="large" class="button" type="danger" @click="onRevoke(p)">取消授权</el-button>
           </div>
         </div>
       </div>
@@ -105,7 +110,7 @@
 
         <!-- 右侧图片 -->
         <div class="trace-img">
-          <img :src="getAssetsFile(traceData.img)" alt="产品图" />
+          <img :src="traceData.img" alt="产品图" />
         </div>
       </div>
     </el-dialog>
@@ -113,9 +118,12 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { getAssetsFile } from '@/utils/index.js';
 import { getMonitorList } from '@/apis/brand';
+import Common from '../../farmingService/components/common.vue';
+import { usageList, cancelAuth } from '@/apis/brand.js';
+import { ElMessage, ElMessageBox } from 'element-plus';
 
 const activeTab = ref('onSale');
 const dialogVisible = ref(false);
@@ -163,12 +171,12 @@ const products = ref([
 const filteredProducts = computed(() => products.value.filter((p) => p.status === activeTab.value));
 
 // 点击抽查后，根据 id 单独拉取或赋值 traceData
-function onInspect(id) {
+function onInspect(item) {
-  console.log('查看产品:', id);
+  console.log('查看产品:', item);
   // 这里用硬编码模拟请求，实际中可换成接口调用：getTraceById(id).then(res=> traceData.value = res)
   const mocks = [
     {
-      productName: '耿马镇沙疆西红柿',
+      productName: '',
       quantity: '300KG',
       producer: '北大荒技术有限公司',
       origin: '耿马县孟定镇下坝村',
@@ -183,7 +191,7 @@ function onInspect(id) {
         soil: '红壤',
       },
       farmingRecords: [
-        { date: '2025/3/14', operation: '播种西红柿种', operator: '李强' },
+        { date: '2025/3/14', operation: '播种', operator: '李强' },
         { date: '2025/4/2', operation: '施肥 氮肥', operator: '李强' },
         { date: '2025/5/17', operation: '浇水', operator: '李强' },
         { date: '2025/6/14', operation: '采摘', operator: '李强' },
@@ -204,99 +212,63 @@ function onInspect(id) {
         time: '2025-4-2 08:13:52',
         buyer: '李楠',
       },
-      img: 'images/brand/product4.png',
+      img: '',
-    },
-    {
-      productName: '无土栽培土豆',
-      quantity: '200KG',
-      producer: '北大荒技术有限公司',
-      origin: '耿马县孟定镇下坝村',
-      productionDate: '2025-1-2',
-      traceCode: '10.5487542154785XSE254.1040201',
-      traceCount: 30,
-      base: {
-        address: '耿马县孟定镇下坝村',
-        location: '东经102° · 北纬24°',
-        area: 12000,
-        climate: '亚热带高原季风型，温和多雨',
-        soil: '红壤',
-      },
-      farmingRecords: [
-        { date: '2025/1/22', operation: '播种 20250102批土豆种', operator: '王岚' },
-        { date: '2025/2/14', operation: '施肥 氮肥', operator: '王岚' },
-        { date: '2025/3/3', operation: '浇水', operator: '王岚' },
-        { date: '2025/4/21', operation: '采摘', operator: '王岚' },
-      ],
-      packaging: {
-        company: '瑞禾农产品包装公司',
-        type: '纸箱',
-        person: '李桑',
-        time: '2025-5-2 07:54:14',
-      },
-      logistics: {
-        storageType: '冷藏',
-        temperature: '2°C',
-        shipFrom: '北京市朝阳区解放路24号',
-        shipTo: '上海市黄浦区南京路36号',
-      },
-      trade: {
-        time: '2025-5-16 16:08:35',
-        buyer: '刘思楠',
-      },
-      img: 'images/brand/product6.png',
-    },
-    {
-      productName: '彩椒南瓜混合',
-      quantity: '200KG',
-      producer: '北大荒技术有限公司',
-      origin: '耿马县孟定镇下坝村',
-      productionDate: '2025-5-15',
-      traceCode: '10.5487542154785XSE254.1040201',
-      traceCount: 30,
-      base: {
-        address: '耿马县孟定镇下坝村',
-        location: '东经102° · 北纬24°',
-        area: 12000,
-        climate: '亚热带高原季风型，温和多雨',
-        soil: '红壤',
-      },
-      farmingRecords: [
-        { date: '2025/2/8', operation: '播种瓜种', operator: '刘琦' },
-        { date: '2025/3/14', operation: '施肥 氮肥', operator: '刘琦' },
-        { date: '2025/3/20', operation: '浇水', operator: '刘琦' },
-        { date: '2025/4/11', operation: '浇水', operator: '刘琦' },
-        { date: '2025/5/15', operation: '采摘', operator: '刘琦' },
-      ],
-      packaging: {
-        company: '瑞禾农产品包装公司',
-        type: '纸箱',
-        person: '王大福',
-        time: '2025-5-26 14:26:27',
-      },
-      logistics: {
-        storageType: '冷藏',
-        temperature: '2°C',
-        shipFrom: '北京市朝阳区解放路24号',
-        shipTo: '上海市黄浦区南京路36号',
-      },
-      trade: {
-        time: '2025-6-2 11:00:51',
-        buyer: '刘小花',
-      },
-      img: 'images/brand/product1.png',
     },
   ];
-  if (id === 1) {
+  traceData.value = mocks[0];
-    traceData.value = mocks[0];
+  traceData.value.productName = item.apiGoodInfoVoDTO.goodName;
-  } else if (id === 2) {
+  traceData.value.img = item.goodsUrl ? item.goodsUrl.split(',')[0] : '';
-    traceData.value = mocks[1];
-  } else if (id === 3) {
-    traceData.value = mocks[2];
-  }
   dialogVisible.value = true;
 }
 const onRevoke = (p) => {
-  console.log('取消授权', p);
+  ElMessageBox.confirm('是否确认取消该商品的授权？', '注意！', {
+    confirmButtonText: '确认',
+    cancelButtonText: '放弃',
+    type: 'error',
+  })
+    .then(() => {
+      cancelAuth({ id: p.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '已取消授权',
+          });
+          if (activeTab.value === 'onSale') {
+            getAuthList(2, 1);
+          } else if (activeTab.value === 'offShelf') {
+            getAuthList(2, 3);
+          } else if (activeTab.value === 'expired') {
+            getAuthList(4, '');
+          }
+        }
+      });
+    })
+    .catch(() => {});
+};
+
+const changeStatus = (tab) => {
+  if (tab === 'onSale') {
+    getAuthList(2, 1);
+  } else if (tab === 'offShelf') {
+    getAuthList(2, 3);
+  } else if (tab === 'expired') {
+    getAuthList(4, '');
+  }
+};
+
+const getAuthList = (status, isListed) => {
+  products.value = [];
+  let obj = {
+    status: status,
+  };
+  if (isListed) {
+    obj.goodsIsListed = isListed;
+  }
+  usageList(obj).then((res) => {
+    if (res.code === 200) {
+      products.value = res.data.records;
+    }
+  });
 };
 
 // 状态文字的颜色
@@ -305,6 +277,10 @@ const statusClass = (tab) => {
   if (tab === 'expired') return 'text-danger';
   return 'text-success';
 };
+
+onMounted(() => {
+  getAuthList(2, 1);
+});
 </script>
 
 <style scoped lang="scss">

sub-operation-service/src/views/brand/index.vue

@@ -3,7 +3,13 @@
     <el-container class="brand-layout-container">
       <el-aside class="brand-aside-menu">
         <!-- 菜单部分 -->
-        <el-menu v-model:open="openMenus" :default-active="activeMenu" class="brand-aside-menu" @select="handleSelect">
+        <el-menu
+          v-model:open="openMenus"
+          popper-class="no-transition-menu"
+          :default-active="activeMenu"
+          class="brand-aside-menu"
+          @select="handleSelect"
+        >
           <el-menu-item index="apply">
             <img :src="getAssetsFile('images/brand/Apply.png')" class="menu-icon" alt="申请图标" />
             <span>使用申请</span>
@@ -15,6 +21,7 @@
               <span>授权管理</span>
             </template>
             <el-menu-item index="auth/record"> 授权记录 </el-menu-item>
+            <el-menu-item index="monitor">使用监管</el-menu-item>
             <el-menu-item index="auth/manage"> 品牌使用管理 </el-menu-item>
           </el-sub-menu>
 
@@ -34,7 +41,7 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { getAssetsFile } from '@/utils/index.js';
 
@@ -61,6 +68,20 @@ const activeMenu = computed(() => {
 function handleSelect(index) {
   router.push(`/sub-operation-service/brand/${index}`);
 }
+
+onMounted(() => {
+  const observer = new MutationObserver((mutations) => {
+    document.querySelectorAll('.el-menu').forEach((menu) => {
+      menu.classList.remove('el-menu--popup');
+      menu.style.transition = 'none';
+    });
+  });
+
+  observer.observe(document.body, {
+    childList: true,
+    subtree: true,
+  });
+});
 </script>
 
 <style lang="scss" scoped>

sub-operation-service/src/views/ecommerce/agriculturalDetail.vue

@@ -89,7 +89,8 @@
                       </el-descriptions-item>
                     </el-descriptions>
                   </div>
-                  <div style="display: flex; justify-content: center; flex-wrap: wrap">
+                  <div style="padding: 0 5%; text-indent: 2em; font-size: 18px" v-html="currentGood.describeContent"></div>
+                  <div style="display: flex; justify-content: center; flex-wrap: wrap; margin-top: 20px">
                     <el-image
                       v-for="(item, index) in currentGood.detailUrl"
                       :key="index"

sub-operation-service/src/views/ecommerce/supplierDetail.vue

@@ -89,7 +89,8 @@
                       </el-descriptions-item>
                     </el-descriptions>
                   </div>
-                  <div style="display: flex; justify-content: center; flex-wrap: wrap">
+                  <div style="padding: 0 5%; text-indent: 2em; font-size: 18px" v-html="currentGood.describeContent"></div>
+                  <div style="display: flex; justify-content: center; flex-wrap: wrap; margin-top: 20px">
                     <el-image
                       v-for="(item, index) in currentGood.detailUrl"
                       :key="index"

sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue

@@ -91,9 +91,9 @@ const toLink = (n, index) => {
   //     item.icon = item.icon.replace('-1', '');
   //   }
   // });
-  console.log('currentIndex.value', currentIndex.value);
+  // console.log('currentIndex.value', currentIndex.value);
 
-  router.push(n.path);
+  // router.push(n.path);
 };
 </script>
 <style lang="scss" scoped>

sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue

@@ -86,10 +86,10 @@
                 <el-button :disabled="data.length == 0" :type="data.length != 0 ? 'primary' : 'info'" @click="toSettlement">结算</el-button>
               </div>
             </div>
-            <!-- <div class="pagination">
+            <div class="pagination">
-              <div style="color: #999999; font-size: 15px">共{{ data.total }}条</div>
+              <div style="color: #999999; font-size: 15px">共{{ total }}条</div>
-              <el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="data.total" />
+              <el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="total" @change="pagination" />
-            </div> -->
+            </div>
           </div>
         </div>
       </template>
@@ -112,12 +112,12 @@ const route = useRoute();
 const router = useRouter();
 
 let number = ref(1);
-let total = ref(99);
+let total = ref(0);
 let isAll = ref(false);
 let data = ref([]);
 let page = reactive({
   current: 1,
-  size: 100,
+  size: 20,
 });
 let ids = ref([]);
 
@@ -157,10 +157,19 @@ let datalist = reactive([
 onMounted(() => {
   shoppingCart(page).then((res) => {
     data.value = res.data.records;
+    total.value = res.data.total;
     addIsCheckProperty(data);
   });
 });
 
+const pagination = (value) => {
+  page.current = value;
+  shoppingCart(page).then((res) => {
+    data.value = res.data.records;
+    addIsCheckProperty(data);
+  });
+};
+
 function addIsCheckProperty(data) {
   if (Array.isArray(data)) {
     data.forEach((item) => {
@@ -411,6 +420,7 @@ function removeCheckedItems(data) {
       background: $color-fff;
     }
     .fix-top {
+      z-index: 999;
       top: 0;
       display: inline-flex;
       justify-content: space-between;
@@ -461,8 +471,8 @@ function removeCheckedItems(data) {
       bottom: 38px;
     }
     .fix-bottom {
-      // bottom: 30px;
+      bottom: 30px;
-      bottom: 0;
+      // bottom: 0;
       display: inline-flex;
       justify-content: space-between;
       width: 100%;

sub-operation-service/src/views/shoppingCarts/sureOrders.vue

@@ -40,6 +40,7 @@
               </div>
             </el-scrollbar>
           </div>
+          <!-- <div style="background-color: #fff; margin-bottom: 20px">订单备注</div> -->
 
           <div class="order-info">
             <div class="order-info-top">确认订单信息</div>

sub-operation-service/src/views/userCenter/orderDetails.vue

@@ -341,6 +341,9 @@ const back = () => {
       .order-list-warp-left {
         width: 55%;
         height: 70vh;
+        overflow: hidden;
+        overflow-y: scroll;
+        scrollbar-width: none;
         .order-list-warp-left-title {
           margin-top: 20px;
           font-size: 18px;