style(部件类型，部件电子档案，sdk油机授权): 修改样式

修改样式，添加图标。

admin.ui.plus-master/src/views/admin/authorize/components/form-edit.vue

@@ -10,22 +10,22 @@
         <el-row :gutter="35">
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
             <el-form-item label="油站名称" prop="oilStation">
-              <el-input v-model="formData.editData.oilStation" placeholder="格式：message.router.xxx" clearable></el-input>
+              <el-input v-model="formData.editData.oilStation" placeholder="请输入油站名称" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
             <el-form-item label="项目名称" prop="projectName">
-              <el-input v-model="formData.editData.projectName" placeholder="格式：message.router.xxx" clearable></el-input>
+              <el-input v-model="formData.editData.projectName" placeholder="请输入项目名称" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
             <el-form-item label="设备SN" prop="sn">
-              <el-input v-model="formData.editData.sn" placeholder="格式：message.router.xxx" clearable></el-input>
+              <el-input v-model="formData.editData.sn" placeholder="请输入设备SN号" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
             <el-form-item label="授权码" prop="key">
-              <el-input v-model="formData.editData.key" placeholder="格式：message.router.xxx" clearable></el-input>
+              <el-input v-model="formData.editData.key" placeholder="请输入授权码" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -52,15 +52,15 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="formData.editData.remark" placeholder="格式：message.router.xxx" clearable type="textarea"></el-input>
+              <el-input v-model="formData.editData.remark" placeholder="请输入备注" rows="6" clearable type="textarea"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <template #footer>
         <span class="dialog-footer">
-          <el-button @click="onCancel" size="default">取 消</el-button>
-          <el-button type="primary" @click="onSubmit" size="default">{{formData.buttonText}}</el-button>
+          <el-button @click="onCancel" icon="ele-CircleClose" size="default">取 消</el-button>
+          <el-button type="primary" :icon="formData.editIcon" @click="onSubmit" size="default">{{formData.buttonText}}</el-button>
         </span>
       </template>
     </el-dialog>
