From 69211ab6652486fc8b8df92140563a892a361259 Mon Sep 17 00:00:00 2001
From: wangwei <707714829@qq.com>
Date: Wed, 22 Jun 2022 14:15:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B5=84=E6=BA=90=E7=AD=89?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/i18n/en-US.js                        |  1 +
 back/src/i18n/zh-CN.js                        | 23 +++++++++-
 back/src/i18n/zh-TW.js                        |  1 +
 back/src/router/index.js                      |  2 +-
 .../views/modules/ability/bsdataresources.vue | 40 ++++++++--------
 .../modules/ability/bsinfrastructure.vue      | 41 ++++++++---------
 back/src/views/modules/project/list.vue       | 46 ++++++++++---------
 7 files changed, 88 insertions(+), 66 deletions(-)

diff --git a/back/src/i18n/en-US.js b/back/src/i18n/en-US.js
index 4bb6f13a..ac1a5b1f 100644
--- a/back/src/i18n/en-US.js
+++ b/back/src/i18n/en-US.js
@@ -25,6 +25,7 @@ t.choose = 'Please Choose'
 t.fileName = 'File Name'
 t.design = 'Online Design'
 t.preview = 'Preview'
+t.reset='Reset'
 
 t.prompt = {}
 t.prompt.title = 'Prompt'
diff --git a/back/src/i18n/zh-CN.js b/back/src/i18n/zh-CN.js
index e78f7fd2..ac57932d 100644
--- a/back/src/i18n/zh-CN.js
+++ b/back/src/i18n/zh-CN.js
@@ -25,6 +25,7 @@ t.choose = '请选择'
 t.fileName = '文件名'
 t.design = '在线设计'
 t.preview = '预览'
+t.reset='重置'
 
 t.prompt = {}
 t.prompt.title = '提示'
@@ -548,14 +549,32 @@ t.notice.disconnectMessage = 'WebSocket连接已断开，请检查网络'
 t.projectList = {}
 t.projectList.projectName='项目名称'
 t.projectList.projectUnit='申请单位'
-t.projectList.departm='责任处室'
-t.projectList.date='申请日期'
+t.projectList.department='责任处室'
+t.projectList.applydate='申请日期'
 t.projectList.district='所属区市'
 t.projectList.contacts='业务联系人'
 t.projectList.contactstel='业务联系人电话'
 t.projectList.technology='技术联系人电话'
 t.projectList.technologytel='技术联系人电话'
 
+t.dataresources={}
+t.dataresources.componentType="组件类型"
+t.dataresources.componentName="组件名称"
+t.dataresources.putOnDate="上架时间"
+t.dataresources.resourcesName="数据资源名称"
+t.dataresources.resourcesCode="数据资源代码"
+t.dataresources.resourcesProvide="数据资源提供方"
+t.dataresources.resourcesAbstract="数据资源摘要"
+t.dataresources.associatedApplication="关联应用"
+
+t.infrastructure={}
+t.infrastructure.resourceCategory="资源类别"
+t.infrastructure.resourceName="摄像头名称"
+t.infrastructure.district="所在区市"
+t.infrastructure.street="所在街道"
+t.infrastructure.department="所属部门"
+t.infrastructure.associatedApplication="关联应用"
+
 
 
 
diff --git a/back/src/i18n/zh-TW.js b/back/src/i18n/zh-TW.js
index f4bcdec4..3e6f2cd5 100644
--- a/back/src/i18n/zh-TW.js
+++ b/back/src/i18n/zh-TW.js
@@ -25,6 +25,7 @@ t.choose = '請選擇'
 t.fileName = '文件名'
 t.design = '在線設計'
 t.preview = '預覽'
+t.reset='重置'
 
 t.prompt = {}
 t.prompt.title = '提示'
