站点管理 修复 对接 回显 等

.history/src/views/siteManage/basicInfo/index_20211018102819.vue

@@ -1,294 +0,0 @@
-<template>
-  <div class="siteManage-main basic-info-page">
-    <el-form
-      :model="ruleForm"
-      :rules="rules"
-      ref="ruleForm"
-      label-width="100px"
-      class="demo-ruleForm"
-    >
-      <el-row style="min-width: 1100px">
-        <el-col :span="8" :gutter="20">
-          <div class="grid-content bg-purple">
-            <el-form-item label="站点名称" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-
-            <el-form-item label="站点类型" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="用户公司" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-
-            <el-form-item
-              label="投运时间:"
-              prop="planStartDate"
-              style="margin-top: 0px"
-            >
-              <el-date-picker
-                v-model="ruleForm.planStartDate"
-                type="datetime"
-                placeholder="选择日期时间"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="服务截止:" prop="planEndDate">
-              <el-date-picker
-                v-model="ruleForm.planEndDate"
-                type="datetime"
-                placeholder="选择日期时间"
-              >
-              </el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="装机容量：" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="供电类型" prop="resource">
-              <el-radio-group v-model="ruleForm.resource">
-                <el-radio label="单路"></el-radio>
-                <el-radio label="双路"></el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="电压等级" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="站点地址" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="所属台区" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="站点坐标" prop="name">
-              <el-input v-model="ruleForm.name">
-                <i
-                  :default-slot="suffix"
-                  class="el-input__icon el-icon-location-outline"
-                ></i>
-              </el-input>
-            </el-form-item>
-          </div>
-        </el-col>
-        <el-col :span="8" :gutter="20">
-          <el-form-item label="监察：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择">
-              <el-option label="监察1" value="1"></el-option>
-              <el-option label="监察2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <!-- <el-form-item label="联系方式" prop="name">
-            <el-input v-model="ruleForm.name"></el-input>
-          </el-form-item> -->
-          <el-form-item label="折标准煤：" prop="name">
-            <el-input v-model="ruleForm.name"></el-input>
-          </el-form-item>
-
-          <el-form-item label="折标准煤：" prop="resource">
-            <el-radio-group v-model="ruleForm.resource">
-              <el-radio label="电力（等价）"></el-radio>
-              <el-radio label="电力（当量）"></el-radio>
-            </el-radio-group>
-            <div style="opacity: 0.45">0.000404吨标准煤/千瓦时</div>
-          </el-form-item>
-
-          <a class="goArchive">现场档案</a>
-
-          <div class="blockTitle mt-60 mb-20">动态属性</div>
-          <el-form-item label="故障动态：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-              <el-option label="故障动态1" value="1"></el-option>
-              <el-option label="故障动态2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="实时负荷：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-              <el-option label="实时负荷1" value="1"></el-option>
-              <el-option label="实时负荷2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="总用电量：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-              <el-option label="总用电量1" value="1"></el-option>
-              <el-option label="总用电量2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="功率因数：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-              <el-option label="选择1" value="1"></el-option>
-              <el-option label="选择2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" :gutter="20">
-          <div class="grid-content bg-purple">
-            <div class="grid-content bg-purple-light">
-              <div class="blockTitle mb-20">站点照片</div>
-              <el-form-item label="选择文件" prop="delivery">
-                <el-upload
-                  action="#"
-                  list-type="picture-card"
-                  :auto-upload="false"
-                  :limit="3"
-                >
-                <!-- slot="default" -->
-                  <i  class="el-icon-plus"></i>
-                  <!-- :default-slot="{ file }" -->
-                  <div  >
-                    <!-- <img
-                      class="el-upload-list__item-thumbnail"
-                      :src="file.url"
-                      alt=""
-                    /> -->
-                    <span class="el-upload-list__item-actions">
-                      <span
-                        class="el-upload-list__item-preview"
-                        @click="handlePictureCardPreview(file)"
-                      >
-                        <!-- <i class="el-icon-zoom-in"></i> -->
-                      </span>
-                      <span
-                        v-if="!disabled"
-                        class="el-upload-list__item-delete"
-                        @click="handleRemove(file)"
-                      >
-                        <i class="el-icon-delete"></i>
-                      </span>
-                    </span>
-                  </div>
-                </el-upload>
-                <el-dialog v-model="dialogVisible">
-                  <img width="100%" :src="dialogImageUrl" alt="" />
-                </el-dialog>
-              </el-form-item>
-
-              <!-- <div class="blockTitle mt-40 mb-20">添加更多属性</div> -->
-              <el-form-item label="联系人" prop="name">
-                <el-input v-model="ruleForm.name"></el-input>
-              </el-form-item>
-              <el-form-item label="联系方式" prop="name">
-                <el-input v-model="ruleForm.name"></el-input>
-              </el-form-item>
-               <el-form-item label="联系人2" prop="spare_user_name">
-                <el-input v-model="ruleForm.spare_user_name"></el-input>
-              </el-form-item>
-              <el-form-item label="联系方式2" prop="spare_phone">
-                <el-input v-model="ruleForm.spare_phone"></el-input>
-              </el-form-item>
-            </div>
-            <el-form-item>
-              <el-button type="primary" @click="submitForm('ruleForm')"
-                >保存</el-button
-              >
-              <el-button @click="resetForm('ruleForm')">取消</el-button>
-            </el-form-item>
-          </div>
-        </el-col>
-      </el-row>
-    </el-form>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "BasicInfo",
-  data() {
-    return {
-      dialogImageUrl: "",
-      dialogVisible: false,
-      disabled: false,
-      ruleForm: {
-        name: "",
-        region: "",
-        date1: "",
-        date2: "",
-        delivery: false,
-        type: [],
-        resource: "",
-        desc: "",
-        planStartTime: "",
-        planEndTime: "",
-      },
-      rules: {
-        planStartDate: [
-          { required: true, message: "请选择开始日期", trigger: "change" },
-        ],
-        planEndDate: [
-          { required: true, message: "请输入结束日期", trigger: "change" },
-        ],
-        name: [
-          { required: true, message: "请输入站点名称", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-        ],
-         spare_user_name: [
-          { required: true, message: "请输入联系人2", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-        ],
-        spare_phone: [
-          { required: true, message: "请输入联系方式2", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-        ],
-        region: [
-          { required: true, message: "请选择活动区域", trigger: "change" },
-        ],
-        date1: [
-          {
-            type: "date",
-            required: true,
-            message: "请选择日期",
-            trigger: "change",
-          },
-        ],
-        date2: [
-          {
-            type: "date",
-            required: true,
-            message: "请选择时间",
-            trigger: "change",
-          },
-        ],
-        type: [
-          {
-            type: "array",
-            required: true,
-            message: "请至少选择一个活动性质",
-            trigger: "change",
-          },
-        ],
-        resource: [
-          { required: true, message: "请选择活动资源", trigger: "change" },
-        ],
-        desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }],
-      },
-    };
-  },
-  methods: {
-    handleRemove(file) {
-      console.log(file);
-    },
-    handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
-    },
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          alert("submit!");
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    resetForm(formName) {
-      this.$refs[formName].resetFields();
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-</style>

.history/src/views/siteManage/basicInfo/index_20211018160905.vue

@@ -1,294 +0,0 @@
-<template>
-  <div class="siteManage-main basic-info-page">
-    <el-form
-      :model="ruleForm"
-      :rules="rules"
-      ref="ruleForm"
-      label-width="130px"
-      class="demo-ruleForm"
-    >
-      <el-row style="min-width: 1100px">
-        <el-col :span="8" :gutter="20">
-          <div class="grid-content bg-purple">
-            <el-form-item label="站点名称" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-
-            <el-form-item label="站点类型" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="用户公司" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-
-            <el-form-item
-              label="投运时间:"
-              prop="planStartDate"
-              style="margin-top: 0px"
-            >
-              <el-date-picker
-                v-model="ruleForm.planStartDate"
-                type="datetime"
-                placeholder="选择日期时间"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="服务截止:" prop="planEndDate">
-              <el-date-picker
-                v-model="ruleForm.planEndDate"
-                type="datetime"
-                placeholder="选择日期时间"
-              >
-              </el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="装机容量：" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="供电类型" prop="resource">
-              <el-radio-group v-model="ruleForm.resource">
-                <el-radio label="单路"></el-radio>
-                <el-radio label="双路"></el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="电压等级" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="站点地址" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="所属台区" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="站点坐标" prop="name">
-              <el-input v-model="ruleForm.name">
-                <i
-                  :default-slot="suffix"
-                  class="el-input__icon el-icon-location-outline"
-                ></i>
-              </el-input>
-            </el-form-item>
-          </div>
-        </el-col>
-        <el-col :span="8" :gutter="20">
-          <el-form-item label="监察：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择">
-              <el-option label="监察1" value="1"></el-option>
-              <el-option label="监察2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <!-- <el-form-item label="联系方式" prop="name">
-            <el-input v-model="ruleForm.name"></el-input>
-          </el-form-item> -->
-          <el-form-item label="折标准煤：" prop="name">
-            <el-input v-model="ruleForm.name"></el-input>
-          </el-form-item>
-
-          <el-form-item label="折标准煤：" prop="resource">
-            <el-radio-group v-model="ruleForm.resource">
-              <el-radio label="电力（等价）"></el-radio>
-              <el-radio label="电力（当量）"></el-radio>
-            </el-radio-group>
-            <div style="opacity: 0.45">0.000404吨标准煤/千瓦时</div>
-          </el-form-item>
-
-          <a class="goArchive">现场档案</a>
-
-          <div class="blockTitle mt-60 mb-20">动态属性</div>
-          <el-form-item label="故障动态：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-              <el-option label="故障动态1" value="1"></el-option>
-              <el-option label="故障动态2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="实时负荷：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-              <el-option label="实时负荷1" value="1"></el-option>
-              <el-option label="实时负荷2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="总用电量：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-              <el-option label="总用电量1" value="1"></el-option>
-              <el-option label="总用电量2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="功率因数：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-              <el-option label="选择1" value="1"></el-option>
-              <el-option label="选择2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" :gutter="20">
-          <div class="grid-content bg-purple">
-            <div class="grid-content bg-purple-light">
-              <div class="blockTitle mb-20">站点照片</div>
-              <el-form-item label="选择文件" prop="delivery">
-                <el-upload
-                  action="#"
-                  list-type="picture-card"
-                  :auto-upload="false"
-                  :limit="3"
-                >
-                <!-- slot="default" -->
-                  <i  class="el-icon-plus"></i>
-                  <!-- :default-slot="{ file }" -->
-                  <div  >
-                    <!-- <img
-                      class="el-upload-list__item-thumbnail"
-                      :src="file.url"
-                      alt=""
-                    /> -->
-                    <span class="el-upload-list__item-actions">
-                      <span
-                        class="el-upload-list__item-preview"
-                        @click="handlePictureCardPreview(file)"
-                      >
-                        <!-- <i class="el-icon-zoom-in"></i> -->
-                      </span>
-                      <span
-                        v-if="!disabled"
-                        class="el-upload-list__item-delete"
-                        @click="handleRemove(file)"
-                      >
-                        <i class="el-icon-delete"></i>
-                      </span>
-                    </span>
-                  </div>
-                </el-upload>
-                <el-dialog v-model="dialogVisible">
-                  <img width="100%" :src="dialogImageUrl" alt="" />
-                </el-dialog>
-              </el-form-item>
-
-              <!-- <div class="blockTitle mt-40 mb-20">添加更多属性</div> -->
-              <el-form-item label="联系人" prop="name">
-                <el-input v-model="ruleForm.name"></el-input>
-              </el-form-item>
-              <el-form-item label="联系方式" prop="name">
-                <el-input v-model="ruleForm.name"></el-input>
-              </el-form-item>
-               <el-form-item label="联系人2" prop="spare_user_name">
-                <el-input v-model="ruleForm.spare_user_name"></el-input>
-              </el-form-item>
-              <el-form-item label="联系方式2" prop="spare_phone">
-                <el-input v-model="ruleForm.spare_phone"></el-input>
-              </el-form-item>
-            </div>
-            <el-form-item>
-              <el-button type="primary" @click="submitForm('ruleForm')"
-                >保存</el-button
-              >
-              <el-button @click="resetForm('ruleForm')">取消</el-button>
-            </el-form-item>
-          </div>
-        </el-col>
-      </el-row>
-    </el-form>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "BasicInfo",
-  data() {
-    return {
-      dialogImageUrl: "",
-      dialogVisible: false,
-      disabled: false,
-      ruleForm: {
-        name: "",
-        region: "",
-        date1: "",
-        date2: "",
-        delivery: false,
-        type: [],
-        resource: "",
-        desc: "",
-        planStartTime: "",
-        planEndTime: "",
-      },
-      rules: {
-        planStartDate: [
-          { required: true, message: "请选择开始日期", trigger: "change" },
-        ],
-        planEndDate: [
-          { required: true, message: "请输入结束日期", trigger: "change" },
-        ],
-        name: [
-          { required: true, message: "请输入站点名称", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-        ],
-         spare_user_name: [
-          { required: true, message: "请输入联系人2", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-        ],
-        spare_phone: [
-          { required: true, message: "请输入联系方式2", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-        ],
-        region: [
-          { required: true, message: "请选择活动区域", trigger: "change" },
-        ],
-        date1: [
-          {
-            type: "date",
-            required: true,
-            message: "请选择日期",
-            trigger: "change",
-          },
-        ],
-        date2: [
-          {
-            type: "date",
-            required: true,
-            message: "请选择时间",
-            trigger: "change",
-          },
-        ],
-        type: [
-          {
-            type: "array",
-            required: true,
-            message: "请至少选择一个活动性质",
-            trigger: "change",
-          },
-        ],
-        resource: [
-          { required: true, message: "请选择活动资源", trigger: "change" },
-        ],
-        desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }],
-      },
-    };
-  },
-  methods: {
-    handleRemove(file) {
-      console.log(file);
-    },
-    handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
-    },
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          alert("submit!");
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    resetForm(formName) {
-      this.$refs[formName].resetFields();
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-</style>

.history/src/views/siteManage/basicInfo/index_20211018160909.vue

@@ -1,294 +0,0 @@
-<template>
-  <div class="siteManage-main basic-info-page">
-    <el-form
-      :model="ruleForm"
-      :rules="rules"
-      ref="ruleForm"
-      label-width="100px"
-      class="demo-ruleForm"
-    >
-      <el-row style="min-width: 1100px">
-        <el-col :span="8" :gutter="20">
-          <div class="grid-content bg-purple">
-            <el-form-item label="站点名称" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-
-            <el-form-item label="站点类型" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="用户公司" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-
-            <el-form-item
-              label="投运时间:"
-              prop="planStartDate"
-              style="margin-top: 0px"
-            >
-              <el-date-picker
-                v-model="ruleForm.planStartDate"
-                type="datetime"
-                placeholder="选择日期时间"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="服务截止:" prop="planEndDate">
-              <el-date-picker
-                v-model="ruleForm.planEndDate"
-                type="datetime"
-                placeholder="选择日期时间"
-              >
-              </el-date-picker>
-            </el-form-item>
-
-            <el-form-item label="装机容量：" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="供电类型" prop="resource">
-              <el-radio-group v-model="ruleForm.resource">
-                <el-radio label="单路"></el-radio>
-                <el-radio label="双路"></el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="电压等级" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="站点地址" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="所属台区" prop="name">
-              <el-input v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="站点坐标" prop="name">
-              <el-input v-model="ruleForm.name">
-                <i
-                  :default-slot="suffix"
-                  class="el-input__icon el-icon-location-outline"
-                ></i>
-              </el-input>
-            </el-form-item>
-          </div>
-        </el-col>
-        <el-col :span="8" :gutter="20">
-          <el-form-item label="监察：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择">
-              <el-option label="监察1" value="1"></el-option>
-              <el-option label="监察2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <!-- <el-form-item label="联系方式" prop="name">
-            <el-input v-model="ruleForm.name"></el-input>
-          </el-form-item> -->
-          <el-form-item label="折标准煤：" prop="name">
-            <el-input v-model="ruleForm.name"></el-input>
-          </el-form-item>
-
-          <el-form-item label="折标准煤：" prop="resource">
-            <el-radio-group v-model="ruleForm.resource">
-              <el-radio label="电力（等价）"></el-radio>
-              <el-radio label="电力（当量）"></el-radio>
-            </el-radio-group>
-            <div style="opacity: 0.45">0.000404吨标准煤/千瓦时</div>
-          </el-form-item>
-
-          <a class="goArchive">现场档案</a>
-
-          <div class="blockTitle mt-60 mb-20">动态属性</div>
-          <el-form-item label="故障动态：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-              <el-option label="故障动态1" value="1"></el-option>
-              <el-option label="故障动态2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="实时负荷：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-              <el-option label="实时负荷1" value="1"></el-option>
-              <el-option label="实时负荷2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="总用电量：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-              <el-option label="总用电量1" value="1"></el-option>
-              <el-option label="总用电量2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="功率因数：" prop="region">
-            <el-select v-model="ruleForm.region" placeholder="请选择活动区域">
-              <el-option label="选择1" value="1"></el-option>
-              <el-option label="选择2" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" :gutter="20">
-          <div class="grid-content bg-purple">
-            <div class="grid-content bg-purple-light">
-              <div class="blockTitle mb-20">站点照片</div>
-              <el-form-item label="选择文件" prop="delivery">
-                <el-upload
-                  action="#"
-                  list-type="picture-card"
-                  :auto-upload="false"
-                  :limit="3"
-                >
-                <!-- slot="default" -->
-                  <i  class="el-icon-plus"></i>
-                  <!-- :default-slot="{ file }" -->
-                  <div  >
-                    <!-- <img
-                      class="el-upload-list__item-thumbnail"
-                      :src="file.url"
-                      alt=""
-                    /> -->
-                    <span class="el-upload-list__item-actions">
-                      <span
-                        class="el-upload-list__item-preview"
-                        @click="handlePictureCardPreview(file)"
-                      >
-                        <!-- <i class="el-icon-zoom-in"></i> -->
-                      </span>
-                      <span
-                        v-if="!disabled"
-                        class="el-upload-list__item-delete"
-                        @click="handleRemove(file)"
-                      >
-                        <i class="el-icon-delete"></i>
-                      </span>
-                    </span>
-                  </div>
-                </el-upload>
-                <el-dialog v-model="dialogVisible">
-                  <img width="100%" :src="dialogImageUrl" alt="" />
-                </el-dialog>
-              </el-form-item>
-
-              <!-- <div class="blockTitle mt-40 mb-20">添加更多属性</div> -->
-              <el-form-item label="联系人" prop="name">
-                <el-input v-model="ruleForm.name"></el-input>
-              </el-form-item>
-              <el-form-item label="联系方式" prop="name">
-                <el-input v-model="ruleForm.name"></el-input>
-              </el-form-item>
-               <el-form-item label="联系人2" prop="spare_user_name">
-                <el-input v-model="ruleForm.spare_user_name"></el-input>
-              </el-form-item>
-              <el-form-item label="联系方式2" prop="spare_phone">
-                <el-input v-model="ruleForm.spare_phone"></el-input>
-              </el-form-item>
-            </div>
-            <el-form-item>
-              <el-button type="primary" @click="submitForm('ruleForm')"
-                >保存</el-button
-              >
-              <el-button @click="resetForm('ruleForm')">取消</el-button>
-            </el-form-item>
-          </div>
-        </el-col>
-      </el-row>
-    </el-form>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "BasicInfo",
-  data() {
-    return {
-      dialogImageUrl: "",
-      dialogVisible: false,
-      disabled: false,
-      ruleForm: {
-        name: "",
-        region: "",
-        date1: "",
-        date2: "",
-        delivery: false,
-        type: [],
-        resource: "",
-        desc: "",
-        planStartTime: "",
-        planEndTime: "",
-      },
-      rules: {
-        planStartDate: [
-          { required: true, message: "请选择开始日期", trigger: "change" },
-        ],
-        planEndDate: [
-          { required: true, message: "请输入结束日期", trigger: "change" },
-        ],
-        name: [
-          { required: true, message: "请输入站点名称", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-        ],
-         spare_user_name: [
-          { required: true, message: "请输入联系人2", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-        ],
-        spare_phone: [
-          { required: true, message: "请输入联系方式2", trigger: "blur" },
-          { min: 3, max: 5, message: "长度在 3 到 5 个字符", trigger: "blur" },
-        ],
-        region: [
-          { required: true, message: "请选择活动区域", trigger: "change" },
-        ],
-        date1: [
-          {
-            type: "date",
-            required: true,
-            message: "请选择日期",
-            trigger: "change",
-          },
-        ],
-        date2: [
-          {
-            type: "date",
-            required: true,
-            message: "请选择时间",
-            trigger: "change",
-          },
-        ],
-        type: [
-          {
-            type: "array",
-            required: true,
-            message: "请至少选择一个活动性质",
-            trigger: "change",
-          },
-        ],
-        resource: [
-          { required: true, message: "请选择活动资源", trigger: "change" },
-        ],
-        desc: [{ required: true, message: "请填写活动形式", trigger: "blur" }],
-      },
-    };
-  },
-  methods: {
-    handleRemove(file) {
-      console.log(file);
-    },
-    handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
-      this.dialogVisible = true;
-    },
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          alert("submit!");
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    resetForm(formName) {
-      this.$refs[formName].resetFields();
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-</style>

src/api/siteManage/basicInfo.js

@@ -29,9 +29,6 @@ export function siteAdd(params) {
 }
 
 
-
-
-
 // 台区列表查询
 export function platformList(params) {
     return request({
@@ -39,4 +36,13 @@ export function platformList(params) {
         method: 'GET',
         params,
     })
+}
+
+// 站点详情查询
+export function getSite(params) {
+    return request({
+        url: '/site/getSite',
+        method: 'GET',
+        params,
+    })
 }

src/api/siteManage/powerScore.js

@@ -7,4 +7,22 @@ export function powerQualityAdd(params) {
         method: 'POST',
         data: params,
     })
+}
+//评分配置-修改
+export function powerQualityUpdate(params) {
+    return request({
+        url: '/powerQualityConfig/powerQualityUpdate',
+        method: 'POST',
+        data: params,
+    })
+}
+
+
+// 评分配置-详情查询
+export function powerQualityList(params) {
+    return request({
+        url: '/powerQualityConfig/powerQualityList',
+        method: 'GET',
+        params,
+    })
 }

src/views/dataManage/sameAnalysis/ehcarts/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div shadow="never" class="homeBoxCard" v-loading="loading">
-    <div>{{aa}}</div>
+    <!-- <div>{{aa}}</div> -->
     <div :style="'height:' + Height" ref="sumeChartRef" />
   </div>
 </template>
@@ -184,15 +184,15 @@ export default defineComponent({
 
     const writeValue = (val) => {
       val
-      ecahrts()
+     
       getData()
+       ecahrts()
     }
 
     //监听变化
     watch(
       () => props.ecahrtsData,
       (newVal, oldVal, clear) => {
-        alert(1)
         // 执行异步任务，并得到关闭异步任务的 id
         // console.log(newVal)
         let id = writeValue(newVal, oldVal)

src/views/siteManage/addSiteCom.vue

@@ -94,8 +94,6 @@ export default defineComponent({
           // 走保存请求
           if(form.value.region){
             //选择模板
-
-
             alert('选择模板')
           }else{
             // 无选择模板

src/views/siteManage/basicInfo/index.vue

@@ -28,15 +28,15 @@
             >
               <el-date-picker
                 v-model="ruleForm.operationTime"
-                width="100%"
-                type="datetime"
+                style="width: 100%"
+                type="date"
                 placeholder="选择日期时间"
               ></el-date-picker>
             </el-form-item>
             <el-form-item label="服务截止：" prop="serviceDeadline">
               <el-date-picker
                 v-model="ruleForm.serviceDeadline"
-                type="datetime"
+                type="date"
                 placeholder="选择日期时间"
               ></el-date-picker>
             </el-form-item>
@@ -177,6 +177,7 @@
             <div class="grid-content bg-purple-light">
               <!-- 站点照片start -->
               <div class="blockTitle mb-20">站点照片</div>
+              <!-- <img v-if="ruleForm.value.sitePictureOne" :src="ruleForm.value.sitePictureOne" alt=""> -->
               <el-form-item label="选择文件：" prop="delivery">
                 <el-upload
                   :action="uploadUrl"
@@ -224,7 +225,7 @@
 </template>
 
 <script>
-import { defineComponent, ref, onMounted, reactive, toRefs } from 'vue'
+import { defineComponent, ref, onMounted, reactive, toRefs, watch } from 'vue'
 import * as api from '@/api/siteManage/basicInfo'
 import { ElMessage } from 'element-plus'
 
@@ -236,9 +237,10 @@ export default defineComponent({
   props: {
     siteId: Number,
   },
-  setup() {
+  setup(props) {
     const store = useStore()
     const formInfo = ref(null)
+    const formStatus = ref('')
     const dialogImageUrl = ref('')
     const dialogVisible = ref(false)
     const disabled = ref(false)
@@ -246,40 +248,7 @@ export default defineComponent({
     const dropData = ref([])
     const dropData2 = ref([])
     const platFormData = ref([])
-    const ruleForm = ref({
-      siteName: '',
-      siteType: '',
-      userCompany: '',
-      operationTime: '',
-      serviceDeadline: '',
-      installedCapacity: '',
-      powerSupplyType: '1',
-      voltageLevel: '',
-      siteAddress: '',
-      longitude: '',
-      latitude: '',
-      region: '1',
-      stationAreaId: '',
-
-      demolitionStandardCoal1: '',
-      demolitionStandardCoal: '1',
-      rheologicalChange: '',
-      routeId: '',
-
-      faultStatus: '',
-      realTimeLoad: '',
-      totalElectricity: '',
-      powerFactor: '',
-
-      userName: '',
-      phone: '',
-      spareUserName: '',
-      sparePhone: '',
-
-      sitePictureOne: '',
-      sitePictureTwo: '',
-      sitePictureThree: '',
-    })
+    const ruleForm = ref({})
 
     function handlePictureCardPreview(file) {
       console.log('file')
@@ -325,95 +294,6 @@ export default defineComponent({
       console.log(dataSet.fileList)
     }
 
-    //表单提交
-    function submitForm() {
-      ruleForm.value.sitePictureOne = dataSet.fileList[0]
-      ruleForm.value.sitePictureTwo = dataSet.fileList[1]
-      ruleForm.value.sitePictureThree = dataSet.fileList[2]
-
-      ruleForm.value.operationTime
-        ? (ruleForm.value.operationTime = parseTime(
-            ruleForm.value.operationTime
-          ))
-        : ''
-      ruleForm.value.serviceDeadline
-        ? (ruleForm.value.serviceDeadline = parseTime(
-            ruleForm.value.serviceDeadline
-          ))
-        : ''
-
-      formInfo.value.validate((valid) => {
-        if (valid) {
-          store
-          //  store.commit('TimeAll_function')
-          // const time = store.state.Time_Data
-          // ruleForm.value.operationTime = time[0]
-          // ruleForm.value.serviceDeadline = time[1]
-
-          api
-            .siteAdd({
-              site: {
-                siteName: ruleForm.value.siteName,
-                installedCapacity: ruleForm.value.installedCapacity,
-                siteAddress: ruleForm.value.siteAddress,
-                region: ruleForm.value.region,
-                stationAreaId: ruleForm.value.stationAreaId,
-                longitude: ruleForm.value.longitude,
-                latitude: ruleForm.value.latitude,
-                userName: ruleForm.value.userName,
-                phone: ruleForm.value.phone,
-                spareUserName: ruleForm.value.spareUserName,
-                sparePhone: ruleForm.value.sparePhone,
-                rheologicalChange: ruleForm.value.rheologicalChange,
-                routeId: ruleForm.value.routeId,
-                groupingId: '1', //字段值待写活
-              },
-              siteDynamicProperties: {
-                siteType: ruleForm.value.siteType,
-                userCompany: ruleForm.value.userCompany,
-                operationTime: ruleForm.value.operationTime,
-                serviceDeadline: ruleForm.value.serviceDeadline,
-                powerSupplyType: ruleForm.value.powerSupplyType,
-                voltageLevel: ruleForm.value.voltageLevel,
-                demolitionStandardCoal: ruleForm.value.demolitionStandardCoal,
-                demolitionStandardCoal1: ruleForm.value.demolitionStandardCoal1,
-                faultStatus: ruleForm.value.faultStatus,
-                realTimeLoad: ruleForm.value.realTimeLoad,
-                totalElectricity: ruleForm.value.totalElectricity,
-                powerFactor: ruleForm.value.powerFactor,
-                sitePictureOne: ruleForm.value.sitePictureOne,
-                sitePictureTwo: ruleForm.value.sitePictureTwo,
-                sitePictureThree: ruleForm.value.sitePictureThree,
-              },
-            })
-            .then((requset) => {
-              if (requset.status === 'SUCCESS') {
-                ElMessage.success({
-                  message: '新增成功',
-                  type: 'success',
-                })
-                // if (props.dialogTitle === '新增') {
-                //   ElMessage.success({
-                //     message: '新增成功',
-                //     type: 'success',
-                //   })
-                // } else {
-                //   ElMessage.success({
-                //     message: '修改成功',
-                //     type: 'success',
-                //   })
-                // }
-              } else {
-                ElMessage.error(requset.msg)
-              }
-            })
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
-    }
-
     function resetForm() {
       formInfo.value.resetFields()
     }
@@ -446,8 +326,127 @@ export default defineComponent({
       })
     }
 
+    //站点详情请求
+    function getSite() {
+      api.getSite({ id: props.siteId }).then((requset) => {
+        if (requset.status === 'SUCCESS') {
+          console.log(requset.data[0])
+          ruleForm.value = requset.data[0]
+          ruleForm.value.region? ruleForm.value.region = requset.data[0].region.toString():''
+          ruleForm.value.powerSupplyType = ruleForm.value.powerSupplyType?
+            requset.data[0].powerSupplyType.toString():''
+          ruleForm.value.demolitionStandardCoal? ruleForm.value.demolitionStandardCoal =
+            requset.data[0].demolitionStandardCoal.toString():''
+          //  ruleForm.value.roleId=requset.data[0].roleId.toString()
+
+          if (requset.data[0]) {
+            formStatus.value = '修改'
+          } else {
+            formStatus.value = '新增'
+          }
+        } else {
+          ElMessage.error(requset.msg)
+        }
+      })
+    }
+
+    //表单提交
+    function submitForm() {
+      ruleForm.value.sitePictureOne = dataSet.fileList[0]
+      ruleForm.value.sitePictureTwo = dataSet.fileList[1]
+      ruleForm.value.sitePictureThree = dataSet.fileList[2]
+
+      ruleForm.value.operationTime
+        ? (ruleForm.value.operationTime = parseTime(
+            ruleForm.value.operationTime
+          ).substring(0, 10))
+        : ''
+      ruleForm.value.serviceDeadline
+        ? (ruleForm.value.serviceDeadline = parseTime(
+            ruleForm.value.serviceDeadline
+          ).substring(0, 10))
+        : ''
+
+      formInfo.value.validate((valid) => {
+        if (valid) {
+          store
+          //  store.commit('TimeAll_function')
+          // const time = store.state.Time_Data
+          // ruleForm.value.operationTime = time[0]
+          // ruleForm.value.serviceDeadline = time[1]
+          var params = {
+            site: {
+              id: props.siteId,
+              siteName: ruleForm.value.siteName,
+              installedCapacity: ruleForm.value.installedCapacity,
+              siteAddress: ruleForm.value.siteAddress,
+              region: ruleForm.value.region,
+              stationAreaId: ruleForm.value.stationAreaId,
+              longitude: ruleForm.value.longitude,
+              latitude: ruleForm.value.latitude,
+              userName: ruleForm.value.userName,
+              phone: ruleForm.value.phone,
+              spareUserName: ruleForm.value.spareUserName,
+              sparePhone: ruleForm.value.sparePhone,
+              rheologicalChange: ruleForm.value.rheologicalChange,
+              routeId: ruleForm.value.routeId,
+              groupingId: props.siteId, //字段值待写活
+            },
+            siteDynamicProperties: {
+              id: ruleForm.value.siteDynamicPropertiesId,
+              siteType: ruleForm.value.siteType,
+              userCompany: ruleForm.value.userCompany,
+              operationTime: ruleForm.value.operationTime,
+              serviceDeadline: ruleForm.value.serviceDeadline,
+              powerSupplyType: ruleForm.value.powerSupplyType,
+              voltageLevel: ruleForm.value.voltageLevel,
+              demolitionStandardCoal: ruleForm.value.demolitionStandardCoal,
+              demolitionStandardCoal1: ruleForm.value.demolitionStandardCoal1,
+              faultStatus: ruleForm.value.faultStatus,
+              realTimeLoad: ruleForm.value.realTimeLoad,
+              totalElectricity: ruleForm.value.totalElectricity,
+              powerFactor: ruleForm.value.powerFactor,
+              sitePictureOne: ruleForm.value.sitePictureOne,
+              sitePictureTwo: ruleForm.value.sitePictureTwo,
+              sitePictureThree: ruleForm.value.sitePictureThree,
+            },
+            id: formStatus.value == '修改' ? 1 : 0,
+          }
+
+          api.siteAdd(params).then((requset) => {
+            if (requset.status === 'SUCCESS') {
+              ElMessage.success({
+                message: '保存成功',
+                type: 'success',
+              })
+            } else {
+              ElMessage.error(requset.msg)
+            }
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    }
+
+    //监听变化
+    watch(
+      () => props.siteId,
+      (newVal) => {
+        console.log('newVal')
+        console.log(newVal)
+        getSite()
+        // ruleForm.value.siteId = newVal
+        // powerQualityList()
+      }
+    )
+
     onMounted(() => {
+      //  console.log('props.siteId')
+      // console.log(props.siteId)
       platformList()
+      getSite()
       dynamicPropertiesDroplist(2)
       dynamicPropertiesDroplist(1)
     })
@@ -469,9 +468,9 @@ export default defineComponent({
         siteName: [
           { required: true, message: '请输入站点名称', trigger: 'blur' },
           {
-            min: 3,
+            min: 1,
             max: 11,
-            message: '长度在 3 到 11 个字符',
+            message: '长度在 1 到 11 个字符',
             trigger: 'blur',
           },
         ],
@@ -481,9 +480,9 @@ export default defineComponent({
         userCompany: [
           { required: true, message: '请输入用户公司', trigger: 'blur' },
           {
-            min: 3,
+            min: 1,
             max: 11,
-            message: '长度在 3 到 11 个字符',
+            message: '长度在 1 到 11 个字符',
             trigger: 'blur',
           },
         ],
@@ -496,9 +495,9 @@ export default defineComponent({
         installedCapacity: [
           { required: true, message: '请输入装机容量', trigger: 'blur' },
           {
-            min: 3,
+            min: 1,
             max: 20,
-            message: '长度在 3 到 20 个字符',
+            message: '长度在 1 到 20 个字符',
             trigger: 'blur',
           },
         ],
@@ -508,9 +507,9 @@ export default defineComponent({
         siteAddress: [
           { required: true, message: '请输入站点地址', trigger: 'blur' },
           {
-            min: 3,
-            max: 11,
-            message: '长度在 3 到 11 个字符',
+            min: 1,
+            max: 20,
+            message: '长度在 1 到 20 个字符',
             trigger: 'blur',
           },
         ],
@@ -532,9 +531,9 @@ export default defineComponent({
         userName: [
           { required: true, message: '请输入联系人1', trigger: 'blur' },
           {
-            min: 3,
+            min: 1,
             max: 11,
-            message: '长度在 3 到 11 个字符',
+            message: '长度在 1 到 11 个字符',
             trigger: 'blur',
           },
         ],
@@ -553,18 +552,18 @@ export default defineComponent({
         spareUserName: [
           { required: true, message: '请输入联系人2', trigger: 'blur' },
           {
-            min: 3,
+            min: 1,
             max: 11,
-            message: '长度在 3 到 11 个字符',
+            message: '长度在 1 到 11 个字符',
             trigger: 'blur',
           },
         ],
         sparePhone: [
           { required: true, message: '请输入联系方式2', trigger: 'blur' },
           {
-            min: 3,
+            min: 1,
             max: 11,
-            message: '长度在 3 到 11 个字符',
+            message: '长度在 1 到 11 个字符',
             trigger: 'blur',
           },
         ],
@@ -573,7 +572,6 @@ export default defineComponent({
       handlePictureCardPreview,
       submitForm,
       resetForm,
-
       handleUpAvatar,
     }
   },

src/views/siteManage/camera/checkVideo copy.vue

@@ -1,155 +0,0 @@
-<template>
-  <transition name="dialog-fade">
-    <el-dialog
-      v-if="showDialog"
-      :title="dialogTitle"
-      class="dialog-component"
-      v-model="showDialog"
-      width="600px"
-  
-      @close="closeDialog(0)"
-    >
-    <div style="width:100%;
-    height:400px;background:#aaa   "></div>
-     
-    </el-dialog>
-  </transition>
-</template>
-
-<script>
-export default {
-  name: "CheckVideo",
-  props: {
-    dialogTitle: {
-      type: String,
-  
-    },
-    itemInfo: {
-      type: Object,
-      default: function () {
-        return {};
-      },
-    },
-  },
-  data() {
-    return {
-       checked: true,
-      showDialog: false,
-      formInfo: JSON.parse(JSON.stringify(this.itemInfo)),
-      options: [
-        {
-          value: "选项1",
-          label: "站点一",
-        },
-        {
-          value: "选项2",
-          label: "站点二",
-        },
-        {
-          value: "选项3",
-          label: "站点三",
-        },
-        {
-          value: "选项4",
-          label: "站点四",
-        },
-        {
-          value: "选项5",
-          label: "站点五",
-        },
-      ],
-
-      rules: {
-        watchName: [
-          // required  是否为必填项， trigger:表单验证的触发时机，失去焦点进行验证
-          { required: true, message: "请输入设备名称", trigger: "blur" },
-          {
-            min: 3,
-            max: 6,
-            message: "用户名长度在 3 到 6 个字符",
-            trigger: "blur",
-          },
-        ],
-        watchCode: [
-          { required: true, message: "请输入设备编号", trigger: "blur" },
-          {
-            min: 3,
-            max: 6,
-            message: "用户名长度在 3 到 6 个字符",
-            trigger: "blur",
-          },
-        ],
-        routeAddress: [
-          { required: true, message: "请选则回路表记地址", trigger: "change" },
-         
-        ],
-        ratedVoltage: [
-          { required: true, message: '请选择站点列表', trigger: 'change'}
-        
-        ],
-        ratedCurrent: [
-          { required: true, message: "请输入已选站点个数", trigger: "blur" },
-          { trigger: "blur" },
-        ],
-        fzlMx: [
-          { required: true, message: "请输入挂载设备个数", trigger: "blur" },
-          { trigger: "blur" },
-        ],
-      },
-    };
-  },
-  methods: {
-    roleValid(rule, value, callback) {
-      rule
-      if (value.length === 0) {
-        callback(new Error("角色不能为空"));
-      } else {
-        callback();
-      }
-    },
-
-    // onSelectedDrug(event) {
-    //   this.routeAddress = event;
-    //   console.log(this.routeAddress);
-    // },
-    // 保存操作
-    submitForm(formName) {
-      const params = Object.assign(this.formInfo, {});
-      params
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          // 走保存请求
-          this.$message({
-            message: "操作成功！",
-            type: "success",
-          });
-          this.closeDialog(1);
-        } else {
-          return false;
-        }
-      });
-    },
-    // 关闭弹框
-    closeDialog(flag) {
-    //   this.$refs["formInfo"].resetFields();
-      this.showDialog = false;
-      this.$emit("closeDialog", flag);
-    },
-  },
-};
-</script>
- 
-<style scoped lang="scss">
-.el-input,
-.el-select {
-  width: 240px;
-}
-
-// label样式
-.el-form-item__label {
-    width: 150px
-}
-.el-form-item__content {
-    margin-left: 150px
-}
-</style>

src/views/siteManage/camera/dialogComponent-ora.vue

@@ -1,212 +0,0 @@
-<template>
-  <transition name="dialog-fade">
-    <el-dialog
-      v-if="showDialog"
-      :title="dialogTitle"
-      class="dialog-component"
-      v-model="showDialog"
-      width="640px"
-      @close="closeDialog(0)"
-    >
-      <el-form
-        ref="formInfo"
-        :model="formInfo"
-        class="demo-form-inline"
-        label-width="100px"
-        :rules="rules"
-      >
-        <el-form-item label="设备名称：" prop="watchName">
-          <el-input v-model="formInfo.watchName"></el-input>
-        </el-form-item>
-        <el-form-item label="设备编号：" prop="watchCode">
-          <el-input v-model="formInfo.watchCode"></el-input>
-        </el-form-item>
-        <el-form-item label="回路表记地址:" prop="routeAddress">
-          <el-select
-            v-model="formInfo.routeAddress"
-            multiple
-            filterable
-            collapse-tags
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="额定电压(kV)：" prop="ratedVoltage">
-          <el-input v-model="formInfo.ratedVoltage"></el-input>
-          <div class="remarksTxt">(数值为线电压)</div>
-        </el-form-item>
-        <el-form-item label="额定电流(A)：" prop="stationAddress">
-          <el-input v-model="formInfo.ratedCurrent"></el-input>
-        </el-form-item>
-        <el-form-item label="电流负载率门限：" prop="fzlMx">
-          <el-input v-model="formInfo.fzlMx"></el-input>
-           <div class="remarksTxt">(0-100之间的数字)</div>
-        </el-form-item>
-        <el-form-item label="设备能力：" prop="ability">
-          <el-checkbox v-model="checked">电能质量分析</el-checkbox>
-          <div class="remarksTxt">(如果未勾选，该设备不参与电能质量分析)</div>
-        </el-form-item>
-        
-        <br />
-        <br />
-        <br />
-        <div style="text-align: right">
-          <el-button @click="closeDialog(0)">取消</el-button>
-          <el-button type="primary" @click="submitForm('formInfo')"
-            >保存</el-button
-          >
-        </div>
-      </el-form>
-    </el-dialog>
-  </transition>
-</template>
-
-<script>
-
-
-
-
-export default {
-  name: "DialogComponent",
-  props: {
-    dialogTitle: {
-      type: String,
-      default: "新增",
-    },
-    itemInfo: {
-      type: Object,
-      default: function () {
-        return {};
-      },
-    },
-  },
-  data() {
-    return {
-       checked: true,
-      showDialog: false,
-      formInfo: JSON.parse(JSON.stringify(this.itemInfo)),
-      options: [
-        {
-          value: "选项1",
-          label: "站点一",
-        },
-        {
-          value: "选项2",
-          label: "站点二",
-        },
-        {
-          value: "选项3",
-          label: "站点三",
-        },
-        {
-          value: "选项4",
-          label: "站点四",
-        },
-        {
-          value: "选项5",
-          label: "站点五",
-        },
-      ],
-
-      rules: {
-        watchName: [
-          // required  是否为必填项， trigger:表单验证的触发时机，失去焦点进行验证
-          { required: true, message: "请输入设备名称", trigger: "blur" },
-          {
-            min: 3,
-            max: 6,
-            message: "用户名长度在 3 到 6 个字符",
-            trigger: "blur",
-          },
-        ],
-        watchCode: [
-          { required: true, message: "请输入设备编号", trigger: "blur" },
-          {
-            min: 3,
-            max: 6,
-            message: "用户名长度在 3 到 6 个字符",
-            trigger: "blur",
-          },
-        ],
-        routeAddress: [
-          { required: true, message: "请选则回路表记地址", trigger: "change" },
-         
-        ],
-        ratedVoltage: [
-          { required: true, message: '请选择站点列表', trigger: 'change'}
-        
-        ],
-        ratedCurrent: [
-          { required: true, message: "请输入已选站点个数", trigger: "blur" },
-          { trigger: "blur" },
-        ],
-        fzlMx: [
-          { required: true, message: "请输入挂载设备个数", trigger: "blur" },
-          { trigger: "blur" },
-        ],
-      },
-    };
-  },
-  methods: {
-    roleValid(rule, value, callback) {
-      rule
-      if (value.length === 0) {
-        callback(new Error("角色不能为空"));
-      } else {
-        callback();
-      }
-    },
-
-    // onSelectedDrug(event) {
-    //   this.routeAddress = event;
-    //   console.log(this.routeAddress);
-    // },
-    // 保存操作
-    submitForm(formName) {
-      const params = Object.assign(this.formInfo, {});
-      params
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          // 走保存请求
-          this.$message({
-            message: "操作成功！",
-            type: "success",
-          });
-          this.closeDialog(1);
-        } else {
-          return false;
-        }
-      });
-    },
-    // 关闭弹框
-    closeDialog(flag) {
-      this.$refs["formInfo"].resetFields();
-      this.showDialog = false;
-      this.$emit("closeDialog", flag);
-    },
-  },
-};
-</script>
- 
-<style scoped lang="scss">
-.el-input,
-.el-select {
-  width: 240px;
-}
-
-// label样式
-.el-form-item__label {
-    width: 150px
-}
-.el-form-item__content {
-    margin-left: 150px
-}
-</style>

src/views/siteManage/camera/index-ora.vue

@@ -1,310 +0,0 @@
-<template>
-  <div class="siteManage-main variableList">
-    <!-- 筛选start -->
-    <div class="filter-container mb-20">
-      <div class="left">
-        <div>
-          <a class="" style="margin-right: 30px">【测试站点1】站点的所有变量</a>
-          <el-button icon="el-icon-plus" type="success" @click="addItem()">
-            新增
-          </el-button>
-        </div>
-      </div>
-
-      <div class="right">
-        <el-button type="primary">导入</el-button>
-        <el-button type="primary">导出</el-button>
-      </div>
-    </div>
-    <!-- 筛选end -->
-
-    <!-- 表格start -->
-    <el-table
-      :data="tableData"
-      border
-      stripe
-      :header-cell-style="headClass"
-      :cell-style="cellStyle"
-    >
-      <el-table-column
-        fixed
-        prop="watchStatus"
-        label="状态"
-        width="50"
-        align="center"
-      >
-        <template #default>
-          <el-avatar class="status"></el-avatar>
-        </template>
-      </el-table-column>
-      <el-table-column prop="watchCode" label="名称" width=""></el-table-column>
-      <el-table-column
-        prop="ratedVoltage"
-        label="编号"
-        width=""
-      ></el-table-column>
-      <el-table-column
-        prop="ratedCurrent"
-        label="额定电压"
-        width=""
-      ></el-table-column>
-      <el-table-column prop="fzlMx" label="额定电流" width=""></el-table-column>
-      <el-table-column
-        prop="powerAnalysis"
-        label="电流负载率门限"
-        width=""
-      ></el-table-column>
-      <el-table-column prop="watchAddress" label="视频画面" width="">
-        <template #default="scope">
-          <a @click="checkVideo(scope.row)">查看</a>
-        </template>
-      </el-table-column>
-      <el-table-column fixed="right" label="操作" width="180">
-        <template #default="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click.prevent="editRow(scope.row)"
-          >
-            修改
-          </el-button>
-          <el-button
-            @click="handleDelete(scope.$index, scope.row)"
-            type="text"
-            size="small"
-            class="delete-text"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 表格end -->
-
-    <!-- 分页start -->
-    <div class="paginationBlock">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage4"
-        :page-sizes="[100, 200, 300, 400]"
-        :page-size="100"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="400"
-      ></el-pagination>
-    </div>
-
-    <!-- 分页end -->
-
-    <!--弹框组件开始-----------------------start-->
-    <dialog-component
-      v-if="showDialog"
-      ref="dialogComponent"
-      :dialog-title="dialogTitle"
-      :item-info="tableItem"
-      @closeDialog="closeDialog"
-    ></dialog-component>
-    <!--弹框组件开始-----------------------end-->
-
-    <!--弹框组件开始-----------------------start-->
-    <check-video
-      v-if="showDialog"
-      ref="checkVideo"
-      :dialog-title="dialogTitle"
-      :item-info="tableItem"
-      @closeDialog="closeDialog"
-    ></check-video>
-    <!--视频弹框组件开始-----------------------end-->
-  </div>
-</template>
-
-<script>
-import DialogComponent from './dialogComponent'
-import checkVideo from './checkVideo'
-
-export default {
-  name: 'Camera',
-
-  components: { DialogComponent, checkVideo },
-
-  data() {
-    return {
-      currentPage4: 4,
-
-      showDialog: false,
-      tabPosition: 'one',
-
-      input: '请输入状态',
-      tableData: [
-        {
-          ratedVoltage: '10KV',
-          watchName: '测试设备1',
-          watchCode: 'cssb1',
-          ratedCurrent: '58A',
-          fzlMx: '80%',
-          powerAnalysis: '开启',
-          watchAddress: '1',
-        },
-        {
-          ratedVoltage: '10KV',
-          watchName: '测试设备1',
-          watchCode: 'cssb1',
-          ratedCurrent: '58A',
-          fzlMx: '80%',
-          powerAnalysis: '开启',
-          watchAddress: '1',
-        },
-        {
-          ratedVoltage: '10KV',
-          watchName: '测试设备1',
-          watchCode: 'cssb1',
-          ratedCurrent: '58A',
-          fzlMx: '80%',
-          powerAnalysis: '开启',
-          watchAddress: '1',
-        },
-        {
-          ratedVoltage: '10KV',
-          watchName: '测试设备1',
-          watchCode: 'cssb1',
-          ratedCurrent: '58A',
-          fzlMx: '80%',
-          powerAnalysis: '开启',
-          watchAddress: '1',
-        },
-        {
-          ratedVoltage: '10KV',
-          watchName: '测试设备1',
-          watchCode: 'cssb1',
-          ratedCurrent: '58A',
-          fzlMx: '80%',
-          powerAnalysis: '开启',
-          watchAddress: '1',
-        },
-        {
-          ratedVoltage: '10KV',
-          watchName: '测试设备1',
-          watchCode: 'cssb1',
-          ratedCurrent: '58A',
-          fzlMx: '80%',
-          powerAnalysis: '开启',
-          watchAddress: '1',
-        },
-        {
-          ratedVoltage: '10KV',
-          watchName: '测试设备1',
-          watchCode: 'cssb1',
-          ratedCurrent: '58A',
-          fzlMx: '80%',
-          powerAnalysis: '开启',
-          watchAddress: '1',
-        },
-        {
-          ratedVoltage: '10KV',
-          watchName: '测试设备1',
-          watchCode: 'cssb1',
-          ratedCurrent: '58A',
-          fzlMx: '80%',
-          powerAnalysis: '开启',
-          watchAddress: '1',
-        },
-      ],
-    }
-  },
-  methods: {
-    //自定义列样式
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      row, column, rowIndex
-      if (columnIndex === 6) {
-        return `color:#0284E8;`
-      } else {
-        return ''
-      }
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-    },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`)
-    },
-
-    // 表头样式设置
-    goVariableList() {
-      // 跳转至订单列表页面传参
-      this.$router.push({
-        path: '../siteManage/variableList/index.vue',
-      })
-      // this.$router.push({ name:'variableList'})
-    },
-    headClass() {
-      return 'background:#FAFAFA;'
-    },
-
-    // 查看视频
-    checkVideo() {
-      this.tableItem = {
-        id: '',
-        stationName: '',
-        watchName: '',
-        watchCode: '',
-        siteList: [],
-        done: '',
-        guaZai: '',
-        checked: true,
-        resource: '',
-      }
-      this.dialogTitle = '查看视频'
-      this.showDialog = true
-      this.$nextTick(() => {
-        this.$refs['checkVideo'].showDialog = true
-      })
-    },
-
-    // 添加操作
-    addItem() {
-      this.tableItem = {
-        id: '',
-        stationName: '',
-        watchName: '',
-        watchCode: '',
-        siteList: [],
-        done: '',
-        guaZai: '',
-        checked: true,
-      }
-      this.dialogTitle = '新增'
-      this.showDialog = true
-      this.$nextTick(() => {
-        this.$refs['dialogComponent'].showDialog = true
-      })
-    },
-    // 编辑操作
-    editRow(row) {
-      console.log(row)
-      this.tableItem = row
-      this.dialogTitle = '编辑'
-      this.showDialog = true
-      this.$nextTick(() => {
-        this.$refs['dialogComponent'].showDialog = true
-      })
-    },
-    // 关闭操作
-    closeDialog(flag) {
-      if (flag) {
-        // 重新刷新表格内容
-        this.fetchData()
-      }
-      this.showDialog = false
-    },
-
-    //删除操作
-    handleDelete(index, row) {
-      console.log(index, row)
-      alert(index)
-    },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

src/views/siteManage/camera/index.vue

@@ -149,7 +149,7 @@
 </template>
 
 <script>
-import { defineComponent, ref, reactive, onMounted } from 'vue'
+import { defineComponent, ref, reactive, onMounted,watch } from 'vue'
 // import * as api from '@/api/siteManage/watchDog.js'
 import * as api from '@/api/siteManage/camera.js'
 import { ElMessage } from 'element-plus'
@@ -161,6 +161,7 @@ import axios from 'axios'
 
 export default defineComponent({
   components: { DialogComponent, checkVideo },
+  props:[ 'siteId'],
   setup(props, { emit }) {
     const total = ref(0)
     const pageSize = ref(15)
@@ -188,7 +189,7 @@ export default defineComponent({
     function videoMonitoringDeviceList() {
       api
         .videoMonitoringDeviceList({
-          siteId: 18,
+          siteId: props.siteId,
           size: pageSize.value,
           current: currentPage.value,
           // deviceType:2
@@ -327,7 +328,21 @@ export default defineComponent({
       }, 0)
     }, 10000000)
 
+
+    //监听变化
+    watch(
+      () => props.siteId,
+      (newVal) => {
+        console.log('newVal')
+        console.log(newVal)
+        videoMonitoringDeviceList()
+      }
+    )
+
     onMounted(() => {
+      //   console.log('props.siteId')
+      // console.log(props.siteId)
+      
       videoMonitoringDeviceList()
     })
 

src/views/siteManage/groupInfoCom.vue

@@ -5,11 +5,12 @@
         <div class="el-form-item blockTitle">分组信息</div>
         <div></div>
         <el-form-item label="分组名称" prop="groupingName" label-width="130px">
-          <el-input v-model="form.groupingName"></el-input>
+          <el-input v-model="form.groupingName" v-if="label=='所有站点'" disabled></el-input>
+          <el-input v-model="form.groupingName" v-else></el-input>
         </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" @click="submitForm('formInfo')">
+          <el-button type="primary" @click="submitForm('formInfo')" v-if="label!='所有站点'">
             保存
           </el-button>
         </el-form-item>

src/views/siteManage/index.vue

@@ -89,23 +89,24 @@
         type="card"
       >
         <el-tab-pane label="基本信息" name="first">
-          <basic-info class="basicInfo" :siteId="siteId" :lalala="siteId"></basic-info>
+          <basic-info class="basicInfo" :siteId="siteId" ></basic-info>
         </el-tab-pane>
-        <el-tab-pane label="监控设备" name="second" :siteId="siteId">
+        <el-tab-pane label="监控设备" name="second" >
           <watch-dog
             v-on:success="success(res)"
             :avtiveName="activeName"
             @func="getMsgFormSon"
+            :siteId="siteId"
           ></watch-dog>
         </el-tab-pane>
         <el-tab-pane label="变量列表" name="third">
-          <variable-list :activeName="activeName"></variable-list>
+          <variable-list :activeName="activeName" ></variable-list>
         </el-tab-pane>
-        <el-tab-pane label="摄像头" name="five">
-          <camera></camera>
+        <el-tab-pane label="摄像头" name="five" >
+          <camera :siteId="siteId"></camera>
         </el-tab-pane>
         <el-tab-pane label="电能质量评分配置" name="six">
-          <power-Score></power-Score>
+          <power-Score :siteId="siteId"></power-Score>
         </el-tab-pane>
       </el-tabs>
 
@@ -178,7 +179,7 @@ export default defineComponent({
     const groupingId = ref(1)
     const siteId = ref(368)
     const label = ref('')
-    const activeName = ref('second')
+    const activeName = ref('first')
     const filterText = ref('')
     const data = ref([
       {
@@ -254,6 +255,8 @@ export default defineComponent({
       treeLevel.value = obj.level
       groupingId.value = obj.data.grouping_id
       label.value = obj.data.label
+       console.log('obj.data')
+      console.log(obj.data)
 
       if (treeLevel.value == 3) {
         siteId.value = obj.data.id

src/views/siteManage/powerScore/index orange.vue

@@ -1,127 +0,0 @@
-<template>
-  <div class="siteManage-main powerScore">
-    <el-form
-      :model="ruleForm"
-      :rules="rules"
-      ref="ruleForm"
-      label-width="137px"
-      class="demo-ruleForm"
-    >
-      <div class="grid-content bg-purple">
-        <div class="el-form-item blockTitle">电能质量各要素权重</div>
-        <div></div>
-        <el-form-item label="功率因数(100%)：" prop="name">
-          <el-input v-model="ruleForm.name"></el-input>
-        </el-form-item>
-
-        <el-form-item label="电压合格率(%)：" prop="name">
-          <el-input v-model="ruleForm.name"></el-input>
-        </el-form-item>
-        <el-form-item label="负载率(%)：" prop="name">
-          <el-input v-model="ruleForm.name"></el-input>
-        </el-form-item>
-        <el-form-item label="电流平衡度(%)：" prop="name">
-          <el-input v-model="ruleForm.name"></el-input>
-        </el-form-item>
-
-        <el-form-item label="电压平衡度(%)：" prop="name">
-          <el-input v-model="ruleForm.name"></el-input>
-        </el-form-item>
-        <el-form-item label="谐波畸变率(%)：" prop="name">
-          <el-input v-model="ruleForm.name"></el-input>
-          <div class="remarksTxt">当要素权重为0时，该要素不参与电能质量分析</div>
-        </el-form-item>
-
-        <div class="el-form-item blockTitle">功率因数</div>
-        <el-form-item label="功率因数：" prop="powerFactorTwo">
-          <el-input v-model="ruleForm.npowerFactorTwoame"></el-input>
-          
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="submitForm('ruleForm')">
-            保存
-          </el-button>
-        </el-form-item>
-      </div>
-    </el-form>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'PowerScore',
-  data() {
-    return {
-      ruleForm: {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: '',
-        planStartTime: '',
-        planEndTime: '',
-      },
-      rules: {
-        planStartDate: [
-          { required: true, message: '请选择开始日期', trigger: 'change' },
-        ],
-        planEndDate: [
-          { required: true, message: '请输入结束日期', trigger: 'change' },
-        ],
-        name: [
-          { required: true, message: '请输入站点名称', trigger: 'blur' },
-          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' },
-        ],
-        region: [
-          { required: true, message: '请选择活动区域', trigger: 'change' },
-        ],
-        date1: [
-          {
-            type: 'date',
-            required: true,
-            message: '请选择日期',
-            trigger: 'change',
-          },
-        ],
-        date2: [
-          {
-            type: 'date',
-            required: true,
-            message: '请选择时间',
-            trigger: 'change',
-          },
-        ],
-        type: [
-          {
-            type: 'array',
-            required: true,
-            message: '请至少选择一个活动性质',
-            trigger: 'change',
-          },
-        ],
-        resource: [
-          { required: true, message: '请选择活动资源', trigger: 'change' },
-        ],
-        desc: [{ required: true, message: '请填写活动形式', trigger: 'blur' }],
-      },
-    }
-  },
-  methods: {
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          alert('submit!')
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
-    },
-  },
-}
-</script>
-<style scoped lang="scss">
-</style>

src/views/siteManage/powerScore/index.vue

@@ -67,52 +67,70 @@
 </template>
 
 <script>
-import { defineComponent, ref, onMounted } from 'vue'
+import { defineComponent, ref, onMounted, watch } from 'vue'
 import * as api from '@/api/siteManage/powerScore'
 import { ElMessage } from 'element-plus'
 
 export default defineComponent({
   name: 'PowerScore',
-  setup() {
+  props: ['siteId'],
+  setup(props) {
+    
     const formInfo = ref(null)
+    const formStatus = ref('')
+    const ruleForm = ref({})
 
-    const ruleForm = ref({
-      powerFactorOne: '',
-      voltageQualified: '',
-      loadRate: '',
-      currentBalance: '',
-      voltageBalance: '',
-      thdu: '',
-      powerFactorTwo: '',
-      siteId:'1'   //此字段需写活
-     
-    })
+    //评分配置详情查询
+    function powerQualityList() {
+      api
+        .powerQualityList({
+          siteId: props.siteId,
+        })
+        .then((requset) => {
+          if (requset.status === 'SUCCESS') {
+            if (requset.data[0]) {
+              formStatus.value = 'update'
+              ruleForm.value = requset.data[0]
+            } else {
+              formStatus.value = 'add'
+              ruleForm.value = {}
+            }
+          } else {
+            ElMessage.error(requset.msg)
+          }
+        })
+    }
 
     //表单提交
     function submitForm() {
+      ruleForm.value.siteId = props.siteId
       formInfo.value.validate((valid) => {
         if (valid) {
-          api.powerQualityAdd(ruleForm.value).then((requset) => {
-            if (requset.status === 'SUCCESS') {
-              ElMessage.success({
-                message: '新增成功',
-                type: 'success',
-              })
-              // if (props.dialogTitle === '新增') {
-              //   ElMessage.success({
-              //     message: '新增成功',
-              //     type: 'success',
-              //   })
-              // } else {
-              //   ElMessage.success({
-              //     message: '修改成功',
-              //     type: 'success',
-              //   })
-              // }
-            } else {
-              ElMessage.error(requset.msg)
-            }
-          })
+          if (formStatus.value == 'add') {
+            //新增
+            api.powerQualityAdd(ruleForm.value).then((requset) => {
+              if (requset.status === 'SUCCESS') {
+                ElMessage.success({
+                  message: '新增成功',
+                  type: 'success',
+                })
+              } else {
+                ElMessage.error(requset.msg)
+              }
+            })
+          } else {
+            //修改
+            api.powerQualityUpdate(ruleForm.value).then((requset) => {
+              if (requset.status === 'SUCCESS') {
+                ElMessage.success({
+                  message: '修改成功',
+                  type: 'success',
+                })
+              } else {
+                ElMessage.error(requset.msg)
+              }
+            })
+          }
         } else {
           console.log('error submit!!')
           return false
@@ -120,11 +138,22 @@ export default defineComponent({
       })
     }
 
-    function resetForm() {
-      formInfo.value.resetFields()
-    }
+    //监听变化
+    watch(
+      () => props.siteId,
+      (newVal) => {
+        console.log('newVal')
+        console.log(newVal)
+        ruleForm.value.siteId = newVal
+        powerQualityList()
+      }
+    )
 
-    onMounted(() => {})
+    onMounted(() => {
+      powerQualityList()
+      console.log('props.siteId')
+      console.log(props.siteId)
+    })
 
     return {
       formInfo,
@@ -139,7 +168,7 @@ export default defineComponent({
         loadRate: [
           { required: true, message: '请输入负载率', trigger: 'blur' },
         ],
-       
+
         currentBalance: [
           { required: true, message: '请输入电流平衡度', trigger: 'blur' },
         ],
@@ -149,11 +178,11 @@ export default defineComponent({
         thdu: [
           { required: true, message: '请输入谐波畸变率', trigger: 'blur' },
         ],
-        powerFactorTwo: [{ required: true, message: '请输入功率因数', trigger: 'blur' }],
+        powerFactorTwo: [
+          { required: true, message: '请输入功率因数', trigger: 'blur' },
+        ],
       },
-
       submitForm,
-      resetForm,
     }
   },
 })

src/views/siteManage/variableList/dialogComponent.vue

@@ -71,9 +71,6 @@
 
 <script>
 
-
-
-
 export default {
   name: "DialogComponent",
   props: {

src/views/siteManage/watchDog/index.vue

@@ -179,11 +179,10 @@ export default defineComponent({
 
     //监控设备列表
     function deviceNewsList() {
-      console.log('props.siteId')
-      console.log(props.siteId)
       api
         .deviceNewsList({
-          siteId: 1,    //字段写活？
+          // siteId: 1,    //字段写活？
+          siteId:props.siteId,
           size: pageSize.value,
           current: currentPage.value,
         })
@@ -257,11 +256,13 @@ export default defineComponent({
       (newVal) => {
         console.log('newVal')
         console.log(newVal)
-        //  form.value.groupingName = newVal
+        deviceNewsList()
       }
     )
 
     onMounted(() => {
+      //  console.log('props.siteId')
+      // console.log(props.siteId)
       deviceNewsList()
     })