@@ -84,6 +84,7 @@ const formData = reactive({
   loading: false,
   formType: Form,
   titleText:'',
+  editIcon:'',
   buttonText:'',
   isShowDialog: false,
   editData:{} as oilSdkTableModel,
@@ -97,10 +98,10 @@ const formData = reactive({
   //   { prop: 'formData', label: '状态' },
   //   { prop: 'remark', label: '备注' },
   // ],
-  // options:[
-  //   {label:'正常',value:'正常'},
-  //   {label:'未授权',value:'未授权'},
-  // ]
+  options:[
+    {label:'正常',value:'正常'},
+    {label:'未授权',value:'未授权'},
+  ]
 })
 
 /**有效时间选择校验*/
@@ -145,13 +146,14 @@ const openDialog = (val) => {
     formData.buttonText = '更新'
     //更新操作
     formData.formType = Form.UPDATE
+    formData.editIcon = 'ele-Refresh'
   }else {
     formData.editData = {} as oilSdkTableModel
     formData.titleText = '添加授权'
     formData.buttonText = '添加'
     //添加操作
     formData.formType = Form.ADD
-
+    formData.editIcon = 'ele-CirclePlus'
   }
   formData.isShowDialog = true
   formData.isShowDialog = true

admin.ui.plus-master/src/views/admin/authorize/index.vue

@@ -1,13 +1,15 @@
 <!--部件电子档案-->
 <template>
   <div class="layout-pd" >
-    <!--操作-->
-    <el-card  shadow="hover" >
-      <el-form :model="sdkData.Filter" size="default" label-width="100px" class="mt35 mb35">
-            <el-row :gutter="35">
+    <el-row>
+      <!--操作-->
+      <el-col :xs="24" >
+        <el-card class="mt8"  shadow="hover" >
+          <el-form :model="sdkData.Filter" :inline="true" @submit.stop.prevent>
+            <el-form-item prop="name" style="width: 100%">
               <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
                 <el-form-item label="油站名称">
-                  <el-input v-model="sdkData.Filter.OilStation" placeholder="单行输入" clearable></el-input>
+                  <el-input v-model="sdkData.Filter.OilStation"  placeholder="单行输入" clearable></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
@@ -37,52 +39,64 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :xs="48" :sm="24" :md="16" :lg="12" :xl="8" >
+              <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
                 <el-form-item>
                   <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
-                  <el-button type="primary" icon="ele-Delete" @click="onReset"> 重置 </el-button>
-                  <el-button type="primary" icon="ele-Plus" @click="onAdd"> 添加 </el-button>
+                  <el-button type="primary" icon="ele-RefreshRight" @click="onReset"> 重置 </el-button>
                 </el-form-item>
               </el-col>
-            </el-row>
+              <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
+                <el-form-item>
+                  <el-button  type="primary" icon="ele-CirclePlus" @click="onAdd"> 添加 </el-button>
+                </el-form-item>
+              </el-col>
+            </el-form-item>
           </el-form>
-      <div class="my-flex my-flex-end" style="margin: 30px 30px 0 0">
-        <el-button type="primary" icon="ele-UploadFilled" @click="uploadFiles"> 批量导入 </el-button>
-        <el-button type="primary" icon="ele-Document" @click="exportTable"> 导出表格 </el-button>
-      </div>
-    </el-card>
-    <!--表格-->
-    <el-card style="height: 70vh" class="my-fill mt8" shadow="hover">
-        <el-table v-loading="sdkData.loading" :data="sdkData.tableModel" row-key="id" style="width: 100%">
-          <el-table-column v-for="column in sdkData.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label"  />
-          <el-table-column label="操作"  fixed="right" header-align="center" align="center">
-            <template #default="{ row }">
-              <el-link
-                class="my-el-link mr12 ml12"
-                type="primary"
-                icon="ele-edit"
-                size="small"
-                @click="editTableData(row)"
-                :underline="false"
-                target="_blank"
-              >编辑</el-link>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="my-flex my-flex-end" style="margin-top: 20px">
-          <el-pagination
-            v-model:currentPage="sdkData.pageInput.CurrentPage"
-            v-model:page-size="sdkData.pageInput.PageSize"
-            :total="sdkData.total"
-            :page-sizes="[10, 20, 50, 100]"
-            small
-            background
-            @size-change="onSizeChange"
-            @current-change="onCurrentChange"
-            layout="total, sizes, prev, pager, next, jumper"
-          />
-        </div>
-    </el-card>
+          <div class="my-flex my-flex-end" >
+            <el-button type="primary" icon="ele-UploadFilled" @click="uploadFiles"> 批量导入 </el-button>
+            <el-button type="primary" icon="ele-Document" @click="exportTable"> 导出表格 </el-button>
+          </div>
+        </el-card>
+      </el-col>
+      <!--表格-->
+      <el-col  :xs="24" >
+        <el-card style="height: 70vh" class="my-fill mt8" shadow="hover">
+          <el-table v-loading="sdkData.loading" :data="sdkData.tableModel" row-key="id" style="width: 100%">
+            <el-table-column v-for="column in sdkData.dynamicColumns" :key="column.prop" :prop="column.prop" :label="column.label"  />
+            <el-table-column label="操作"  fixed="right" header-align="center" align="center">
+              <template #default="{ row }">
+                <el-link
+                  class="my-el-link mr12 ml12"
+                  type="primary"
+                  icon="ele-Edit"
+                  size="small"
+                  @click="editTableData(row)"
+                  :underline="false"
+                  target="_blank"
+                >编辑</el-link>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="my-flex my-flex-end" style="margin-top: 20px">
+            <el-pagination
+              v-model:currentPage="sdkData.pageInput.CurrentPage"
+              v-model:page-size="sdkData.pageInput.PageSize"
+              :total="sdkData.total"
+              :page-sizes="[10, 20, 50, 100]"
+              small
+              background
+              @size-change="onSizeChange"
+              @current-change="onCurrentChange"
+              layout="total, sizes, prev, pager, next, jumper"
+            />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
     <EditDialog ref="editDialogRef" />
   </div>
 
@@ -250,5 +264,13 @@ const editTableData = (row) => {
 </script>
 
 <style scoped lang="scss">
-
+.my-el-link {
+  font-size: 12px;
+}
+.el-form .el-col.mb20 {
+  margin: 0 !important;
+}
+.el-input {
+  width: 240px;
+}
 </style>

admin.ui.plus-master/src/views/admin/product/components/form-edit.vue

@@ -46,8 +46,8 @@
       </el-form>
       <template #footer>
         <span class="dialog-footer">
-          <el-button @click="onCancel" size="default">取 消</el-button>
-          <el-button type="primary" @click="onSubmit" size="default">{{formData.buttonText}}</el-button>
+          <el-button @click="onCancel" icon="ele-CircleClose" size="default">取 消</el-button>
+          <el-button type="primary" :icon="formData.editIcon" @click="onSubmit" size="default">{{formData.buttonText}}</el-button>
         </span>
       </template>
     </el-dialog>
@@ -80,6 +80,7 @@ const formData = reactive({
   loading: false,
   formType: Form,
   titleText:'',
+  editIcon:'',
   buttonText:'',
   isShowDialog: false,
   //表单数据对象
@@ -125,13 +126,14 @@ const openDialog = (val) => {
     formData.buttonText = '更新'
     //更新操作
     formData.formType = Form.UPDATE
+    formData.editIcon = 'ele-Refresh'
   }else {
     formData.editData = {} as typeTable
     formData.titleText = '添加部件'
     formData.buttonText = '添加'
     //添加操作
     formData.formType = Form.ADD
-
+    formData.editIcon = 'ele-CirclePlus'
   }
   formData.isShowDialog = true
   formData.isShowDialog = true

admin.ui.plus-master/src/views/admin/product/goodInfo.vue

@@ -7,7 +7,7 @@
         <el-card shadow="hover" header="基础信息">
           <div class="basicInformation" v-loading="goods.loadingBasic">
             <div class="basicInformation-left">
-              <div class="item">
+              <div class="item ">
                 <el-popover
                   placement="top-start"
                   :width="200"
@@ -370,6 +370,7 @@ onMounted(() => {
     margin-bottom: 20px;
   }
 
+
   .basicInformation{
     display: flex;
     display: -webkit-flex; /* Safari */

admin.ui.plus-master/src/views/admin/product/index.vue

@@ -30,12 +30,14 @@
               <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" class="mb20">
                 <el-form-item>
                   <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
-                  <el-button type="primary" icon="ele-Delete" @click="onReset"> 重置 </el-button>
-                  <el-button v-auth="'api:admin:file:upload-file'" type="primary" icon="ele-Upload" @click="onUpload"> 上传 </el-button>
+                  <el-button type="primary" icon="ele-RefreshRight" @click="onReset"> 重置 </el-button>
                 </el-form-item>
               </el-col>
             </el-form-item>
           </el-form>
+          <div class="my-flex my-flex-end">
+            <el-button v-auth="'api:admin:file:upload-file'" type="primary" icon="ele-Upload" @click="onUpload"> 上传 </el-button>
+          </div>
         </el-card>
       </el-col>
       <!--表格-->
@@ -104,7 +106,7 @@
                   class="my-el-link mr12 ml12"
                   @click="toPage(row)"
                   type="primary"
-                  icon="ele-edit"
+                  icon="ele-Tickets"
                   size="small"
                   :underline="false"
                   target="_blank"
@@ -302,4 +304,7 @@ const toPage = (row) => {
 .el-form .el-col.mb20 {
   margin: 0 !important;
 }
+.el-input {
+  width: 240px;
+}
 </style>

admin.ui.plus-master/src/views/admin/product/type.vue

@@ -25,14 +25,13 @@
               <el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="4" class="mb20">
                 <el-form-item>
                   <el-button type="primary" icon="ele-Search" @click="onQuery"> 查询 </el-button>
-                  <el-button type="primary" icon="ele-Delete" @click="onReset"> 重置 </el-button>
+                  <el-button type="primary" icon="ele-RefreshRight" @click="onReset"> 重置 </el-button>
                 </el-form-item>
               </el-col>
-
             </el-form-item>
           </el-form>
             <div class="my-flex my-flex-start">
-              <el-button  type="primary" icon="ele-Plus" @click="onAdd"> 添加 </el-button>
+              <el-button  type="primary" icon="ele-CirclePlus" @click="onAdd"> 添加 </el-button>
             </div>
             <div class="my-flex my-flex-end">
               <el-button type="primary" icon="ele-UploadFilled" @click="uploadFiles"> 批量导入 </el-button>
@@ -115,8 +114,7 @@
                   class="my-el-link mr12 ml12"
                   @click="editTableData(row)"
                   type="primary"
-                  icon="ele-edit"
-                  size="small"
+                  icon="ele-Edit"
                   :underline="false"
                   target="_blank"
                 >编辑</el-link>
@@ -423,4 +421,7 @@ const onCurrentChange = (val: number) => {
   max-height: 80vh;
   object-fit: contain;
 }
+.el-input {
+  width: 240px;
+}
 </style>

admin.ui.plus-master/src/views/admin/workbench/index.vue

@@ -15,7 +15,7 @@
           <div class="flex-margin flex w100" :class="` home-one-animation${k}`">
             <div class="flex-auto">
               <span class="font30">{{ v.num1 }}</span>
-              <span class="ml5 font16" :style="{ color: v.color1 }">{{ v.num2 }}%</span>
+<!--              <span class="ml5 font16" :style="{ color: v.color1 }">{{ v.num2 }}%</span>-->
               <div class="mt10">{{ v.num3 }}</div>
             </div>
             <div class="home-card-item-icon flex" :style="{ background: `var(${v.color2})` }">
@@ -92,7 +92,7 @@ const state = reactive({
       num1: '125,12',
       num2: '-12.32',
       num3: '团标备案主板',
-      num4: 'fa fa-meetup',
+      num4: 'fa fa-microchip',
       color1: '#FF6462',
       color2: '--next-color-primary-lighter',
       color3: '--el-color-primary',
@@ -101,7 +101,7 @@ const state = reactive({
       num1: '653,33',
       num2: '+42.32',
       num3: '备案ECVR-FM',
-      num4: 'iconfont icon-ditu',
+      num4: 'fa fa-flag-checkered',
       color1: '#6690F9',
       color2: '--next-color-success-lighter',
       color3: '--el-color-success',
@@ -110,7 +110,7 @@ const state = reactive({
       num1: '125,65',
       num2: '+17.32',
       num3: '待使用主板密钥',
-      num4: 'iconfont icon-zaosheng',
+      num4: 'fa fa-key',
       color1: '#6690F9',
       color2: '--next-color-warning-lighter',
       color3: '--el-color-warning',
@@ -119,7 +119,7 @@ const state = reactive({
       num1: '520,43',
       num2: '-10.01',
       num3: '待使用ECVR-FM',
-      num4: 'fa fa-github-alt',
+      num4: 'fa fa-flag-o',
       color1: '#FF6462',
       color2: '--next-color-danger-lighter',
       color3: '--el-color-danger',
@@ -220,7 +220,7 @@ const initLineChart = () => {
         symbolSize: 6,
         symbol: 'circle',
         smooth: true,
-        data: [0, 41.1, 30.4, 65.1, 53.3, 53.3, 53.3, 41.1, 30.4, 65.1, 53.3, 10],
+        data: [0, 41.1, 30.4, 65.1, 53.3, 53.3, 53.3, 41.1, 30.4, 65.1],
         lineStyle: { color: '#fe9a8b' },
         itemStyle: { color: '#fe9a8b', borderColor: '#fe9a8b' },
         areaStyle: {
@@ -276,7 +276,7 @@ const initPieChart = () => {
   if (!state.global.dispose.some((b: any) => b === state.global.homeChartTwo)) state.global.homeChartTwo.dispose()
   state.global.homeChartTwo = markRaw(echarts.init(homePieRef.value, state.charts.theme))
   var getname = ['TQC主板', 'HSC', 'ECVR-FM']
-  var getvalue = [34.2, 38.87, 17.88, 9.05, 2.05]
+  var getvalue = [34.2, 38.87, 17.88]
   var data = []
   for (var i = 0; i < getname.length; i++) {
     data.push({ name: getname[i], value: getvalue[i] })