diff --git a/back/src/router/index.js b/back/src/router/index.js
index de422fdd..b2f3777e 100644
--- a/back/src/router/index.js
+++ b/back/src/router/index.js
@@ -162,7 +162,7 @@ function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
       route.meta.iframeURL = URL
     } else {
       const urlArr = URL.split('?')
-      debugger
+      // debugger
       URL = urlArr[0].replace(/^\//, '').replace(/_/g, '-')
       route.path = route.name = URL.replace(/\//g, '-')
       route.component = () => import(`@/views/modules/${URL}`)
diff --git a/back/src/views/modules/ability/bsdataresources.vue b/back/src/views/modules/ability/bsdataresources.vue
index 81ce44f8..b40ec90c 100644
--- a/back/src/views/modules/ability/bsdataresources.vue
+++ b/back/src/views/modules/ability/bsdataresources.vue
@@ -4,37 +4,30 @@
     <div class="mod-pay__order">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.orderId" :placeholder="$t('order.orderId')" clearable></el-input>
+          <ren-select v-model="dataForm.status" dict-type="category" :placeholder="$t('dataresources.componentType')"></ren-select>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.userId" :placeholder="$t('order.userId')" clearable></el-input>
+          <el-input v-model="dataForm.orderId" :placeholder="$t('dataresources.componentName')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <ren-select v-model="dataForm.status" dict-type="order_status" :placeholder="$t('order.status')"></ren-select>
+           <el-date-picker v-model="dataForm.applydate" value-format="yyyy-MM-dd" type="date" :placeholder="$t('dataresources.putOnDate')" clearable></el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="resetDataList()">{{ $t('reset') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="orderId" :label="$t('order.orderId')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="productName" :label="$t('order.productName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="payAmount" :label="$t('order.payAmount')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="status" :label="$t('order.status')" header-align="center" align="center">
-          <template slot-scope="scope">
-            {{ $getDictLabel("order_status", scope.row.status) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="payAt" :label="$t('order.payAt')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('order.createDate')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="orderId" :label="$t('dataresources.resourcesName')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="productName" :label="$t('dataresources.resourcesCode')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="payAmount" :label="$t('dataresources.resourcesProvide')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="status" :label="$t('dataresources.resourcesAbstract')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="payAt" :label="$t('dataresources.putOnDate')" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="payHandle(scope.row.orderId)">{{ $t('order.pay') }}</el-button>
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="primary" @click="associatedApplication(scope.row.orderId)">{{ $t('dataresources.associatedApplication') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -78,9 +71,16 @@ export default {
     // AddOrUpdate
   },
   methods: {
-    payHandle (orderId) {
-      window.open(`${window.SITE_CONFIG['apiURL']}/pay/alipay/webPay?orderId=` + orderId);
-    }
+     //重置
+     resetDataList(){
+        this.dataForm=this.noDataForm;
+        this.page=1;                    // 当前页码
+        this.query();
+     },
+     //关联应用
+     associatedApplication(){
+
+     }
   }
 }
 </script>
diff --git a/back/src/views/modules/ability/bsinfrastructure.vue b/back/src/views/modules/ability/bsinfrastructure.vue
index cc64981f..6d3f4e4c 100644
--- a/back/src/views/modules/ability/bsinfrastructure.vue
+++ b/back/src/views/modules/ability/bsinfrastructure.vue
@@ -4,37 +4,26 @@
     <div class="mod-pay__order">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.orderId" :placeholder="$t('order.orderId')" clearable></el-input>
+          <ren-select v-model="dataForm.status" dict-type="resourceType" :placeholder="$t('infrastructure.resourceCategory')"></ren-select>
         </el-form-item>
         <el-form-item>
-          <el-input v-model="dataForm.userId" :placeholder="$t('order.userId')" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <ren-select v-model="dataForm.status" dict-type="order_status" :placeholder="$t('order.status')"></ren-select>
+          <el-input v-model="dataForm.orderId" :placeholder="$t('infrastructure.resourceName')" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="resetDataList()">{{ $t('reset') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="orderId" :label="$t('order.orderId')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="productName" :label="$t('order.productName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="payAmount" :label="$t('order.payAmount')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="status" :label="$t('order.status')" header-align="center" align="center">
-          <template slot-scope="scope">
-            {{ $getDictLabel("order_status", scope.row.status) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="payAt" :label="$t('order.payAt')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('order.createDate')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="orderId" :label="$t('infrastructure.resourceName')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="productName" :label="$t('infrastructure.district')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="payAmount" :label="$t('infrastructure.street')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="status" :label="$t('infrastructure.department')" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="payHandle(scope.row.orderId)">{{ $t('order.pay') }}</el-button>
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+             <el-button type="primary" @click="associatedApplication(scope.row.orderId)">{{ $t('infrastructure.associatedApplication') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -78,9 +67,17 @@ export default {
     // AddOrUpdate
   },
   methods: {
-    payHandle (orderId) {
-      window.open(`${window.SITE_CONFIG['apiURL']}/pay/alipay/webPay?orderId=` + orderId);
-    }
+     //重置
+     resetDataList(){
+        this.dataForm=this.noDataForm;
+        this.page=1;                    // 当前页码
+        this.query();
+     },
+     //关联应用
+     associatedApplication(){
+
+     }
+    
   }
 }
 </script>
diff --git a/back/src/views/modules/project/list.vue b/back/src/views/modules/project/list.vue
index c144ba58..a3b62138 100644
--- a/back/src/views/modules/project/list.vue
+++ b/back/src/views/modules/project/list.vue
@@ -9,36 +9,28 @@
           <el-input v-model="dataForm.userId" :placeholder="$t('projectList.projectUnit')" clearable></el-input>
         </el-form-item>
          <el-form-item>
-          <el-input v-model="dataForm.departm" :placeholder="$t('projectList.departm')" clearable></el-input>
+          <el-input v-model="dataForm.department" :placeholder="$t('projectList.department')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <ren-select v-model="dataForm.status" dict-type="order_status" :placeholder="$t('order.status')"></ren-select>
+           <el-date-picker v-model="dataForm.applydate" value-format="yyyy-MM-dd" type="date" :placeholder="$t('projectList.applydate')" clearable></el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="resetDataList()">{{ $t('reset') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="orderId" :label="$t('projectList.projectName')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="productName" :label="$t('projectList.projectUnit')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="payAmount" :label="$t('projectList.district')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="status" :label="$t('order.status')" header-align="center" align="center">
-          <template slot-scope="scope">
-            {{ $getDictLabel("order_status", scope.row.status) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="payAt" :label="$t('order.payAt')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('order.createDate')" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
-          <template slot-scope="scope">
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="payHandle(scope.row.orderId)">{{ $t('order.pay') }}</el-button>
-            <el-button v-if="scope.row.status === 0" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template>
-        </el-table-column>
+        <el-table-column prop="payAt" :label="$t('projectList.department')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createDate" :label="$t('projectList.contacts')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createDate" :label="$t('projectList.contactstel')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createDate" :label="$t('projectList.technology')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createDate" :label="$t('projectList.technologytel')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createDate" :label="$t('projectList.date')" header-align="center" align="center"></el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"
@@ -73,7 +65,15 @@ export default {
         orderId: '',
         status: '',
         userId: '',
-        departm:''
+        department:'',
+        applydate:''
+      },
+      noDataForm: {
+        orderId: '',
+        status: '',
+        userId: '',
+        department:'',
+        applydate:''
       }
     }
   },
@@ -81,9 +81,13 @@ export default {
     // AddOrUpdate
   },
   methods: {
-    payHandle (orderId) {
-      window.open(`${window.SITE_CONFIG['apiURL']}/pay/alipay/webPay?orderId=` + orderId);
-    }
+    //重置
+     resetDataList(){
+        this.dataForm=this.noDataForm;
+        this.page=1;                    // 当前页码
+        this.query();
+
+     }
   }
 }
 </script>