Merge branch 'master' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc

src/views/Letter/Letter.vue

@@ -226,7 +226,7 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
-            <el-form-item label="能源种类：" prop="carnature">
+            <el-form-item label="能源种类：" prop="energyType">
               <el-select v-model="carInfo.energyType" placeholder="请选择能源种类" class="widths">
                 <el-option
                   :label="item.name"
@@ -3078,13 +3078,6 @@ export default {
       this.renewalCodedialogVisible = false;
       this.quote();
     },
-    handleClose(done) {
-      this.$confirm("确认关闭？")
-        .then(_ => {
-          done();
-        })
-        .catch(_ => {});
-    },
     //报价轨迹查询
     RadioHistoryChange(e) {
       let params = {

src/views/Sys/Appversion.vue

@@ -4,21 +4,12 @@
     <div class="u-f back">
       <el-input v-model="ssinput" size="small" placeholder="请输入内容" style="width:200px;"></el-input>
       <el-button type="primary" size="small" style="margin:0 20px;" @click="Appcx">查询</el-button>
-      <el-button type="primary" size="small" @click="addshow=true">添加应用</el-button>
+      <el-button type="primary" size="small" @click="addshow = true">添加应用</el-button>
     </div>
     <!-- 表格 -->
-    <el-table
-    
-      :data="tableData1"
-      height="650"
-      border
-      style="width: 100%"
-      v-loading="loading"
-      highlight-current-row
-      :default-sort="{prop: 'createtime', order: 'descending'}"
-      stripe
-      :header-cell-style="{background:'#F2F7FC',fontWeight: '700',color:'#606266'}" size="small"
-    >
+    <el-table :data="tableData1" height="650" border style="width: 100%" v-loading="loading" highlight-current-row
+      :default-sort="{ prop: 'createtime', order: 'descending' }" stripe
+      :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#606266' }" size="small">
       <el-table-column prop="appid" label="AppID" width="300" align="center"></el-table-column>
       <el-table-column prop="appname" label="应用名称" width="300" align="center"></el-table-column>
       <el-table-column prop="describes" label="应用描述" align="center" width="350"></el-table-column>
@@ -33,30 +24,13 @@
     </el-table>
     <!-- 分页功能 -->
     <div class="block">
-      <el-pagination
-        @size-change="applyhandleSizeChange"
-        @current-change="applyhandleCurrentChange"
-        :current-page="applyPage"
-        :page-size="applypageSize"
-        :page-sizes="[10, 20, 50, 100]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="apptotal"
-      ></el-pagination>
+      <el-pagination @size-change="applyhandleSizeChange" @current-change="applyhandleCurrentChange"
+        :current-page="applyPage" :page-size="applypageSize" :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next, jumper" :total="apptotal"></el-pagination>
     </div>
-    <el-dialog
-      title="添加应用"
-      :visible.sync="addshow"
-      :before-close="productHandleClose"
-      @close="closeDialog"
-    >
-      <el-form
-        :label-position="labelPosition"
-        label-width="80px"
-        class="form"
-        ref="applyformLabelAlign"
-        :model="applyformLabelAlign"
-        :rules="applyFormRules"
-      >
+    <el-dialog title="添加应用" :visible.sync="addshow" @close="closeDialog">
+      <el-form :label-position="labelPosition" label-width="80px" class="form" ref="applyformLabelAlign"
+        :model="applyformLabelAlign" :rules="applyFormRules">
         <el-form-item label="AppID" prop="appid">
           <el-input v-model="applyformLabelAlign.appid" placeholder="请输入AppID"></el-input>
         </el-form-item>
@@ -72,13 +46,8 @@
         <el-button type="primary" @click="SubmitapplyForm" size="small">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="应用详情" :visible.sync="AppDetailsshow" :before-close="productHandleClose">
-      <el-form
-        :label-position="labelPosition"
-        label-width="80px"
-        class="form"
-        :model="applyformLabelAlign1"
-      >
+    <el-dialog title="应用详情" :visible.sync="AppDetailsshow">
+      <el-form :label-position="labelPosition" label-width="80px" class="form" :model="applyformLabelAlign1">
         <el-form-item label="AppID" prop="appid">
           <el-input v-model="applyformLabelAlign1.appid" disabled></el-input>
         </el-form-item>
@@ -94,20 +63,9 @@
       </el-form>
     </el-dialog>
     <!--  -->
-    <el-dialog
-      title="新版app发布"
-      :visible.sync="addAppshow"
-      :before-close="productHandleClose"
-      @close="closeDialog"
-    >
-      <el-form
-        :label-position="labelPosition"
-        label-width="100px"
-        class="form"
-        ref="appformLabelAlign"
-        :model="appformLabelAlign"
-        :rules="appFormRules"
-      >
+    <el-dialog :title="dialogtitle" :visible.sync="addAppshow">
+      <el-form :label-position="labelPosition" label-width="100px" class="form" ref="appformLabelAlign"
+        :model="appformLabelAlign" :rules="appFormRules">
         <el-form-item label="AppID" prop="appid">
           <el-input v-model="appformLabelAlign.appid" placeholder="请输入AppID" :style="width"></el-input>
         </el-form-item>
@@ -130,19 +88,15 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="版本号" prop="versionno">
-          <el-input
-            v-model="appformLabelAlign.versionno"
-            placeholder="当前包版本号，必须大于当前线上发行版本号"
-            :style="width"
-          ></el-input>
+          <el-input v-model="appformLabelAlign.versionno" placeholder="当前包版本号，必须大于当前线上发行版本号" :style="width"></el-input>
         </el-form-item>
         <el-form-item label="上传包">
-          <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/">
+          <el-upload class="upload-demo" :auto-upload="false" :on-change="appUpload" action="###">
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
         </el-form-item>
         <el-form-item label="包地址" prop="path">
-          <el-input v-model="appformLabelAlign.path" placeholder="可下载安装包地址" :style="width"></el-input>
+          <el-input v-model="appformLabelAlign.path" placeholder="可下载安装包地址" disabled></el-input>
         </el-form-item>
         <el-form-item label="强制更新" prop="updateflag">
           <el-switch v-model="appformLabelAlign.updateflag"></el-switch>
@@ -156,17 +110,8 @@
         <el-button type="primary" @click="SubmitappForm" size="small">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog
-      title="app版本详情"
-      :visible.sync="VersionDetailsshow"
-      :before-close="productHandleClose"
-    >
-      <el-form
-        :label-position="labelPosition"
-        label-width="80px"
-        class="form"
-        :model="appformLabelAlign1"
-      >
+    <el-dialog :title="dialogtitle" :visible.sync="VersionDetailsshow">
+      <el-form :label-position="labelPosition" label-width="80px" class="form" :model="appformLabelAlign1">
         <el-form-item label="AppID" prop="appid">
           <el-input v-model="appformLabelAlign1.appid" placeholder="请输入AppID" disabled></el-input>
         </el-form-item>
@@ -186,25 +131,16 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="版本号" prop="versionno">
-          <el-input
-            v-model="appformLabelAlign1.versionno"
-            placeholder="当前包版本号，必须大于当前线上发行版本号"
-            disabled
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="上传包">
-          <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/">
-            <el-button size="small" type="primary">点击上传</el-button>
-          </el-upload>
+          <el-input v-model="appformLabelAlign1.versionno" placeholder="当前包版本号，必须大于当前线上发行版本号" disabled></el-input>
         </el-form-item>
         <el-form-item label="包地址" prop="path">
           <el-input v-model="appformLabelAlign1.path" placeholder="可下载安装包地址" disabled></el-input>
         </el-form-item>
         <el-form-item label="强制更新" prop="updateflag">
-          <el-switch v-model="appformLabelAlign1.updateflag"></el-switch>
+          <el-switch v-model="appformLabelAlign1.updateflag" disabled></el-switch>
         </el-form-item>
         <el-form-item label="上线发行" prop="issueflag">
-          <el-switch v-model="appformLabelAlign1.issueflag"></el-switch>
+          <el-switch v-model="appformLabelAlign1.issueflag" disabled></el-switch>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -214,28 +150,22 @@
         <div class="u-f back">
           <el-input v-model="ssinput1" size="small" placeholder="请输入内容" style="width:200px;"></el-input>
           <el-button type="primary" size="small" style="margin:0 20px;" @click="Appcx1">搜索</el-button>
-          <el-button type="primary" size="small" @click="addAppshow=true">发布新版APP</el-button>
+          <el-button type="primary" size="small" @click="addAppshowAdd">发布新版APP</el-button>
         </div>
-        <el-table
-          :data="tableData2"
-          height="650"
-          border
-          style="width: 100%"
-          highlight-current-row
-          :default-sort="{prop: 'createtime', order: 'descending'}"
-          :header-cell-style="{background:'#F2F7FC',fontWeight: '700',color:'#606266'}" size="small"
-        >
+        <el-table :data="tableData2" height="650" border style="width: 100%" highlight-current-row
+          :default-sort="{ prop: 'createtime', order: 'descending' }"
+          :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#606266' }" size="small">
           <el-table-column type="selection" width="55" align="center" fixed></el-table-column>
           <el-table-column prop="appid" label="AppID" width="180" align="center"></el-table-column>
           <el-table-column prop="title" label="更新标题" width="300" align="center"></el-table-column>
           <el-table-column prop="apptype" label="安装包类型" align="center" width="200">
-            <template slot-scope="scope" >
-                <div slot="reference" class="name-wrapper" v-if="scope.row.apptype=='apk'">
-                  <el-tag  size="medium">原生App安装包</el-tag>
-                </div>
-                  <div slot="reference" class="name-wrapper" v-if="scope.row.apptype=='wgt'">
-                  <el-tag type="success" size="medium">wgt资源包</el-tag>
-                </div>
+            <template slot-scope="scope">
+              <div slot="reference" class="name-wrapper" v-if="scope.row.apptype == 'apk'">
+                <el-tag size="medium">原生App安装包</el-tag>
+              </div>
+              <div slot="reference" class="name-wrapper" v-if="scope.row.apptype == 'wgt'">
+                <el-tag type="success" size="medium">wgt资源包</el-tag>
+              </div>
             </template>
           </el-table-column>
           <el-table-column prop="platform" label="平台" align="center" width="100"></el-table-column>
@@ -244,35 +174,17 @@
           <el-table-column prop="createtime" label="上传时间" align="center" width="200" sortable></el-table-column>
           <el-table-column label="操作" align="center" width="230" fixed="right">
             <template slot-scope="scope">
-              <el-button
-                size="small"
-                type="primary"
-                @click="VersionDetails(scope.$index, scope.row)"
-              >详情</el-button>
-              <el-button
-                size="small"
-                type="warning"
-                @click="Versionupdate(scope.$index, scope.row)"
-              >修改</el-button>
-              <el-button
-                type="danger"
-                size="small"
-                @click="Versiondelete(scope.$index, scope.row)"
-              >删除</el-button>
+              <el-button size="small" type="primary" @click="VersionDetails(scope.$index, scope.row)">详情</el-button>
+              <el-button size="small" type="warning" @click="Versionupdate(scope.$index, scope.row)">修改</el-button>
+              <el-button type="danger" size="small" @click="Versiondelete(scope.$index, scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
         <!-- 分页功能 -->
         <div class="block">
-          <el-pagination
-            @size-change="apphandleSizeChange"
-            @current-change="apphandleCurrentChange"
-            :current-page="appPage"
-            :page-size="apppageSize"
-            :page-sizes="[10, 20, 50, 100]"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="versiontotal"
-          ></el-pagination>
+          <el-pagination @size-change="apphandleSizeChange" @current-change="apphandleCurrentChange"
+            :current-page="appPage" :page-size="apppageSize" :page-sizes="[10, 20, 50, 100]"
+            layout="total, sizes, prev, pager, next, jumper" :total="versiontotal"></el-pagination>
         </div>
       </div>
     </el-drawer>
@@ -285,16 +197,17 @@ export default {
   },
   data() {
     return {
+      dialogtitle: "新版app发布",
       width: "width:400px",
       loading: false,
       // 应用列表分页
       applyPage: 1,
       applypageSize: 20,
-      apptotal: "",
+      apptotal: 0,
       // 版本列表分页
       appPage: 1,
       apppageSize: 50,
-      versiontotal: "",
+      versiontotal: 0,
       //搜索
       ssinput: "",
       ssinput1: "",
@@ -374,24 +287,42 @@ export default {
   },
 
   methods: {
-  
     radioChange(e) {
-      console.log(e);
     },
     //app查询
     Appcx() {
-      console.log(this.ssinput);
       this.ssinput = "";
     },
     // 版本查询
     Appcx1() {
-      console.log(this.ssinput1);
       this.ssinput1 = "";
     },
     // 添加app应用
     add() {
       this.addshow = true;
     },
+    addAppshowAdd() {
+      this.appformLabelAlign.title = "";
+      this.appformLabelAlign.content = "";
+      this.appformLabelAlign.apptype = "";
+      this.appformLabelAlign.versionno = "";
+      this.appformLabelAlign.path = "";
+      this.appformLabelAlign.updateflag = false;
+      this.appformLabelAlign.issueflag = false;
+      this.addAppshow = true;
+    },
+    //app上传
+    appUpload(file) {
+      var file = file.raw;
+      const params = new FormData() // 声明formData数据类型
+      params.append("multipartFile", file)
+      params.append("type", 'app')
+      this.$api.letter.uploadFile(params).then(res => {
+        if (res.code == "200") {
+          this.appformLabelAlign.path = this.global.baseUrl + res.data.url;
+        }
+      })
+    },
     //版本详情
     VersionDetails(index, row) {
       this.$api.app.findById(row.sid).then((res) => {
@@ -413,6 +344,7 @@ export default {
     },
     //版本更新
     Versionupdate(index, row) {
+      this.dialogtitle = "app版本编辑"
       this.$api.app.findById(row.sid).then((res) => {
         if (res.code == "200") {
           if (res.data.issueflag == "1") {
@@ -490,12 +422,8 @@ export default {
           });
         });
     },
-    onConfirm(index) {
-      console.log(index);
-    },
     //应用详情
     AppDetails(index, row) {
-      console.log(row);
       this.applyformLabelAlign1 = row;
       this.AppDetailsshow = true;
     },
@@ -514,7 +442,6 @@ export default {
     // 应用当前页
     applyhandleCurrentChange(val) {
       this.applyPage = val;
-      console.log(this.applyPage);
     },
     // 设置每页条数
     apphandleSizeChange(val) {
@@ -526,21 +453,10 @@ export default {
     apphandleCurrentChange(val) {
       this.appPage = val;
       this.versiondata();
-
-    },
-    productHandleClose(done) {
-      console.log(done);
-      //弹框关闭事件
-      this.$confirm("确认关闭？")
-        .then((_) => {
-          done();
-        })
-        .catch((_) => {});
     },
     // 探矿关闭回调
     closeDialog() {
       this.$refs["applyformLabelAlign"].resetFields();
-      this.$refs["appformLabelAlign"].resetFields();
     },
     appdata() {
       this.loading = true;
@@ -569,7 +485,6 @@ export default {
         pageSize: this.apppageSize,
       };
       this.$api.app.VersionfindPage(pageRequest).then((res) => {
-        console.log(res);
         var data1 = res.data.content;
         data1.map((ele) => {
           ele.createtime = this.time(ele.createtime);
@@ -618,7 +533,6 @@ export default {
           } else {
             this.appformLabelAlign.updateflag = 0;
           }
-          console.log(this.appformLabelAlign);
 
           this.$api.app.VersionSave(this.appformLabelAlign).then((res) => {
             if (res.code == 200) {
@@ -650,7 +564,6 @@ export default {
         date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
       // const s = date.getSeconds(); // 秒
       const dateString = Y + M + D + h + m;
-      // console.log('dateString', dateString); // > dateString 2021-07-06 14:23
       return dateString;
     },
   },
@@ -661,17 +574,21 @@ export default {
   padding: 15px;
   box-sizing: border-box;
 }
+
 .back {
   margin: 20px 0;
   box-sizing: border-box;
 }
+
 .block {
   margin-top: 10px;
 }
+
 .form {
   padding: 20px 50px;
   box-sizing: border-box;
 }
+
 .drawer {
   padding: 20px;
   box-sizing: border-box;